Merge pull request #248 from boostcampwm-2021/develop

release
boostcampwm-2021 · Dec 3, 2021 · 1f084da · 1f084da
2 parents 988b344 + c4287ea
commit 1f084da
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 55 deletions.
diff --git a/frontend/src/components/Calendar/CalendarHeader/index.tsx b/frontend/src/components/Calendar/CalendarHeader/index.tsx
@@ -3,7 +3,8 @@ import moment from 'moment';
 import { useResetRecoilState, useSetRecoilState } from 'recoil';
 
 import { ModalMode, ModalSchedule } from '@stores/calendar';
-import { DateInfoType, weekContentNumber } from '@src/types/calendar';
+import { DateInfoType } from '@src/types/calendar';
+import { WeekContentNumber } from '@utils/constants';
 
 import { FaChevronLeft, FaChevronRight, FaCalendarAlt, FaRegCalendarPlus } from 'react-icons/fa';
 import {
@@ -47,7 +48,7 @@ const CalendarHeader: React.FC<Props> = ({
 	};
 
 	const nextDateInfo = () => {
-		const date = moment(dateInfo.weeklyStartDate).add(weekContentNumber.WEEK_NUMBER, 'days');
+		const date = moment(dateInfo.weeklyStartDate).add(WeekContentNumber.WEEK_NUMBER, 'days');
 		return { year: date.year(), month: date.month() };
 	};
 

diff --git a/frontend/src/components/Calendar/MonthlyCalendar/MonthContent/index.tsx b/frontend/src/components/Calendar/MonthlyCalendar/MonthContent/index.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { v4 as uuidv4 } from 'uuid';
-import { DateInfoType, ScheduleType, weekContentNumber } from '@src/types/calendar';
+import { DateInfoType, ScheduleType } from '@src/types/calendar';
+import { WeekContentNumber } from '@utils/constants';
 import Week from './Week';
 import { ContentContainer } from './style';
 
@@ -24,7 +25,7 @@ const MonthContent: React.FC<Props> = ({ dateInfo, schedules, handleModalOpen })
 			week.push(0);
 		});
 		// 1일부터 첫주 마지막까지
