From 9c3dee9535b5555dc5479efb2cf0b33fbaeb00d4 Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Sun, 7 Apr 2024 14:58:50 +0900 Subject: [PATCH 01/38] =?UTF-8?q?[Fix]=20=EC=84=9C=EB=A5=98=20=EA=B2=80?= =?UTF-8?q?=ED=86=A0=EC=A4=91=20=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?-=20PROGRESS=20->=20PROGRESS=5FDOCS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/recruit/Main/MyRecruitStatus.tsx | 2 +- components/recruit/Main/RecruitStepper.tsx | 2 +- .../recruitments/[id]/applications/[applicationId]/result.ts | 2 +- types/recruit/recruitments.d.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/recruit/Main/MyRecruitStatus.tsx b/components/recruit/Main/MyRecruitStatus.tsx index 2a232e2c0..b5b4b9bb3 100644 --- a/components/recruit/Main/MyRecruitStatus.tsx +++ b/components/recruit/Main/MyRecruitStatus.tsx @@ -34,7 +34,7 @@ const MyRecruitStatus = ({ }; const statusMessage = (status: resultType, interviewDate?: Date) => { - if (status === 'PROGRESS') return '지원서를 확인하고 있습니다.'; + if (status === 'PROGRESS_DOCS') return '지원서를 확인하고 있습니다.'; if (status === 'INTERVIEW' && interviewDate) return dateToKRFullString(new Date(interviewDate)); if (status === 'PASS') return '합격'; diff --git a/components/recruit/Main/RecruitStepper.tsx b/components/recruit/Main/RecruitStepper.tsx index e293cf6e9..3d2ee9cff 100644 --- a/components/recruit/Main/RecruitStepper.tsx +++ b/components/recruit/Main/RecruitStepper.tsx @@ -39,7 +39,7 @@ const RecruitStepper = ({ status }: { status: resultType }) => { const stepMessage = ['지원서 확인', '면접', '결과 발표']; const statusToStep = (status: resultType) => { - if (status === 'PROGRESS') return 0; + if (status === 'PROGRESS_DOCS') return 0; if (status === 'INTERVIEW' || status === 'APPLICATION_FAIL') return 1; // 면접 전 상태 if (status === 'PASS' || status === 'INTERVIEW_FAIL') return 2; // 면접 후 상태 return 0; diff --git a/pages/api/pingpong/recruitments/[id]/applications/[applicationId]/result.ts b/pages/api/pingpong/recruitments/[id]/applications/[applicationId]/result.ts index c84e29a9a..f8001a80c 100644 --- a/pages/api/pingpong/recruitments/[id]/applications/[applicationId]/result.ts +++ b/pages/api/pingpong/recruitments/[id]/applications/[applicationId]/result.ts @@ -8,7 +8,7 @@ const before = { const beforeInterview = { title: '면접 시간 발표 전입니다~', - status: 'PROGRESS', + status: 'PROGRESS_DOCS', interviewDate: null, }; diff --git a/types/recruit/recruitments.d.ts b/types/recruit/recruitments.d.ts index 8fd62f59a..d21116f94 100644 --- a/types/recruit/recruitments.d.ts +++ b/types/recruit/recruitments.d.ts @@ -18,7 +18,7 @@ export type recruitmentListData = { export type resultType = | null - | 'PROGRESS' + | 'PROGRESS_DOCS' | 'APPLICATION_FAIL' | 'INTERVIEW' | 'PASS' From 1411eeb9447cc0827349edda7dde828a48b37cda Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Sun, 7 Apr 2024 15:23:37 +0900 Subject: [PATCH 02/38] =?UTF-8?q?[Design]=20recruitContainer=20=EC=A4=91?= =?UTF-8?q?=EC=95=99=EC=A0=95=EB=A0=AC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/recruit/layout.module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/recruit/layout.module.scss b/styles/recruit/layout.module.scss index 0d23f8823..c707b4602 100644 --- a/styles/recruit/layout.module.scss +++ b/styles/recruit/layout.module.scss @@ -16,6 +16,7 @@ min-height: 100vh; flex-direction: column; padding: 0 1.5rem 2rem; + justify-content: center; align-items: center; gap: 1rem; } From cfac6aca9bf8ce20b5cd2f3056cee837c372d9ea Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Sun, 7 Apr 2024 22:43:20 +0900 Subject: [PATCH 03/38] =?UTF-8?q?[Design]=20noRecruit=20flex-grow=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/recruit/layout.module.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/styles/recruit/layout.module.scss b/styles/recruit/layout.module.scss index c707b4602..39da9243d 100644 --- a/styles/recruit/layout.module.scss +++ b/styles/recruit/layout.module.scss @@ -16,7 +16,6 @@ min-height: 100vh; flex-direction: column; padding: 0 1.5rem 2rem; - justify-content: center; align-items: center; gap: 1rem; } @@ -24,7 +23,7 @@ .noRecruit { display: flex; width: 100%; - height: 100%; + flex-grow: 1; flex-direction: column; align-items: center; justify-content: center; From f7186b1273959ac9b47cac017deb62329b7c67bc Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Sun, 7 Apr 2024 23:58:47 +0900 Subject: [PATCH 04/38] =?UTF-8?q?[Feat]=20ApplicationFormHeader=20?= =?UTF-8?q?=EA=B3=B5=ED=86=B5=20StickyHeader=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationFormHeader.tsx | 35 ------------------- pages/recruit/[id]/apply.tsx | 4 +-- pages/recruit/[id]/my-application.tsx | 6 ++-- styles/recruit/application.module.scss | 24 ------------- 4 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 components/recruit/Application/applicationLayout/ApplicationFormHeader.tsx diff --git a/components/recruit/Application/applicationLayout/ApplicationFormHeader.tsx b/components/recruit/Application/applicationLayout/ApplicationFormHeader.tsx deleted file mode 100644 index f6b57a414..000000000 --- a/components/recruit/Application/applicationLayout/ApplicationFormHeader.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { useRouter } from 'next/router'; -import { HomeOutlined } from '@mui/icons-material'; -import { Button } from '@mui/material'; -import styles from 'styles/recruit/application.module.scss'; - -interface IApplicationFormHeaderProps { - title: string; -} - -const ApplicationFormHeader = (props: IApplicationFormHeaderProps) => { - const { title } = props; - const router = useRouter(); - - const goRecruitHome = () => { - router.push('/recruit'); - }; - - return ( -
-
- {title} - -
-
- ); -}; - -export default ApplicationFormHeader; diff --git a/pages/recruit/[id]/apply.tsx b/pages/recruit/[id]/apply.tsx index 03be4a585..b56d683ed 100644 --- a/pages/recruit/[id]/apply.tsx +++ b/pages/recruit/[id]/apply.tsx @@ -3,8 +3,8 @@ import { useEffect } from 'react'; import { useSetRecoilState } from 'recoil'; import { applicationAlertState } from 'utils/recoil/application'; import ApplicationForm from 'components/recruit/Application/ApplicationForm'; -import ApplicationFormHeader from 'components/recruit/Application/applicationLayout/ApplicationFormHeader'; import ApplicationLoadingNoData from 'components/recruit/Application/ApplicationLoadingNoData'; +import StickyHeader from 'components/recruit/StickyHeader'; import useRecruitDetail from 'hooks/recruit/useRecruitDetail'; function Apply() { @@ -31,7 +31,7 @@ function Apply() { return ( <> - + - Date: Mon, 8 Apr 2024 00:11:44 +0900 Subject: [PATCH 05/38] =?UTF-8?q?[Feat]=20StickyHeader=EC=97=90=20?= =?UTF-8?q?=EB=AA=A8=EC=A7=91=20=EB=A9=94=EC=9D=B8=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/recruit/StickyHeader.tsx | 19 ++++++++++++++++--- styles/recruit/common.module.scss | 15 ++++++++++----- styles/recruit/text.module.scss | 4 ++++ 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/components/recruit/StickyHeader.tsx b/components/recruit/StickyHeader.tsx index 07627c4da..8e6530b42 100644 --- a/components/recruit/StickyHeader.tsx +++ b/components/recruit/StickyHeader.tsx @@ -1,12 +1,25 @@ +import { useRouter } from 'next/navigation'; +import { HomeOutlined } from '@mui/icons-material'; +import { Button } from '@mui/material'; import commonStyle from 'styles/recruit/common.module.scss'; import textStyle from 'styles/recruit/text.module.scss'; const StickyHeader = ({ headerTitle }: { headerTitle: string }) => { + const router = useRouter(); + const goHome = () => { + router.push('/recruit'); + }; return (
-
- {headerTitle} -
+ {headerTitle} +
); }; diff --git a/styles/recruit/common.module.scss b/styles/recruit/common.module.scss index 29fad9f8f..91d58ff65 100644 --- a/styles/recruit/common.module.scss +++ b/styles/recruit/common.module.scss @@ -1,3 +1,5 @@ +@import 'styles/common.scss'; + .pingpongAnimation { margin: 1rem 0; } @@ -6,13 +8,16 @@ position: sticky; top: 0; z-index: 1; + box-sizing: border-box; + display: flex; width: 100%; + height: fit-content; + padding: 1rem 1.5rem; background-color: rgba(246, 246, 246, 0.9); backdrop-filter: blur(5px); - .stickyContainer { - height: 4rem; - padding-top: 1.5rem; - padding-bottom: 1.5rem; - padding-left: 2rem; + align-items: center; + justify-content: space-between; + .homeBtn { + font-size: $medium-font; } } diff --git a/styles/recruit/text.module.scss b/styles/recruit/text.module.scss index 51a669d8a..c7a173cd1 100644 --- a/styles/recruit/text.module.scss +++ b/styles/recruit/text.module.scss @@ -10,3 +10,7 @@ @include pageSubTitle; text-align: center; } + +.headerTitle { + @include pageTitle; +} From 21cb1c03dd67c2dc106cda44e7e53d221fc9dd70 Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Mon, 8 Apr 2024 00:24:32 +0900 Subject: [PATCH 06/38] =?UTF-8?q?[Feat]=20=EB=A9=94=EC=9D=B8=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=EC=97=90?= =?UTF-8?q?=EB=8A=94=20=EB=A9=94=EC=9D=B8=20=EC=9D=B4=EB=8F=99=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/recruit/StickyHeader.tsx | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/components/recruit/StickyHeader.tsx b/components/recruit/StickyHeader.tsx index 8e6530b42..164d976c2 100644 --- a/components/recruit/StickyHeader.tsx +++ b/components/recruit/StickyHeader.tsx @@ -1,4 +1,4 @@ -import { useRouter } from 'next/navigation'; +import { usePathname, useRouter } from 'next/navigation'; import { HomeOutlined } from '@mui/icons-material'; import { Button } from '@mui/material'; import commonStyle from 'styles/recruit/common.module.scss'; @@ -6,20 +6,23 @@ import textStyle from 'styles/recruit/text.module.scss'; const StickyHeader = ({ headerTitle }: { headerTitle: string }) => { const router = useRouter(); + const pathName = usePathname(); const goHome = () => { router.push('/recruit'); }; return (
{headerTitle} - + {pathName !== '/recruit' && ( + + )}
); }; From 79c22fdaeac88cb20bd2fc60793c57f6863837fd Mon Sep 17 00:00:00 2001 From: PHJoon Date: Mon, 8 Apr 2024 13:40:08 +0900 Subject: [PATCH 07/38] =?UTF-8?q?[Fix]=20IApplicationAnswer=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/recruit/recruitments.d.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/types/recruit/recruitments.d.ts b/types/recruit/recruitments.d.ts index 8fd62f59a..38bdb6ad4 100644 --- a/types/recruit/recruitments.d.ts +++ b/types/recruit/recruitments.d.ts @@ -55,14 +55,15 @@ export interface IRecruitmentDetail { export interface IApplicantAnswer { questionId: number; inputType: recruitmentQuestionTypes; - checkedList?: number[]; - answer?: string; + checkedList: { checkListId: number; content: string }[]; + answer: string | null; } export type ApplicationFormType = 'APPLY' | 'VIEW' | 'EDIT'; + export interface IUserApplicationInfo { applicationId: number; - endDate: string; + endTime: string; title: string; content: string; } From 3c94925e335cde31db8c7eae73076d95e26d1ac1 Mon Sep 17 00:00:00 2001 From: PHJoon Date: Mon, 8 Apr 2024 13:40:40 +0900 Subject: [PATCH 08/38] =?UTF-8?q?[Fix]=20=EC=88=98=EC=A0=95=EB=90=9C=20IAp?= =?UTF-8?q?plicatnAnswer=20=EC=86=8D=EC=84=B1=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EC=B6=B0=20checkform=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8?= =?UTF-8?q?=EB=93=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Application/applicationFormItems/MultiCheckForm.tsx | 4 +++- .../Application/applicationFormItems/SingleCheckForm.tsx | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/components/recruit/Application/applicationFormItems/MultiCheckForm.tsx b/components/recruit/Application/applicationFormItems/MultiCheckForm.tsx index 32288fbf4..4499c8b9d 100644 --- a/components/recruit/Application/applicationFormItems/MultiCheckForm.tsx +++ b/components/recruit/Application/applicationFormItems/MultiCheckForm.tsx @@ -34,7 +34,9 @@ function MultiCheckForm(props: IitemProps) { value={check.id} control={ check.checkListId) + .includes(check.id)} /> } label={check.contents} diff --git a/components/recruit/Application/applicationFormItems/SingleCheckForm.tsx b/components/recruit/Application/applicationFormItems/SingleCheckForm.tsx index df3db8657..2c2ff5bfd 100644 --- a/components/recruit/Application/applicationFormItems/SingleCheckForm.tsx +++ b/components/recruit/Application/applicationFormItems/SingleCheckForm.tsx @@ -28,7 +28,8 @@ function SingleCheckForm(props: IitemProps) { }; useEffect(() => { - if (answer && answer.checkedList) setSingleCheck(answer?.checkedList); + if (answer && answer.checkedList) + setSingleCheck(answer?.checkedList.map((check) => check.checkListId)); }, [answer]); return ( From 6bb15a67079bb9327ff5d4f3403c01a4a19967f4 Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Mon, 8 Apr 2024 14:33:52 +0900 Subject: [PATCH 09/38] =?UTF-8?q?[Refact]=20import=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=A0=88=EB=8C=80=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/recruit/Main/MyRecruitStatus.tsx | 2 +- components/recruit/Main/MyRecruitment.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/recruit/Main/MyRecruitStatus.tsx b/components/recruit/Main/MyRecruitStatus.tsx index b5b4b9bb3..faea0955d 100644 --- a/components/recruit/Main/MyRecruitStatus.tsx +++ b/components/recruit/Main/MyRecruitStatus.tsx @@ -1,8 +1,8 @@ import { Stack } from '@mui/material'; import { resultType } from 'types/recruit/recruitments'; import { dateToKRFullString } from 'utils/handleTime'; +import RecruitStepper from 'components/recruit/Main/RecruitStepper'; import style from 'styles/recruit/Main/myRecruitment.module.scss'; -import RecruitStepper from './RecruitStepper'; const MyRecruitStatus = ({ status, diff --git a/components/recruit/Main/MyRecruitment.tsx b/components/recruit/Main/MyRecruitment.tsx index 9cac10724..99c0b4b5c 100644 --- a/components/recruit/Main/MyRecruitment.tsx +++ b/components/recruit/Main/MyRecruitment.tsx @@ -1,11 +1,11 @@ import { useRouter } from 'next/router'; import { List } from '@mui/material'; +import CollapseListItem from 'components/recruit/Main/CollapseListItem'; +import MyApplicationInfo from 'components/recruit/Main/MyApplicationInfo'; +import MyRecruitStatus from 'components/recruit/Main/MyRecruitStatus'; import useGetRecruitResult from 'hooks/recruit/useGetRecruitResult'; import style from 'styles/recruit/Main/myRecruitment.module.scss'; import textStyle from 'styles/recruit/text.module.scss'; -import CollapseListItem from './CollapseListItem'; -import MyApplicationInfo from './MyApplicationInfo'; -import MyRecruitStatus from './MyRecruitStatus'; const MyRecruitment = ({ applicationId }: { applicationId?: number }) => { const router = useRouter(); From 26dc5fa989122b1d44328ef5e9b539dccae2e766 Mon Sep 17 00:00:00 2001 From: greatSweetMango <93255519+greatSweetMango@users.noreply.github.com> Date: Sat, 23 Mar 2024 22:59:31 +0900 Subject: [PATCH 10/38] Update main-deploy.yml --- .github/workflows/main-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main-deploy.yml b/.github/workflows/main-deploy.yml index 95b230432..1711b37e0 100644 --- a/.github/workflows/main-deploy.yml +++ b/.github/workflows/main-deploy.yml @@ -1,6 +1,7 @@ name: Deploy to 42ggClientS3 on: + workflow_dispatch: push: branches: - deploy From a41b1239214e054ac9222e5c76a2d4aa0b441187 Mon Sep 17 00:00:00 2001 From: hyobb109 Date: Mon, 8 Apr 2024 17:38:14 +0900 Subject: [PATCH 11/38] =?UTF-8?q?[Fix]=20=ED=85=9C=ED=94=8C=EB=A6=BF?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=ED=83=80=EC=9E=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/recruitments/recruitmentsuser/tmplateEditor.tsx | 8 ++++---- .../modal/admin/AdminRecruitMessageTemplateModal.tsx | 6 +++--- types/recruit/recruitments.d.ts | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx index e7034409e..2fb2ff1eb 100644 --- a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx +++ b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx @@ -6,11 +6,11 @@ import { modalState } from 'utils/recoil/modal'; import { toastState } from 'utils/recoil/toast'; import styles from 'styles/admin/modal/AdminRecruitMessageTemplateModal.module.scss'; -function TemplateEditor({ messageType, message }: IRecruitMessageTemplate) { +function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) { const resetModal = useResetRecoilState(modalState); const [tempalte, setTemplate] = useState({ messageType: messageType, - message: message, + content: content, }); const [alert, setAlert] = useState(''); const setSnackbar = useSetRecoilState(toastState); @@ -29,7 +29,7 @@ function TemplateEditor({ messageType, message }: IRecruitMessageTemplate) { setAlert(`${DATE}를 포함해주세요.`); } else { setAlert(''); - setTemplate({ ...tempalte, message: message }); + setTemplate({ ...tempalte, content: message }); } }; @@ -68,7 +68,7 @@ function TemplateEditor({ messageType, message }: IRecruitMessageTemplate) {