From 060b2c4998be3a0090777a3f99bef4eb05bd5725 Mon Sep 17 00:00:00 2001 From: HaJunRyu Date: Wed, 28 Aug 2024 03:11:26 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Env:=20daum=20post-code=20types=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EB=B2=84=EC=A0=84=EC=97=85=EC=9D=84=20?= =?UTF-8?q?=EB=B0=98=EC=98=81=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .pnp.cjs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.pnp.cjs b/.pnp.cjs index 33ff995f..3b7cd45f 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -51,6 +51,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@testing-library/react", "virtual:749e5bbf5a36f23b3cf0fe3d04bee14b6518c1a723e8b01df428ddb8189c2ccc0edc216f830d01f6c6953a0ff06606bd469c60fb4212fe27940b27d64078f32d#npm:12.1.2"],\ ["@testing-library/react-hooks", "virtual:749e5bbf5a36f23b3cf0fe3d04bee14b6518c1a723e8b01df428ddb8189c2ccc0edc216f830d01f6c6953a0ff06606bd469c60fb4212fe27940b27d64078f32d#npm:7.0.2"],\ ["@testing-library/user-event", "virtual:749e5bbf5a36f23b3cf0fe3d04bee14b6518c1a723e8b01df428ddb8189c2ccc0edc216f830d01f6c6953a0ff06606bd469c60fb4212fe27940b27d64078f32d#npm:13.5.0"],\ + ["@types/daum-postcode", "npm:2.0.3"],\ ["@types/editorjs__header", "npm:2.6.0"],\ ["@types/jest", "npm:27.4.0"],\ ["@types/lodash-es", "npm:4.17.6"],\ @@ -6666,6 +6667,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["@types/daum-postcode", [\ + ["npm:2.0.3", {\ + "packageLocation": "./.yarn/cache/@types-daum-postcode-npm-2.0.3-f480b4f904-72283bd2c3.zip/node_modules/@types/daum-postcode/",\ + "packageDependencies": [\ + ["@types/daum-postcode", "npm:2.0.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@types/editorjs__header", [\ ["npm:2.6.0", {\ "packageLocation": "./.yarn/cache/@types-editorjs__header-npm-2.6.0-041ea9dc55-4f0b76c9bb.zip/node_modules/@types/editorjs__header/",\ @@ -17504,6 +17514,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@testing-library/react", "virtual:749e5bbf5a36f23b3cf0fe3d04bee14b6518c1a723e8b01df428ddb8189c2ccc0edc216f830d01f6c6953a0ff06606bd469c60fb4212fe27940b27d64078f32d#npm:12.1.2"],\ ["@testing-library/react-hooks", "virtual:749e5bbf5a36f23b3cf0fe3d04bee14b6518c1a723e8b01df428ddb8189c2ccc0edc216f830d01f6c6953a0ff06606bd469c60fb4212fe27940b27d64078f32d#npm:7.0.2"],\ ["@testing-library/user-event", "virtual:749e5bbf5a36f23b3cf0fe3d04bee14b6518c1a723e8b01df428ddb8189c2ccc0edc216f830d01f6c6953a0ff06606bd469c60fb4212fe27940b27d64078f32d#npm:13.5.0"],\ + ["@types/daum-postcode", "npm:2.0.3"],\ ["@types/editorjs__header", "npm:2.6.0"],\ ["@types/jest", "npm:27.4.0"],\ ["@types/lodash-es", "npm:4.17.6"],\ From fa881111624c1d63adf33713b9a1016769273b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?HajunRyu=28=EB=A5=98=ED=95=98=EC=A4=80=29?= <71176945+HaJunRyu@users.noreply.github.com> Date: Sun, 1 Sep 2024 16:20:42 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=B3=80=EA=B2=BD=EB=90=9C=20=EC=A0=95?= =?UTF-8?q?=EC=B1=85=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=96=B4=EB=93=9C?= =?UTF-8?q?=EB=AF=BC=20=ED=99=9C=EB=8F=99=EC=A0=90=EC=88=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80/=EC=B0=A8=EA=B0=90=20=ED=95=AD=EB=AA=A9=EC=9D=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20(#311)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Feat: 변경된 정책에 맞게 어드민 활동점수 추가/차감 항목을 변경한다 * Fix: key prop이 중복되지 않도록 수정한다 * Chore scoreType 프로퍼티명을 변경한다 * Feat: 새로 정의된 scoreType을 적용한다 * Fix: 누락된 scoreType에 대한 Icon을 추가한다 * Fix: 누락된 key prop을 추가한다 * Fix: Navigation 컴포넌트의 누락된 key prop을 추가한다 * Fix: MVP 배포 실패 항목에 대한 점수가 잘못 입력되어있는것을 수정한다 --- .../ActivityScore/Icon/Icon.component.tsx | 2 + src/components/ActivityScore/constants.ts | 2 + .../Navigation/Navigation.component.tsx | 10 ++-- .../common/Table/Table.component.tsx | 4 +- ...pplyActivityScoreModalDialog.component.tsx | 53 +++++++++---------- 5 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/components/ActivityScore/Icon/Icon.component.tsx b/src/components/ActivityScore/Icon/Icon.component.tsx index 529714ae..882d20b6 100644 --- a/src/components/ActivityScore/Icon/Icon.component.tsx +++ b/src/components/ActivityScore/Icon/Icon.component.tsx @@ -22,6 +22,8 @@ const scoreIcon = { [ScoreType.LATE]: , [ScoreType.ABSENT]: , [ScoreType.SEMINAR_PRESENTATION]: , + [ScoreType.ADD_SCORE_DURING_SEMINAR_ACTIVITY_0_5]: , + [ScoreType.ADD_SCORE_DURING_SEMINAR_ACTIVITY_1]: , [ScoreType.DEPLOY_SUCCESS]: , [ScoreType.DEPLOY_FAILURE]: , [ScoreType.MASHUP_LEADER]: , diff --git a/src/components/ActivityScore/constants.ts b/src/components/ActivityScore/constants.ts index ef67dccd..58a46c44 100644 --- a/src/components/ActivityScore/constants.ts +++ b/src/components/ActivityScore/constants.ts @@ -12,6 +12,8 @@ export const ScoreType = { MASHUP_LEADER: 'MASHUP_LEADER', MASHUP_SUBLEADER: 'MASHUP_SUBLEADER', MASHUP_CONTENT_WRITE: 'MASHUP_CONTENT_WRITE', + ADD_SCORE_DURING_SEMINAR_ACTIVITY_0_5: 'ADD_SCORE_DURING_SEMINAR_ACTIVITY_0_5', + ADD_SCORE_DURING_SEMINAR_ACTIVITY_1: 'ADD_SCORE_DURING_SEMINAR_ACTIVITY_1', DEFAULT: 'DEFAULT', } as const; diff --git a/src/components/common/Navigation/Navigation.component.tsx b/src/components/common/Navigation/Navigation.component.tsx index a813bdde..057c8235 100644 --- a/src/components/common/Navigation/Navigation.component.tsx +++ b/src/components/common/Navigation/Navigation.component.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement } from 'react'; +import React, { Fragment, ReactElement } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; import { useRecoilValue, useResetRecoilState } from 'recoil'; import { ValueOf } from '@/types'; @@ -50,7 +50,7 @@ const Navigation = ({ size, inActiveColor, items, showBottomBorder = true }: Nav return ( {items.map((item) => ( - <> + {item.title} {item.menus.map((menu, menuIdx) => { if (menu.isMasterOnly && !isMaster) { @@ -62,7 +62,7 @@ const Navigation = ({ size, inActiveColor, items, showBottomBorder = true }: Nav .some((pathNameItem) => `/${pathNameItem}` === menu.to); return ( - <> + {item.menus.length === menuIdx + 1 && } - + ); })} - + ))} diff --git a/src/components/common/Table/Table.component.tsx b/src/components/common/Table/Table.component.tsx index e8633d8f..9664c3c7 100644 --- a/src/components/common/Table/Table.component.tsx +++ b/src/components/common/Table/Table.component.tsx @@ -188,10 +188,10 @@ const TableColumnCell = ({ return ( {titles.map((title, index) => ( - <> + {title} {index !== titles.length - 1 &&
} - + ))} ); diff --git a/src/components/modal/ApplyActivityScoreModalDialog/ApplyActivityScoreModalDialog.component.tsx b/src/components/modal/ApplyActivityScoreModalDialog/ApplyActivityScoreModalDialog.component.tsx index 32574770..e0c2d476 100644 --- a/src/components/modal/ApplyActivityScoreModalDialog/ApplyActivityScoreModalDialog.component.tsx +++ b/src/components/modal/ApplyActivityScoreModalDialog/ApplyActivityScoreModalDialog.component.tsx @@ -23,69 +23,66 @@ interface FormValues { } const scoreTypes = [ - { - label: '출결', - items: [ - { value: ScoreType.ATTENDANCE, label: '출석', rangeType: RangeType.Normal, range: 0 }, - { value: ScoreType.LATE, label: '지각', rangeType: RangeType.Minus, range: 0.5 }, - { value: ScoreType.ABSENT, label: '결석', rangeType: RangeType.Minus, range: 1 }, - ], - }, { label: '활동', items: [ { - value: ScoreType.DEPLOY_FAILURE, - label: '프로젝트 배포 실패', - rangeType: RangeType.Minus, + value: ScoreType.SEMINAR_PRESENTATION, + label: '전체 세미나 발표', + rangeType: RangeType.Plus, range: 1, }, { - value: ScoreType.DEPLOY_SUCCESS, - label: '프로젝트 배포 성공', + value: ScoreType.ADD_SCORE_DURING_SEMINAR_ACTIVITY_0_5, + label: '세미나 활동중 추가 점수(0.5)', rangeType: RangeType.Plus, - range: 1, + range: 0.5, }, { - value: ScoreType.SEMINAR_PRESENTATION, - label: '전체 세미나 발표', + value: ScoreType.ADD_SCORE_DURING_SEMINAR_ACTIVITY_1, + label: '세미나 활동중 추가 점수(1)', rangeType: RangeType.Plus, range: 1, }, { value: ScoreType.MASHUP_CONTENT_WRITE, - label: '매시업 콘텐츠 글 작성', + label: 'Mash-Up 콘텐츠 글 작성', rangeType: RangeType.Plus, range: 0.5, }, { value: ScoreType.HACKATHON_COMMITTEE, - label: '뭐든준비위원회', + label: '준비위원회', rangeType: RangeType.Plus, range: 1, }, + { + value: ScoreType.DEPLOY_FAILURE, + label: '프로젝트 MVP 배포 실패', + rangeType: RangeType.Minus, + range: 0.5, + }, ], }, { label: '직위', items: [ - { value: ScoreType.MASHUP_LEADER, label: '회장', rangeType: RangeType.Plus, range: 100 }, - { value: ScoreType.MASHUP_SUBLEADER, label: '부회장', rangeType: RangeType.Plus, range: 100 }, - { value: ScoreType.MASHUP_STAFF, label: '스태프', rangeType: RangeType.Plus, range: 99 }, + { value: ScoreType.MASHUP_STAFF, label: '스태프', rangeType: RangeType.Plus, range: 3 }, { value: ScoreType.PROJECT_LEADER, - label: '프로젝트팀 팀장', - rangeType: RangeType.Plus, - range: 2, - }, - { - value: ScoreType.PROJECT_SUBLEADER, - label: '프로젝트팀 부팀장', + label: '프로젝트 팀 리더', rangeType: RangeType.Plus, range: 2, }, ], }, + { + label: '출결', + items: [ + { value: ScoreType.LATE, label: '지각', rangeType: RangeType.Minus, range: 0.5 }, + { value: ScoreType.ABSENT, label: '결석', rangeType: RangeType.Minus, range: 1 }, + ], + }, ]; export interface ApplyActivityScoreModalDialogProps {