From 868084ba98d1b300f6daa47bf566137062363fca Mon Sep 17 00:00:00 2001
From: SeieunYoo <isho48239@gmail.com>
Date: Mon, 4 Nov 2024 00:15:23 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20CANCELED=20=EB=A1=9C=20=EC=9B=8C?=
 =?UTF-8?q?=EB=94=A9=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../my-study/_components/StudyCurriculum.tsx           |  6 +++---
 .../AssignmentHistory/AssignmentHistoryItem.tsx        | 10 +++++-----
 apps/client/types/entities/common/assignment.ts        |  2 +-
 apps/client/types/entities/myStudy.ts                  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/client/app/(afterLogin)/my-study/_components/StudyCurriculum.tsx b/apps/client/app/(afterLogin)/my-study/_components/StudyCurriculum.tsx
index be631a45..95c455f2 100644
--- 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/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx
index 2afccd42..6884f2c7 100644
--- a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx
+++ b/apps/client/app/(afterLogin)/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
index 8558c02a..2182b7f5 100644
--- 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
index d30377c9..675ec38e 100644
--- 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";