From 473c397380123e053dcd1f65a6d8713cc12f2ae9 Mon Sep 17 00:00:00 2001 From: SeieunYoo Date: Mon, 2 Sep 2024 01:14:39 +0900 Subject: [PATCH 01/50] =?UTF-8?q?feat:=20=ED=81=90=EC=97=90=EC=9D=B4=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/apis/studyApplyApi.ts | 5 ++--- .../study-apply/_components/StudyItem.tsx | 16 +++++----------- apps/client/constants/revalidateTime.ts | 1 - apps/client/types/entities/common/study.ts | 2 +- 4 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 apps/client/constants/revalidateTime.ts diff --git a/apps/client/apis/studyApplyApi.ts b/apps/client/apis/studyApplyApi.ts index 280e2b9e..973de4df 100644 --- a/apps/client/apis/studyApplyApi.ts +++ b/apps/client/apis/studyApplyApi.ts @@ -1,6 +1,5 @@ import { fetcher } from "@wow-class/utils"; import { apiPath } from "constants/apiPath"; -import { revalidateTime } from "constants/revalidateTime"; import { tags } from "constants/tags"; import type { StudyListApiResponseDto } from "types/dtos/applyStudy"; @@ -9,8 +8,8 @@ export const studyApplyApi = { const response = await fetcher.get( apiPath.applyStudy, { - next: { tags: [tags.studyApply], revalidate: revalidateTime }, - cache: "force-cache", + next: { tags: [tags.studyApply] }, + cache: "no-store", } ); diff --git a/apps/client/app/(afterLogin)/study-apply/_components/StudyItem.tsx b/apps/client/app/(afterLogin)/study-apply/_components/StudyItem.tsx index f62aef0f..0a6e350b 100644 --- a/apps/client/app/(afterLogin)/study-apply/_components/StudyItem.tsx +++ b/apps/client/app/(afterLogin)/study-apply/_components/StudyItem.tsx @@ -39,9 +39,9 @@ const StudyItem = ({ study, appliedStudyId }: StudyItemProps) => { const { hour: startTimeHour, minute: startTimeMinute } = startTime; const { hour: endTimeHour, minute: endTimeMinute } = endTime; - return `${dayToKorean[dayOfWeek.toUpperCase()]} ${startTimeHour}:${padWithZero(startTimeMinute)} - ${ + return `${dayToKorean[dayOfWeek.toUpperCase()]} ${padWithZero(startTimeHour)}:${padWithZero(startTimeMinute)} - ${padWithZero( endTimeHour - }:${padWithZero(endTimeMinute)}`; + )}:${padWithZero(endTimeMinute)}`; }; const studyTime = startTime && endTime ? formatTime(startTime, endTime) : "-"; @@ -60,7 +60,7 @@ const StudyItem = ({ study, appliedStudyId }: StudyItemProps) => { style={tagButtonStyle} variant="solid1" > - {tagTexts[studyType]} + {studyType} {introduction && ( @@ -200,17 +200,11 @@ const tagButtonStyle = { whiteSpace: "nowrap", }; -const tagTexts: Record = { - "과제 스터디": "과제 스터디", - "온라인 커리큘럼": "온라인 스터디", - "오프라인 커리큘럼": "오프라인 스터디", -}; - const curriculumColors: Record["color"]> = { "과제 스터디": "green", - "온라인 커리큘럼": "blue", - "오프라인 커리큘럼": "yellow", + "온라인 스터디": "blue", + "오프라인 스터디": "yellow", }; export default StudyItem; diff --git a/apps/client/constants/revalidateTime.ts b/apps/client/constants/revalidateTime.ts deleted file mode 100644 index 63665588..00000000 --- a/apps/client/constants/revalidateTime.ts +++ /dev/null @@ -1 +0,0 @@ -export const revalidateTime = 180; diff --git a/apps/client/types/entities/common/study.ts b/apps/client/types/entities/common/study.ts index 43fe686c..05fa56f8 100644 --- a/apps/client/types/entities/common/study.ts +++ b/apps/client/types/entities/common/study.ts @@ -1 +1 @@ -export type StudyType = "과제 스터디" | "온라인 커리큘럼" | "오프라인 커리큘럼"; +export type StudyType = "과제 스터디" | "온라인 스터디" | "오프라인 스터디"; From 4d96c98474f7cd14a535fc443c3c25d8e4732b4e Mon Sep 17 00:00:00 2001 From: SeieunYoo Date: Mon, 2 Sep 2024 17:38:48 +0900 Subject: [PATCH 02/50] =?UTF-8?q?fix:=20=EC=86=8C=EB=AC=B8=EC=9E=90?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssignmentOverviewBox/FailurePopover.tsx | 8 ++++---- .../my-assignment/_components/AssignmentDescription.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/FailurePopover.tsx b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/FailurePopover.tsx index 7c25e88c..a899d8cf 100644 --- a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/FailurePopover.tsx +++ b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/FailurePopover.tsx @@ -29,13 +29,13 @@ export const FailurePopover = ({ {submissionFailureType === "LOCATION_UNIDENTIFIABLE" && ( <> - 아래 조건에 맞게 WIL.md 파일을 제출했는지 확인해주세요.
+ 아래 조건에 맞게 wil.md 파일을 제출했는지 확인해주세요.

  • 본인의 레포지터리가 맞는지
  • 제출한 브랜치 이름이 main인지
    • -
  • 파일 위치가 `WeekN/WIL.md` 가 맞는지
    • -
  • 파일 위치가 `WeekN/WIL.md` 가 맞는지
    • +
  • 파일 위치가 `weekn/wil.md` 가 맞는지
    • +
  • 커밋 후 원격 저장소에 push까지 완료했는지


@@ -46,7 +46,7 @@ export const FailurePopover = ({ )} {submissionFailureType === "WORD_COUNT_INSUFFICIENT" && (

- WIL.md 파일에 배운 내용을 최소 300자 이상 작성해야 해요.
+ wil.md 파일에 배운 내용을 최소 300자 이상 작성해야 해요.

제대로 제출한 후에도 계속 글자수가 부족하다고 나온다면,
diff --git a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentDescription.tsx b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentDescription.tsx index c80bf806..42815cc0 100644 --- a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentDescription.tsx +++ b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentDescription.tsx @@ -24,7 +24,7 @@ export const AssignmentDescription = async () => { GitHub 레포지토리 )} - 의 main 브랜치에서 가장 최신 상태의 WIL.md 파일이 제출돼요.
+ 의 main 브랜치에서 가장 최신 상태의 wil.md 파일이 제출돼요.
과제는 기한 내에 여러 번 제출할 수 있으나, 가장 마지막 제출만 최종 제출로 인정해요.

From 0a470e4277b59fc761f768b129038dd390243dd0 Mon Sep 17 00:00:00 2001 From: SeieunYoo Date: Mon, 2 Sep 2024 18:32:10 +0900 Subject: [PATCH 03/50] =?UTF-8?q?refactor:=20api=20dto=20=EB=B0=98?= =?UTF-8?q?=EC=98=81,=20=EC=9D=B4=EB=B2=88=20=EC=A3=BC=20=EA=B3=BC?= =?UTF-8?q?=EC=A0=9C=20=EC=A1=B0=ED=9A=8C=20api=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssignmentBoxButtons.tsx | 20 ++++++--- .../AssignmentBoxTitle.tsx | 21 +++++++--- .../RepositorySubmissionBox.tsx | 1 + .../_components/AssignmentContent/index.tsx | 42 ++++++++++++------- .../_components/AssignmentDescription.tsx | 25 +++++++---- .../_components/AssignmentHeader.tsx | 17 +++++--- .../AssignmentHistoryItem.tsx | 20 +++++---- .../_components/AssignmentHistory/index.tsx | 14 +++++-- .../app/(afterLogin)/study-apply/page.tsx | 4 ++ apps/client/components/Navbar.tsx | 22 +++------- apps/client/constants/navMenu.ts | 18 ++++---- apps/client/constants/tags.ts | 1 + apps/client/types/dtos/studyDetail.ts | 1 + .../types/entities/common/assignment.ts | 2 +- 14 files changed, 133 insertions(+), 75 deletions(-) diff --git a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxButtons.tsx b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxButtons.tsx index ea9b7bbe..a650ecd1 100644 --- a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxButtons.tsx +++ b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxButtons.tsx @@ -33,7 +33,10 @@ const PrimaryButton = ({ }: AssignmentBoxButtonsProps) => { const { assignmentSubmissionStatus, submissionFailureType, submissionLink } = assignment; - const { primaryButtonText } = buttonProps[assignmentSubmissionStatus]; + const { primaryButtonText } = + assignmentSubmissionStatus === null + ? buttonProps.null + : buttonProps[assignmentSubmissionStatus]; if ( assignmentSubmissionStatus === "FAILURE" && @@ -43,7 +46,7 @@ const PrimaryButton = ({ } const stroke = buttonsDisabled ? "mono100" : "primary"; return ( - +