From 40ebaec47cea67669a8fb3556502c005ee4a4964 Mon Sep 17 00:00:00 2001 From: Lucid Kobold Date: Wed, 29 Dec 2021 09:36:16 -0600 Subject: [PATCH] Removing uneeded info from context. --- contexts/NewCalenderContext.tsx | 77 +++++++++++++++++---------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/contexts/NewCalenderContext.tsx b/contexts/NewCalenderContext.tsx index 821a59f..92314b6 100644 --- a/contexts/NewCalenderContext.tsx +++ b/contexts/NewCalenderContext.tsx @@ -24,19 +24,22 @@ type Days = type DaysOfWeek = Days[]; interface WeekDays { - startOfWeek: { - sunday: DaysOfWeek; - monday: DaysOfWeek; - }; + sunday: DaysOfWeek; + monday: DaysOfWeek; +} + +interface MonthDay { + isOverflow: boolean; + date: Date; } interface Month { - week1: Date[]; - week2: Date[]; - week3: Date[]; - week4: Date[]; - week5: Date[]; - week6: Date[]; + week1: MonthDay[]; + week2: MonthDay[]; + week3: MonthDay[]; + week4: MonthDay[]; + week5: MonthDay[]; + week6: MonthDay[]; } interface MonthInfo { @@ -48,18 +51,19 @@ interface MonthInfo { prevMonth: { date: Date; endDay: number; - days: number; }; } interface MonthContext extends MonthInfo { - startOfWeek: { + layout: { sunday: { layout: DaysOfWeek; + header: String; month: Month; }; monday: { layout: DaysOfWeek; + header: String; month: Month; }; }; @@ -77,26 +81,24 @@ const NewCalenderContextProvider = ({ children: ReactNode; }): JSX.Element => { const weekDays: WeekDays = { - startOfWeek: { - sunday: [ - "Sunday", - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday" - ], - monday: [ - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", - "Sunday" - ] - } + sunday: [ + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday" + ], + monday: [ + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday", + "Sunday" + ] }; const [selectedDate, setSelectedMonth] = useState(new Date()); @@ -111,16 +113,17 @@ const NewCalenderContextProvider = ({ days: getDate(endOfMonth(selectedDate)), prevMonth: { date: prevMonth, - endDay: getDate(endOfMonth(prevMonth)), - days: getDate(endOfMonth(prevMonth)) + endDay: getDate(endOfMonth(prevMonth)) }, - startOfWeek: { + layout: { sunday: { - layout: weekDays.startOfWeek.sunday, + layout: weekDays.sunday, + header: "Month title here", month: {} as Month }, monday: { - layout: weekDays.startOfWeek.monday, + layout: weekDays.monday, + header: "Month title here", month: {} as Month } }