Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/modals/create-evaluation-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function CreateEvaluationForm({
?.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 (
Expand Down
13 changes: 8 additions & 5 deletions src/components/modals/create-mission-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: '종료일은 시작일 이후여야 합니다.',
}),
});

Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/edit-evaluation-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions src/components/modals/edit-mission-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: '종료일은 시작일 이후여야 합니다.',
}),
});

Expand Down
1 change: 0 additions & 1 deletion src/components/ui/toggle/group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ function GroupItems(props: ToggleGroupProps) {
role="group"
aria-label="toggle-group"
>
{}
{options?.map(({ value: v, label }) => (
<Item
key={v}
Expand Down
2 changes: 1 addition & 1 deletion src/features/study/group/channel/ui/comment-reaction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function CommentReaction({
retry: 0,
});

const { reaction, counts, like, dislike, reconcile } = useReactionLogic({
const { reaction, counts, like, dislike } = useReactionLogic({
initialReaction,
initialCounts,
mode: 'debounce',
Expand Down
2 changes: 1 addition & 1 deletion src/features/study/group/channel/ui/comment-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default function CommentSection({ groupStudyId }: CommentProps) {
return (
<div
key={comment.threadId}
className="border-b-[1px] border-[#D5D7DA] pb-300"
className="border-b border-[#D5D7DA] pb-300"
>
<div className="flex flex-col gap-200">
<Comment
Expand Down
Loading