From 7b4181970d45ba86eb74d61b42532942a004fefb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Thu, 16 Nov 2023 16:58:37 +0900 Subject: [PATCH] =?UTF-8?q?fix(user):=20=EC=9E=85=ED=95=99=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EA=B8=B0=EA=B0=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationSubmittionBox.hooks.ts | 5 ++++- .../main/ApplicationSubmittionBox/DdayBox/DdayBox.hooks.ts | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/user/src/components/main/ApplicationSubmittionBox/ApplicationSubmittionBox.hooks.ts b/apps/user/src/components/main/ApplicationSubmittionBox/ApplicationSubmittionBox.hooks.ts index ebb194fe8..8224aa252 100644 --- a/apps/user/src/components/main/ApplicationSubmittionBox/ApplicationSubmittionBox.hooks.ts +++ b/apps/user/src/components/main/ApplicationSubmittionBox/ApplicationSubmittionBox.hooks.ts @@ -1,6 +1,7 @@ import { ROUTES } from '@/constants/common/constant'; import { 일차_합격_발표, + 입학_등록_기간, 제출_마감_날짜, 제출_시작_날짜, 최종_합격_발표, @@ -25,7 +26,9 @@ export const useDday = () => { ? 제출_마감_날짜 : dayjs().isBefore(일차_합격_발표.add(2, 'day')) ? 일차_합격_발표 - : 최종_합격_발표; + : dayjs().isBefore(최종_합격_발표) + ? 최종_합격_발표 + : 입학_등록_기간; const [remainDays, setRemainDays] = useState(currentTime.diff(dayjs(), 'days', true)); diff --git a/apps/user/src/components/main/ApplicationSubmittionBox/DdayBox/DdayBox.hooks.ts b/apps/user/src/components/main/ApplicationSubmittionBox/DdayBox/DdayBox.hooks.ts index 4fcb38935..d7a32a11a 100644 --- a/apps/user/src/components/main/ApplicationSubmittionBox/DdayBox/DdayBox.hooks.ts +++ b/apps/user/src/components/main/ApplicationSubmittionBox/DdayBox/DdayBox.hooks.ts @@ -1,5 +1,6 @@ import { 일차_합격_발표, + 입학_등록_기간, 제출_시작_날짜, 최종_합격_발표, } from '@/constants/form/constant'; @@ -13,6 +14,7 @@ export const useRemainDate = () => { [제출_시작_날짜, '원서 접수 시작까지'], [최종_합격_발표, '최종합격자 발표'], [일차_합격_발표, '1차 합격자 발표'], + [입학_등록_기간, '입학 등록 기간'], ]); const timeDiff = dayjs.utc(currentTime.diff(dayjs())).format('HH:mm:ss');