Calender nav #42

Merged
LucidKobold merged 20 commits from calender-nav into main 2022-03-27 02:48:04 -04:00
4 changed files with 477 additions and 417 deletions
Showing only changes of commit b3ba7b2d66 - Show all commits

View File

@@ -6,7 +6,6 @@ import ErrorPage from "next/error";
import Calender from "../../components/calender"; import Calender from "../../components/calender";
import { CalenderContextProvider } from "../../contexts/CalenderContext"; import { CalenderContextProvider } from "../../contexts/CalenderContext";
import { StickersContextProvider } from "../../contexts/StickerContext"; import { StickersContextProvider } from "../../contexts/StickerContext";
import { es } from "date-fns/locale";
const DateRoute: React.FC<unknown> = () => { const DateRoute: React.FC<unknown> = () => {
const router = useRouter(); const router = useRouter();
@@ -40,8 +39,10 @@ const DateRoute: React.FC<unknown> = () => {
} }
if (date.month && date.year) { if (date.month && date.year) {
const lastDay = getDay(endOfMonth(new Date(date.year, date.month - 1, 1))) const lastDay = getDay(
if (dateArr[2] && (dateArr[2] > 0 && dateArr[2] <= lastDay)) { endOfMonth(new Date(date.year, date.month - 1, 1))
);
if (dateArr[2] && dateArr[2] > 0 && dateArr[2] <= lastDay) {
date.day = dateArr[2]; date.day = dateArr[2];
} else if (!dateArr[2]) { } else if (!dateArr[2]) {
date.day = 1; date.day = 1;
@@ -50,7 +51,6 @@ const DateRoute: React.FC<unknown> = () => {
return date; return date;
} }
return date; return date;
}; };
@@ -88,16 +88,17 @@ const DateRoute: React.FC<unknown> = () => {
* last month that has stickers within it (When filter is enabled) or to the creation date of the chart.. * last month that has stickers within it (When filter is enabled) or to the creation date of the chart..
*/ */
return error ? return error ? (
(<ErrorPage statusCode={404} />) <ErrorPage statusCode={404} />
: ) : (
(<Box textAlign="center" w="100%" h="auto" pt="50px" pb="10vh"> <Box textAlign="center" w="100%" h="auto" pt="50px" pb="10vh">
<CalenderContextProvider> <CalenderContextProvider>
<StickersContextProvider> <StickersContextProvider>
<Calender {...date} /> <Calender {...date} />
</StickersContextProvider> </StickersContextProvider>
</CalenderContextProvider> </CalenderContextProvider>
</Box>) </Box>
);
}; };
export default DateRoute; export default DateRoute;