-		[...Array(weekContentNumber.WEEK_NUMBER - firstDay)].forEach(() => {
+		[...Array(WeekContentNumber.WEEK_NUMBER - firstDay)].forEach(() => {
 			week.push(curDay);
 			curDay += 1;
 		});
@@ -35,7 +36,7 @@ const MonthContent: React.FC<Props> = ({ dateInfo, schedules, handleModalOpen })
 			const week: number[] = [];
 			let day = curDay;
 			// 무조건 1주를 채우도록
-			[...Array(weekContentNumber.WEEK_NUMBER)].forEach(() => {
+			[...Array(WeekContentNumber.WEEK_NUMBER)].forEach(() => {
 				if (day <= lastDay) {
 					week.push(day);
 					day += 1;

diff --git a/frontend/src/components/Calendar/WeeklyCalendar/WeekContent/index.tsx b/frontend/src/components/Calendar/WeeklyCalendar/WeekContent/index.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { v4 as uuidv4 } from 'uuid';
-import { DateInfoType, weekContentNumber, ScheduleType, TimeType } from '@src/types/calendar';
+import { DateInfoType, ScheduleType, TimeType } from '@src/types/calendar';
+import { WeekContentNumber } from '@utils/constants';
 import { isTodayDate, isSameDate } from '@utils/calendar';
 import ScheduleItem from '../ScheduleItem';
 import { Container, TimeContainer, DaysContainer, DayContainer, TimeBlock, CurrTimeLine } from './style';
@@ -25,7 +26,7 @@ const {
 	TIME_LIST,
 	WEEK_NUMBER,
 	DAY_TIME_NUMBER,
-} = weekContentNumber;
+} = WeekContentNumber;
 
 const TimeListGenerator: React.FC<TimeListProps> = ({ timeList, renderItem }) => {
 	return <TimeContainer>{timeList.map((item: { hour: number; text: string }) => renderItem(item))}</TimeContainer>;

diff --git a/frontend/src/components/Calendar/WeeklyCalendar/WeekHeader/index.tsx b/frontend/src/components/Calendar/WeeklyCalendar/WeekHeader/index.tsx
@@ -1,15 +1,16 @@
 import React from 'react';
 import moment from 'moment';
 import { v4 as uuidv4 } from 'uuid';
-import { DateInfoType, DayCode, weekContentNumber } from '@src/types/calendar';
+import { WeekContentNumber, DayCode } from '@utils/constants';
+import { DateInfoType } from '@src/types/calendar';
 import { Container, DayContainer } from './style';
 
 interface Props {
 	dateInfo: DateInfoType;
 }
 
 const WeekHeader: React.FC<Props> = ({ dateInfo }) => {
-	const dayInfo = [...Array(weekContentNumber.WEEK_NUMBER)].map((v, i) => {
+	const dayInfo = [...Array(WeekContentNumber.WEEK_NUMBER)].map((v, i) => {
 		const tDate = new Date(dateInfo.weeklyStartDate);
 		tDate.setDate(tDate.getDate() + i);
 		return { day: i, date: tDate.getDate() };

diff --git a/frontend/src/types/calendar.ts b/frontend/src/types/calendar.ts
@@ -56,49 +56,3 @@ export interface TimeType {
 	hour: number;
 	text: string;
 }
-
-export enum DayCode {
-	'일요일' = 0,
-	'월요일' = 1,
-	'화요일' = 2,
-	'수요일' = 3,
-	'목요일' = 4,
-	'금요일' = 5,
-	'토요일' = 6,
-}
-
-export const weekContentNumber: any = {
-	MSEC_TO_HOUR: 60000,
-	HALF_HOUR_TO_MIN: 30,
-	HOUR_TO_MIN: 60,
-	LINE_SPACE_PX: 2.5 * 16,
-	EXTRA_SPACE_PX: 10,
-	WEEK_NUMBER: 7,
-	DAY_TIME_NUMBER: 48,
-	TIME_LIST: [
-		{ hour: 12, text: '오전' },
-		{ hour: 1, text: '오전' },
-		{ hour: 2, text: '오전' },
-		{ hour: 3, text: '오전' },
-		{ hour: 4, text: '오전' },
-		{ hour: 5, text: '오전' },
-		{ hour: 6, text: '오전' },
-		{ hour: 7, text: '오전' },
-		{ hour: 8, text: '오전' },
-		{ hour: 9, text: '오전' },
-		{ hour: 10, text: '오후' },
-		{ hour: 11, text: '오후' },
-		{ hour: 12, text: '오후' },
-		{ hour: 1, text: '오후' },
-		{ hour: 2, text: '오후' },
-		{ hour: 3, text: '오후' },
-		{ hour: 4, text: '오후' },
-		{ hour: 5, text: '오후' },
-		{ hour: 6, text: '오후' },
-		{ hour: 7, text: '오후' },
-		{ hour: 8, text: '오후' },
-		{ hour: 9, text: '오후' },
-		{ hour: 10, text: '오후' },
-		{ hour: 11, text: '오후' },
-	],
-};
diff --git a/frontend/src/utils/constants.ts b/frontend/src/utils/constants.ts
@@ -100,5 +100,52 @@ const MODAL_THEME = {
 
 const NOBODY = -1;
 
+enum DayCode {
+	'일요일' = 0,
+	'월요일' = 1,
+	'화요일' = 2,
+	'수요일' = 3,
+	'목요일' = 4,
+	'금요일' = 5,
+	'토요일' = 6,
+}
+
+const WeekContentNumber: any = {
+	MSEC_TO_HOUR: 60000,
+	HALF_HOUR_TO_MIN: 30,
+	HOUR_TO_MIN: 60,
+	LINE_SPACE_PX: 2.5 * 16,
+	EXTRA_SPACE_PX: 10,
+	WEEK_NUMBER: 7,
+	DAY_TIME_NUMBER: 48,
+	TIME_LIST: [
+		{ hour: 12, text: '오전' },
+		{ hour: 1, text: '오전' },
+		{ hour: 2, text: '오전' },
+		{ hour: 3, text: '오전' },
+		{ hour: 4, text: '오전' },
+		{ hour: 5, text: '오전' },
+		{ hour: 6, text: '오전' },
+		{ hour: 7, text: '오전' },
+		{ hour: 8, text: '오전' },
+		{ hour: 9, text: '오전' },
+		{ hour: 10, text: '오전' },
+		{ hour: 11, text: '오전' },
+		{ hour: 12, text: '오후' },
+		{ hour: 1, text: '오후' },
+		{ hour: 2, text: '오후' },
+		{ hour: 3, text: '오후' },
+		{ hour: 4, text: '오후' },
+		{ hour: 5, text: '오후' },
+		{ hour: 6, text: '오후' },
+		{ hour: 7, text: '오후' },
+		{ hour: 8, text: '오후' },
+		{ hour: 9, text: '오후' },
+		{ hour: 10, text: '오후' },
+		{ hour: 11, text: '오후' },
+	],
+};
+
 export { ColorCode, Font, PrimaryPalette, SecondaryPalette, TeamCard, Role, RoleArr };
 export { REM, NAVBAR, HEADER, CANVAS, POSTIT, MODAL_THEME, NOBODY };
+export { DayCode, WeekContentNumber };