From 13df025b2214e1b27961d87089eaf0180dbdf503 Mon Sep 17 00:00:00 2001 From: Jeong Ha Seung <88266129+HA-SEUNG-JEONG@users.noreply.github.com> Date: Sat, 31 Jan 2026 22:25:54 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=88=98=EC=A0=95=EB=90=9C=20?= =?UTF-8?q?=ED=8F=89=EA=B0=80=20=EC=96=91=EC=8B=9D=EC=9D=98=20=EB=93=B1?= =?UTF-8?q?=EA=B8=89=20=EC=98=B5=EC=85=98=20=EB=9D=BC=EB=B2=A8=20=EB=B0=8F?= =?UTF-8?q?=20=EA=B0=92=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8,=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/modals/create-evaluation-modal.tsx | 4 ++-- src/components/ui/toggle/group.tsx | 1 - src/features/study/group/channel/ui/comment-reaction.tsx | 2 +- src/features/study/group/channel/ui/comment-section.tsx | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/modals/create-evaluation-modal.tsx b/src/components/modals/create-evaluation-modal.tsx index e6697bb7..93a356d7 100644 --- a/src/components/modals/create-evaluation-modal.tsx +++ b/src/components/modals/create-evaluation-modal.tsx @@ -111,8 +111,8 @@ function CreateEvaluationForm({ const gradeOptions = grades ?.sort((a, b) => a.orderNum - b.orderNum) .map((grade) => ({ - value: grade.code, - label: `${grade.code} (${grade.score})`, + value: grade.label, + label: `${grade.label} (${grade.score})`, })); return ( diff --git a/src/components/ui/toggle/group.tsx b/src/components/ui/toggle/group.tsx index be31eb3c..993b59d7 100644 --- a/src/components/ui/toggle/group.tsx +++ b/src/components/ui/toggle/group.tsx @@ -82,7 +82,6 @@ function GroupItems(props: ToggleGroupProps) { role="group" aria-label="toggle-group" > - {} {options?.map(({ value: v, label }) => (
Date: Sat, 31 Jan 2026 23:03:44 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=ED=8F=89=EA=B0=80=20=EB=B0=8F=20?= =?UTF-8?q?=EB=AF=B8=EC=85=98=20=EB=AA=A8=EB=8B=AC=EC=9D=98=20=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=20=EC=9C=A0=ED=9A=A8=EC=84=B1=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EC=88=98=EC=A0=95,=20=EB=93=B1=EA=B8=89=20?= =?UTF-8?q?=EC=98=B5=EC=85=98=20=EB=9D=BC=EB=B2=A8=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/modals/create-evaluation-modal.tsx | 4 ++-- src/components/modals/create-mission-modal.tsx | 13 ++++++++----- src/components/modals/edit-evaluation-modal.tsx | 2 +- src/components/modals/edit-mission-modal.tsx | 6 +++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/components/modals/create-evaluation-modal.tsx b/src/components/modals/create-evaluation-modal.tsx index 93a356d7..22fcdb5a 100644 --- a/src/components/modals/create-evaluation-modal.tsx +++ b/src/components/modals/create-evaluation-modal.tsx @@ -111,8 +111,8 @@ function CreateEvaluationForm({ const gradeOptions = grades ?.sort((a, b) => a.orderNum - b.orderNum) .map((grade) => ({ - value: grade.label, - label: `${grade.label} (${grade.score})`, + value: grade.code, + label: `${grade.label} (${grade.score === 0 ? '0' : grade.score.toFixed(1)})`, })); return ( diff --git a/src/components/modals/create-mission-modal.tsx b/src/components/modals/create-mission-modal.tsx index ec1c78d7..2d265e82 100644 --- a/src/components/modals/create-mission-modal.tsx +++ b/src/components/modals/create-mission-modal.tsx @@ -29,12 +29,15 @@ const CreateMissionFormSchema = z.object({ .min(1, '수행 가이드를 입력해주세요.') .max(1000, '1000자 이하로 작성가능합니다.'), dateRange: z - .object({ - from: z.date({ error: '시작일을 선택해주세요.' }), - to: z.date({ error: '종료일을 선택해주세요.' }), - }) + .object( + { + from: z.date({ message: '시작일을 선택해주세요.' }), + to: z.date({ message: '종료일을 선택해주세요.' }), + }, + { message: '시작일과 종료일을 선택해주세요.' }, + ) .refine((data) => data.from && data.to && data.from <= data.to, { - message: '미션이 시작되면 수정 및 삭제가 불가합니다.', + message: '종료일은 시작일 이후여야 합니다.', }), }); diff --git a/src/components/modals/edit-evaluation-modal.tsx b/src/components/modals/edit-evaluation-modal.tsx index 65c18b58..d5728fc3 100644 --- a/src/components/modals/edit-evaluation-modal.tsx +++ b/src/components/modals/edit-evaluation-modal.tsx @@ -122,7 +122,7 @@ function EditEvaluationForm({ ?.sort((a, b) => a.orderNum - b.orderNum) .map((grade) => ({ value: grade.code, - label: `${grade.code} (${grade.score})`, + label: `${grade.label} (${grade.score === 0 ? '0' : grade.score.toFixed(1)})`, })); return ( diff --git a/src/components/modals/edit-mission-modal.tsx b/src/components/modals/edit-mission-modal.tsx index 3b2e668a..aa4ec2a7 100644 --- a/src/components/modals/edit-mission-modal.tsx +++ b/src/components/modals/edit-mission-modal.tsx @@ -28,11 +28,11 @@ const EditMissionFormSchema = z.object({ guide: z.string().min(1, '수행 가이드를 입력해주세요.'), dateRange: z .object({ - from: z.date({ error: '시작일을 선택해주세요.' }), - to: z.date({ error: '종료일을 선택해주세요.' }), + from: z.date({ message: '시작일을 선택해주세요.' }), + to: z.date({ message: '종료일을 선택해주세요.' }), }) .refine((data) => data.from && data.to && data.from <= data.to, { - message: '미션이 시작되면 수정 및 삭제가 불가합니다.', + message: '종료일은 시작일 이후여야 합니다.', }), });