From ea91cf29c2e1ec14ad8655616c2dd85a6062acd8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 08:13:15 +0000 Subject: [PATCH 1/3] Create draft PR for #731 From 070be02d2b483839f981b74e27640918bd51bd62 Mon Sep 17 00:00:00 2001 From: Kim Da Eun Date: Thu, 26 Sep 2024 17:27:06 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=84=B8?= =?UTF-8?q?=EC=8A=A4=20=EB=B3=B4=EB=93=9C=EC=9D=98=20=EB=A7=88=EC=A7=80?= =?UTF-8?q?=EB=A7=89=20=EC=BB=AC=EB=9F=BC=20=EB=B0=B0=EA=B2=BD=EC=83=89?= =?UTF-8?q?=EC=9D=84=20=EC=B4=88=EB=A1=9D=EC=83=89=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/dashboard/ProcessBoard/index.tsx | 3 ++- frontend/src/components/dashboard/ProcessColumn/index.tsx | 5 +++-- frontend/src/components/dashboard/ProcessColumn/style.ts | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/dashboard/ProcessBoard/index.tsx b/frontend/src/components/dashboard/ProcessBoard/index.tsx index cdbecd22a..1ba466cd6 100644 --- a/frontend/src/components/dashboard/ProcessBoard/index.tsx +++ b/frontend/src/components/dashboard/ProcessBoard/index.tsx @@ -11,11 +11,12 @@ interface KanbanBoardProps { export default function ProcessBoard({ processes, showRejectedApplicant = false }: KanbanBoardProps) { return ( - {processes.map((process) => ( + {processes.map((process, index) => ( ))} diff --git a/frontend/src/components/dashboard/ProcessColumn/index.tsx b/frontend/src/components/dashboard/ProcessColumn/index.tsx index ead11fd8b..8affff65b 100644 --- a/frontend/src/components/dashboard/ProcessColumn/index.tsx +++ b/frontend/src/components/dashboard/ProcessColumn/index.tsx @@ -14,9 +14,10 @@ import ProcessDescription from './ProcessDescription/index'; interface ProcessColumnProps { process: Process; showRejectedApplicant: boolean; + isPassedColumn: boolean; } -export default function ProcessColumn({ process, showRejectedApplicant }: ProcessColumnProps) { +export default function ProcessColumn({ process, showRejectedApplicant, isPassedColumn = false }: ProcessColumnProps) { const { dashboardId, applyFormId } = useParams() as { dashboardId: string; applyFormId: string }; const { processList } = useProcess({ dashboardId, applyFormId }); const { mutate: moveApplicantProcess } = useApplicant({}); @@ -41,7 +42,7 @@ export default function ProcessColumn({ process, showRejectedApplicant }: Proces }; return ( - + {process.name} diff --git a/frontend/src/components/dashboard/ProcessColumn/style.ts b/frontend/src/components/dashboard/ProcessColumn/style.ts index 392dd0afe..25f2a3d50 100644 --- a/frontend/src/components/dashboard/ProcessColumn/style.ts +++ b/frontend/src/components/dashboard/ProcessColumn/style.ts @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; import { hideScrollBar } from '@styles/utils'; -const ProcessWrapper = styled.section` +const ProcessWrapper = styled.section<{ isPassedColumn: boolean }>` width: 100%; min-width: 28rem; max-width: 28rem; @@ -10,7 +10,8 @@ const ProcessWrapper = styled.section` padding: 1.2rem; border-radius: 0.8rem; border: 0.1rem solid ${({ theme }) => theme.baseColors.grayscale[400]}; - background-color: ${({ theme }) => theme.baseColors.grayscale[50]}; + background-color: ${({ theme, isPassedColumn = false }) => + isPassedColumn ? '#F9FFF9' : theme.baseColors.grayscale[50]}; overflow-y: scroll; overflow-x: visible; From cdfc38600a8fc8a3e2d828aa4f1b0b1816bc9169 Mon Sep 17 00:00:00 2001 From: Kim Da Eun Date: Thu, 26 Sep 2024 17:27:16 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20mock=20=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/mocks/processMockData.json | 54 ++----------------------- 1 file changed, 3 insertions(+), 51 deletions(-) diff --git a/frontend/src/mocks/processMockData.json b/frontend/src/mocks/processMockData.json index bc173434c..1d7b47dd0 100644 --- a/frontend/src/mocks/processMockData.json +++ b/frontend/src/mocks/processMockData.json @@ -95,56 +95,8 @@ "averageScore": 3.0 } ], - "name": "프로세스 3", - "description": "지원서를 확인한다." - }, - { - "processId": 3, - "orderIndex": 4, - "applicants": [ - { - "applicantId": 11, - "applicantName": "러기", - "createdAt": "2024-07-16T05:46:08.328593", - "isRejected": false, - "evaluationCount": 0, - "averageScore": 0 - }, - { - "applicantId": 12, - "applicantName": "도비", - "createdAt": "2024-07-16T05:46:08.341936", - "isRejected": false, - "evaluationCount": 5, - "averageScore": 3.6 - }, - { - "applicantId": 13, - "applicantName": "러시", - "createdAt": "2024-07-16T05:46:08.356121", - "isRejected": false, - "evaluationCount": 4, - "averageScore": 4.3 - }, - { - "applicantId": 14, - "applicantName": "냥인", - "createdAt": "2024-07-16T05:46:08.359131", - "isRejected": false, - "evaluationCount": 5, - "averageScore": 2.8 - }, - { - "applicantId": 15, - "applicantName": "렛서", - "createdAt": "2024-07-16T05:46:08.361759", - "isRejected": false, - "evaluationCount": 0, - "averageScore": 0 - } - ], - "name": "프로세스 1", - "description": "지원서를 확인한다." + "name": "프로세스 2", + "description": "프로세스 2." }, { "processId": 4, @@ -239,7 +191,7 @@ "averageScore": 5.0 } ], - "name": "프로세스 2", + "name": "프로세스 1", "description": "지원서를 확인한다." }, {