Skip to content

Commit 868084b

Browse files
committed
fix: CANCELED 로 워딩 변경
1 parent a6cc44a commit 868084b

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

apps/client/app/(afterLogin)/my-study/_components/StudyCurriculum.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const StudyCurriculum = async () => {
5252
color: attendanceStatusColor,
5353
} =
5454
attendanceStatusMap[
55-
curriculumStatus === "CANCELLED" ? "ATTENDED" : attendanceStatus
55+
curriculumStatus === "CANCELED" ? "ATTENDED" : attendanceStatus
5656
];
5757

5858
const isAssignmentSubmissionSuccess =
@@ -74,7 +74,7 @@ const StudyCurriculum = async () => {
7474
const buttonDisabled =
7575
!isCurrentWeek ||
7676
assignmentSubmissionStatus === "FAILURE" ||
77-
assignmentStatus === "CANCELLED";
77+
assignmentStatus === "CANCELED";
7878

7979
const noDescriptionTextColor = description ? "black" : "sub";
8080

@@ -90,7 +90,7 @@ const StudyCurriculum = async () => {
9090
</Text>
9191
</div>
9292
<div className={contentContainerStyle}>
93-
{curriculumStatus === "CANCELLED" ? (
93+
{curriculumStatus === "CANCELED" ? (
9494
<Text as="h3" color="sub" typo="h3">
9595
휴강 주차
9696
</Text>

apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ const getTagProps = (
103103
status: AssignmentStatusType,
104104
assignmentSubmissionStatus: AssignmentSubmissionStatusType
105105
) => {
106-
if (status === "CANCELLED") {
107-
return assignmentSubmissionMap.CANCELLED;
106+
if (status === "CANCELED") {
107+
return assignmentSubmissionMap.CANCELED;
108108
}
109109

110110
if (
@@ -113,7 +113,7 @@ const getTagProps = (
113113
) {
114114
return assignmentSubmissionMap[assignmentSubmissionStatus];
115115
}
116-
return assignmentSubmissionMap.CANCELLED;
116+
return assignmentSubmissionMap.CANCELED;
117117
};
118118

119119
const weekStyle = css({
@@ -159,10 +159,10 @@ const tagContainerStyle = css({
159159
});
160160

161161
const assignmentSubmissionMap: Record<
162-
"CANCELLED" | "FAILURE" | "SUCCESS",
162+
"CANCELED" | "FAILURE" | "SUCCESS",
163163
{ tagText: string; tagColor: ComponentProps<typeof Tag>["color"] }
164164
> = {
165-
CANCELLED: { tagText: "과제 휴강", tagColor: "grey" },
165+
CANCELED: { tagText: "과제 휴강", tagColor: "grey" },
166166
FAILURE: { tagText: "제출 실패", tagColor: "red" },
167167
SUCCESS: { tagText: "제출 완료", tagColor: "blue" },
168168
};

apps/client/types/entities/common/assignment.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export type AssignmentSubmissionStatusType = "FAILURE" | "SUCCESS" | null;
2-
export type AssignmentStatusType = "NONE" | "OPEN" | "CANCELLED";
2+
export type AssignmentStatusType = "NONE" | "OPEN" | "CANCELED";
33
export type AssignmentSubmissionFailureType =
44
| "NONE"
55
| "NOT_SUBMITTED"

apps/client/types/entities/myStudy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export type AttendanceStatusType =
55

66
export type StudyDifficultyType = "BASIC" | "LOW" | "MEDIUM" | "HIGH";
77

8-
export type StudyCurriculumStatusType = "NONE" | "OPEN" | "CANCELLED";
8+
export type StudyCurriculumStatusType = "NONE" | "OPEN" | "CANCELED";
99

1010
export type DailyTaskType = "ATTENDANCE" | "ASSIGNMENT";
1111

0 commit comments

Comments
 (0)