Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat-fe: 마지막 process column의 배경색 변경 #732

Merged
merged 4 commits into from
Sep 26, 2024
Merged

feat-fe: 마지막 process column의 배경색 변경 #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea91cf2
Create draft PR for #731
github-actions[bot] Sep 26, 2024
070be02
feat: 프로세스 보드의 마지막 컬럼 배경색을 초록색으로 변경
llqqssttyy Sep 26, 2024
cdfc386
chore: mock 데이터 변경
llqqssttyy Sep 26, 2024
269a3ab
Merge branch 'fe/develop' into fe-731-FDBK_01
lurgi Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend/src/components/dashboard/ProcessBoard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ interface KanbanBoardProps {
export default function ProcessBoard({ processes, showRejectedApplicant = false }: KanbanBoardProps) {
return (
<S.Wrapper>
{processes.map((process) => (
{processes.map((process, index) => (
<ProcessColumn
key={process.processId}
process={process}
showRejectedApplicant={showRejectedApplicant}
isPassedColumn={!showRejectedApplicant && index === processes.length - 1}
/>
))}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/dashboard/ProcessColumn/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ import S from './style';
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({});
Expand Down Expand Up @@ -72,7 +73,7 @@ export default function ProcessColumn({ process, showRejectedApplicant }: Proces
};

return (
<S.ProcessWrapper>
<S.ProcessWrapper isPassedColumn={isPassedColumn}>
<S.Header>
<S.Title>{process.name}</S.Title>
<ProcessDescription description={process.description} />
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/dashboard/ProcessColumn/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
54 changes: 3 additions & 51 deletions frontend/src/mocks/processMockData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -239,7 +191,7 @@
"averageScore": 5.0
}
],
"name": "프로세스 2",
"name": "프로세스 1",
"description": "지원서를 확인한다."
},
{
Expand Down
Loading