fix: CANCELED 로 워딩 변경

GDSC-Hongik · Nov 3, 2024 · 868084b · 868084b
1 parent a6cc44a
commit 868084b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/apps/client/app/(afterLogin)/my-study/_components/StudyCurriculum.tsx b/apps/client/app/(afterLogin)/my-study/_components/StudyCurriculum.tsx
@@ -52,7 +52,7 @@ const StudyCurriculum = async () => {
               color: attendanceStatusColor,
             } =
               attendanceStatusMap[
-                curriculumStatus === "CANCELLED" ? "ATTENDED" : attendanceStatus
+                curriculumStatus === "CANCELED" ? "ATTENDED" : attendanceStatus
               ];
 
             const isAssignmentSubmissionSuccess =
@@ -74,7 +74,7 @@ const StudyCurriculum = async () => {
             const buttonDisabled =
               !isCurrentWeek ||
               assignmentSubmissionStatus === "FAILURE" ||
-              assignmentStatus === "CANCELLED";
+              assignmentStatus === "CANCELED";
 
             const noDescriptionTextColor = description ? "black" : "sub";
 
@@ -90,7 +90,7 @@ const StudyCurriculum = async () => {
                     </Text>
                   </div>
                   <div className={contentContainerStyle}>
-                    {curriculumStatus === "CANCELLED" ? (
+                    {curriculumStatus === "CANCELED" ? (
                       <Text as="h3" color="sub" typo="h3">
                         휴강 주차
                       </Text>

diff --git a/...fterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx b/...fterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx
@@ -103,8 +103,8 @@ const getTagProps = (
   status: AssignmentStatusType,
   assignmentSubmissionStatus: AssignmentSubmissionStatusType
 ) => {
-  if (status === "CANCELLED") {
-    return assignmentSubmissionMap.CANCELLED;
+  if (status === "CANCELED") {
+    return assignmentSubmissionMap.CANCELED;
   }
 
   if (
@@ -113,7 +113,7 @@ const getTagProps = (
   ) {
     return assignmentSubmissionMap[assignmentSubmissionStatus];
   }
-  return assignmentSubmissionMap.CANCELLED;
+  return assignmentSubmissionMap.CANCELED;
 };
 
 const weekStyle = css({
@@ -159,10 +159,10 @@ const tagContainerStyle = css({
 });
 
 const assignmentSubmissionMap: Record<
-  "CANCELLED" | "FAILURE" | "SUCCESS",
+  "CANCELED" | "FAILURE" | "SUCCESS",
   { tagText: string; tagColor: ComponentProps<typeof Tag>["color"] }
 > = {
-  CANCELLED: { tagText: "과제 휴강", tagColor: "grey" },
+  CANCELED: { tagText: "과제 휴강", tagColor: "grey" },
   FAILURE: { tagText: "제출 실패", tagColor: "red" },
   SUCCESS: { tagText: "제출 완료", tagColor: "blue" },
 };

diff --git a/apps/client/types/entities/common/assignment.ts b/apps/client/types/entities/common/assignment.ts
@@ -1,5 +1,5 @@
 export type AssignmentSubmissionStatusType = "FAILURE" | "SUCCESS" | null;
-export type AssignmentStatusType = "NONE" | "OPEN" | "CANCELLED";
+export type AssignmentStatusType = "NONE" | "OPEN" | "CANCELED";
 export type AssignmentSubmissionFailureType =
   | "NONE"
   | "NOT_SUBMITTED"

diff --git a/apps/client/types/entities/myStudy.ts b/apps/client/types/entities/myStudy.ts
@@ -5,7 +5,7 @@ export type AttendanceStatusType =
 
 export type StudyDifficultyType = "BASIC" | "LOW" | "MEDIUM" | "HIGH";
 
-export type StudyCurriculumStatusType = "NONE" | "OPEN" | "CANCELLED";
+export type StudyCurriculumStatusType = "NONE" | "OPEN" | "CANCELED";
 
 export type DailyTaskType = "ATTENDANCE" | "ASSIGNMENT";