Merge pull request #469 from Bamdoliro/feat/#460

fix(user): 입학 등록 기간 추가
Bamdoliro · Nov 16, 2023 · 5781ce0 · 5781ce0
2 parents ac1e07c + 7b41819
commit 5781ce0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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');