From 4d19b922a55fbec114e13438c5c70284c2d6ff66 Mon Sep 17 00:00:00 2001 From: SeieunYoo Date: Sat, 28 Dec 2024 22:24:04 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=EB=A0=88=ED=8F=AC=EC=A7=80?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EB=B0=95=EC=8A=A4=20=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssignmentContent/RepositorySubmissionBox.tsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/RepositorySubmissionBox.tsx b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/RepositorySubmissionBox.tsx index 5139509c..1196b290 100644 --- a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/RepositorySubmissionBox.tsx +++ b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/RepositorySubmissionBox.tsx @@ -21,6 +21,8 @@ interface RepositorySubmissionBoxProps { repositoryLink: string; } +const repositoryInfoMessage = "과제 제출 후에도 레포지토리 수정이 가능해요."; + export const RepositorySubmissionBox = ({ repositoryLink: initialRepositoryUrl, }: RepositorySubmissionBoxProps) => { @@ -124,9 +126,7 @@ export const RepositorySubmissionBox = ({ <> {repositorySubmissionStatus === "SUBMITTED" && ( <> - - 최초 과제 제출 전 까지만 수정이 가능해요. - + {repositoryInfoMessage}
{repositoryUrl}
@@ -184,7 +184,7 @@ export const RepositorySubmissionBox = ({ 레포지토리를 입력하시겠어요? - 최초 과제 제출 전까지 수정이 가능해요. + {repositoryInfoMessage}
{repositoryUrl}
@@ -219,9 +219,6 @@ const modalUrlBoxStyle = css({ paddingX: "lg", paddingY: "sm", textStyle: "h2", - overflow: "hidden", - textOverflow: "ellipsis", - whiteSpace: "nowrap", width: "375px", }); const boxStyle = { From e37446dc93abd66ccdaa0003554f213355745a20 Mon Sep 17 00:00:00 2001 From: SeieunYoo Date: Sat, 28 Dec 2024 22:27:16 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=201=EC=A3=BC=EC=B0=A8=20=EA=B3=BC?= =?UTF-8?q?=EC=A0=9C=EA=B0=80=20=EC=9E=88=EC=9C=BC=EB=A9=B4=20=20=EB=A0=88?= =?UTF-8?q?=ED=8F=AC=EB=B0=95=EC=8A=A4=20=EC=99=BC=EC=AA=BD=EC=97=90=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_components/AssignmentContent/index.tsx | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/index.tsx b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/index.tsx index c8d8eecf..3f2250cd 100644 --- a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/index.tsx +++ b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/index.tsx @@ -33,19 +33,24 @@ export const AssignmentContent = async () => { ); } + const isAnyFirstWeekAssignment = studyDashboard.submittableAssignments.some( + ({ week }) => week === 1 + ); return (
- - {studyDashboard.isLinkEditable && ( - - )} + +
); From 5f61619dd32524f88d76225da8494c00ad80d21e Mon Sep 17 00:00:00 2001 From: SeieunYoo Date: Sun, 5 Jan 2025 16:33:01 +0900 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=EB=B2=84=ED=8A=BC=20=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssignmentOverviewBox/AssignmentBoxButtons.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d0438e4b..c1298893 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 @@ -128,7 +128,7 @@ const SecondaryButton = ({ const { year, month, day, hours, minutes } = parseISODate( committedAt as string ); - const commitText = `최종 수정일자 ${year}년 ${month}월 ${day}일 ${padWithZero(hours)}:${padWithZero(minutes)}`; + const commitText = `최종 수정 일시 : ${year}년 ${month}월 ${day}일 ${padWithZero(hours)}:${padWithZero(minutes)}`; return (