From dc847416a9312d3995b71edcb968d5d60fb16325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=99=8D=EC=84=9C=ED=98=84?= <ghdtjgus76@naver.com>
Date: Wed, 4 Sep 2024 17:56:05 +0900
Subject: [PATCH] =?UTF-8?q?[Chore]=20=EB=82=98=EC=9D=98=20=EC=8A=A4?=
 =?UTF-8?q?=ED=84=B0=EB=94=94=20=ED=8E=98=EC=9D=B4=EC=A7=80=20QA=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81=20(#121)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 커리큘럼 과제 제출하기 리다이렉트 추가

* chore: 스터디 커리큘럼 상세 정보 없는 경우 처리

* fix: 과제 수행하지 않은 경우 오늘의 할 일 나의 과제 바로가기 버튼 활성화

* chore: 과제 상태 박스에서 제출 전 상태 고려하도록 수정
---
 .../_components/AssignmentStatusBox.tsx       | 14 +++++------
 .../my-study/_components/StudyCurriculum.tsx  | 25 ++++++++++++++++---
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/apps/client/app/(afterLogin)/my-study/_components/AssignmentStatusBox.tsx b/apps/client/app/(afterLogin)/my-study/_components/AssignmentStatusBox.tsx
index 8a4535d6..b7b9b238 100644
--- a/apps/client/app/(afterLogin)/my-study/_components/AssignmentStatusBox.tsx
+++ b/apps/client/app/(afterLogin)/my-study/_components/AssignmentStatusBox.tsx
@@ -13,10 +13,7 @@ import Tag from "wowds-ui/Tag";
 interface AssignmentStatusBoxProps {
   week: number;
   name: string;
-  assignmentSubmissionStatus: Extract<
-    AssignmentSubmissionStatusType,
-    "SUCCESS" | "FAILURE"
-  >;
+  assignmentSubmissionStatus: AssignmentSubmissionStatusType;
   deadLine: string;
 }
 
@@ -30,9 +27,9 @@ const AssignmentStatusBox = ({
 
   const attendanceDeadline = `${year}년 ${month}월 ${day}일 ${padWithZero(hours)}:${padWithZero(minutes)}까지`;
   const {
-    label: assignmentSubmissionStatusLabel = "",
+    label: assignmentSubmissionStatusLabel,
     color: assignmentSubmissionStatusColor,
-  } = assignmentSubmissionStatusMap[assignmentSubmissionStatus] || {};
+  } = assignmentSubmissionStatusMap[assignmentSubmissionStatus];
 
   return (
     <Box
@@ -68,7 +65,7 @@ const AssignmentStatusBox = ({
           </Flex>
           <Button
             asProp={Link}
-            disabled={assignmentSubmissionStatus !== "SUCCESS"}
+            disabled={assignmentSubmissionStatus !== "NOT_SUBMITTED"}
             href={routePath["my-assignment"]}
             size="lg"
             style={assignmentButtonStyle}
@@ -84,11 +81,12 @@ const AssignmentStatusBox = ({
 export default AssignmentStatusBox;
 
 const assignmentSubmissionStatusMap: Record<
-  Extract<AssignmentSubmissionStatusType, "SUCCESS" | "FAILURE">,
+  AssignmentSubmissionStatusType,
   { label: string; color: ComponentProps<typeof Tag>["color"] }
 > = {
   SUCCESS: { label: "제출 완료", color: "blue" },
   FAILURE: { label: "제출 실패", color: "red" },
+  NOT_SUBMITTED: { label: "", color: "grey" },
 };
 
 const dailyTaskBoxStyle = {
diff --git a/apps/client/app/(afterLogin)/my-study/_components/StudyCurriculum.tsx b/apps/client/app/(afterLogin)/my-study/_components/StudyCurriculum.tsx
index 37613f4f..dab152cb 100644
--- a/apps/client/app/(afterLogin)/my-study/_components/StudyCurriculum.tsx
+++ b/apps/client/app/(afterLogin)/my-study/_components/StudyCurriculum.tsx
@@ -4,6 +4,7 @@ import { Table, Text } from "@wow-class/ui";
 import { formatWeekPeriod } from "@wow-class/utils";
 import { myStudyApi } from "apis/myStudyApi";
 import { attendanceStatusMap } from "constants/attendanceStatusMap";
+import { routePath } from "constants/routePath";
 import Link from "next/link";
 import type { ComponentProps } from "react";
 import type { StudyDifficultyType } from "types/entities/myStudy";
@@ -53,16 +54,23 @@ const StudyCurriculum = async () => {
               attendanceStatusMap[
                 curriculumStatus === "CANCELLED" ? "ATTENDED" : attendanceStatus
               ];
+
             const assignmentButtonText =
               assignmentSubmissionStatus === "SUCCESS"
                 ? "제출한 과제 확인"
                 : "과제 제출하기";
+            const assignmentButtonHref =
+              submissionLink ?? routePath["my-assignment"] ?? "";
+
             const isCurrentWeek = getIsCurrentWeek(startDate, endDate);
+
             const buttonDisabled =
               !isCurrentWeek ||
               assignmentSubmissionStatus === "FAILURE" ||
               assignmentStatus === "CANCELLED";
 
+            const noDescriptionTextColor = description ? "black" : "sub";
+
             return (
               <Table key={index}>
                 <Table.Left className={leftColStyle}>
@@ -70,7 +78,7 @@ const StudyCurriculum = async () => {
                     {isCurrentWeek && (
                       <div className={currentWeekIndicatorStyle} />
                     )}
-                    <Text as="h5" typo="body1">
+                    <Text as="h5" color={noDescriptionTextColor} typo="body1">
                       {week}주차
                     </Text>
                   </div>
@@ -79,7 +87,7 @@ const StudyCurriculum = async () => {
                       <Text as="h3" color="sub" typo="h3">
                         휴강 주차
                       </Text>
-                    ) : (
+                    ) : description ? (
                       <Flex
                         direction="column"
                         gap={4.5}
@@ -102,11 +110,20 @@ const StudyCurriculum = async () => {
                           {description}
                         </Text>
                       </Flex>
+                    ) : (
+                      <Text as="h3" color="sub" typo="h3">
+                        작성된 내용이 없어요
+                      </Text>
                     )}
                   </div>
                 </Table.Left>
                 <Table.Right className={rightColStyle}>
-                  <Text as="h5" className={weekPeriodTextStyle} typo="body1">
+                  <Text
+                    as="h5"
+                    className={weekPeriodTextStyle}
+                    color={noDescriptionTextColor}
+                    typo="body1"
+                  >
                     {formatWeekPeriod(startDate, endDate)}
                   </Text>
                   <div className={tagContainerStyle}>
@@ -123,7 +140,7 @@ const StudyCurriculum = async () => {
                     aria-label="check-submitted-assignment"
                     asProp={Link}
                     disabled={buttonDisabled}
-                    href={submissionLink || ""}
+                    href={assignmentButtonHref}
                     size="sm"
                     style={assignmentButtonStyle}
                     target="_blank"