{children}
; + return ( ++ {children} +
+ ); } Text.Accent = Accent; diff --git a/frontend/src/constants/date.ts b/frontend/src/constants/date.ts index 4b81f5904..4d5ca2af0 100644 --- a/frontend/src/constants/date.ts +++ b/frontend/src/constants/date.ts @@ -1 +1,11 @@ export const DATES_PER_PAGE = 5; + +export const DAY_OF_WEEK_KR: Array<'일' | '월' | '화' | '수' | '목' | '금' | '토'> = [ + '일', + '월', + '화', + '수', + '목', + '금', + '토', +]; diff --git a/frontend/src/hooks/useCalendar/useCalendar.ts b/frontend/src/hooks/useCalendar/useCalendar.ts index 62c4d876e..6e03e1def 100644 --- a/frontend/src/hooks/useCalendar/useCalendar.ts +++ b/frontend/src/hooks/useCalendar/useCalendar.ts @@ -5,6 +5,7 @@ import useToast from '@hooks/useToast/useToast'; import { getFullDate, getMonth, getYear } from '@utils/date'; +import { DAY_OF_WEEK_KR } from '@constants/date'; import { TOAST_MESSAGES } from '@constants/toasts'; import { getMonthlyCalendarDate } from './useCalendar.utils'; @@ -68,7 +69,7 @@ const useCalendar = (): useCalendarReturn => { headers: { currentYear, currentMonth, - weekDays: ['일', '월', '화', '수', '목', '금', '토'], + weekDays: DAY_OF_WEEK_KR, }, body: { today: TODAY, diff --git a/frontend/src/mocks/meeting/data/meetingAllSchedules.json b/frontend/src/mocks/meeting/data/meetingAllSchedules.json index da9d5d2f6..7ba73336c 100644 --- a/frontend/src/mocks/meeting/data/meetingAllSchedules.json +++ b/frontend/src/mocks/meeting/data/meetingAllSchedules.json @@ -34,7 +34,7 @@ { "date": "2024-10-27", "time": "17:00", - "attendeeNames": ["빙봉"] + "attendeeNames": [] } ] } diff --git a/frontend/src/pages/MeetingEntrancePage/index.tsx b/frontend/src/pages/MeetingEntrancePage/index.tsx index 0d15ae830..ccc494c60 100644 --- a/frontend/src/pages/MeetingEntrancePage/index.tsx +++ b/frontend/src/pages/MeetingEntrancePage/index.tsx @@ -12,7 +12,7 @@ import useRouter from '@hooks/useRouter/useRouter'; import { useMeetingEntranceDetailQuery } from '@stores/servers/meeting/queries'; -import Logo from '@assets/images/logo.svg'; +import logoImg from '@assets/images/logo.webp'; import { s_buttonContainer, @@ -56,9 +56,11 @@ export default function MeetingEntrancePage() {