Calender nav #42
@@ -1,4 +1,4 @@
|
|||||||
import { startOfMonth, endOfMonth } from "date-fns";
|
import { startOfMonth, endOfMonth, subMonths } from "date-fns";
|
||||||
|
|
||||||
interface ValidDateRange {
|
interface ValidDateRange {
|
||||||
start: Date;
|
start: Date;
|
||||||
@@ -11,7 +11,7 @@ interface ValidDateRange {
|
|||||||
*/
|
*/
|
||||||
const findValidDateRange = (): ValidDateRange => {
|
const findValidDateRange = (): ValidDateRange => {
|
||||||
const currDate = new Date(); // Current date.
|
const currDate = new Date(); // Current date.
|
||||||
const startDate = startOfMonth(currDate); // Will eventually be the creation date of the account or the creation date the selected chart. Whichever is older.
|
const startDate = subMonths(startOfMonth(currDate), 1); // Will eventually be the creation date of the account or the creation date the selected chart. Whichever is older.
|
||||||
const endDate = endOfMonth(currDate); // Always needs to be the last day on the current month within the current year.
|
const endDate = endOfMonth(currDate); // Always needs to be the last day on the current month within the current year.
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -3,13 +3,15 @@ import { Box } from "@chakra-ui/react";
|
|||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import {
|
import {
|
||||||
endOfMonth,
|
endOfMonth,
|
||||||
getDay
|
getDate,
|
||||||
// getMonth,
|
getDay,
|
||||||
// getYear,
|
getMonth,
|
||||||
// isAfter,
|
getYear,
|
||||||
// isBefore
|
isAfter,
|
||||||
|
isBefore,
|
||||||
|
isSameMonth
|
||||||
} from "date-fns";
|
} from "date-fns";
|
||||||
// import findValidDateRange from "../../lib/findValidDateRange";
|
import findValidDateRange from "../../lib/findValidDateRange";
|
||||||
import ErrorPage from "next/error";
|
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";
|
||||||
@@ -23,6 +25,9 @@ const DateRoute: React.FC<unknown> = () => {
|
|||||||
|
|
||||||
const [error, setError] = useState<boolean>(false);
|
const [error, setError] = useState<boolean>(false);
|
||||||
|
|
||||||
|
const dateRange = useRef(findValidDateRange());
|
||||||
|
const validDateRange = Object.assign({}, dateRange.current);
|
||||||
|
|
||||||
const validateDateInput = (dateArr: number[]): UpdateCalendarProps => {
|
const validateDateInput = (dateArr: number[]): UpdateCalendarProps => {
|
||||||
if (!(dateArr.length >= 2) && !(dateArr.length <= 3)) {
|
if (!(dateArr.length >= 2) && !(dateArr.length <= 3)) {
|
||||||
return {
|
return {
|
||||||
@@ -65,41 +70,30 @@ const DateRoute: React.FC<unknown> = () => {
|
|||||||
/**
|
/**
|
||||||
* ! This function does not work as is. It is causing infinite loops whe used within the useEffect.
|
* ! This function does not work as is. It is causing infinite loops whe used within the useEffect.
|
||||||
*/
|
*/
|
||||||
// const validateDateRange = (slugDate: Date): void => {
|
const validateDateRange = (
|
||||||
// const { start: validStart, end: validEnd } = validDateRange;
|
slugDate: Date
|
||||||
|
): [Date, "after" | "before" | "valid"] => {
|
||||||
|
const { start: validStart, end: validEnd } = validDateRange;
|
||||||
|
|
||||||
// // Check if the slug date is beyond the valid end date.
|
// Check if the slug date is beyond the valid end date.
|
||||||
// if (isAfter(slugDate, validEnd)) {
|
if (isAfter(slugDate, validEnd)) {
|
||||||
// // router.push("/calender/now");
|
// router.push("/calender/now");
|
||||||
// console.warn(
|
console.warn(
|
||||||
// "Slug date is after the valid date range for this calendar!!!"
|
"Slug date is after the valid date range for this calendar!!!"
|
||||||
// );
|
);
|
||||||
// // Check if the slug is before the valid start date.
|
return [validEnd, "after"];
|
||||||
// } else if (isBefore(slugDate, validStart)) {
|
// Check if the slug is before the valid start date.
|
||||||
// console.warn(
|
} else if (isBefore(slugDate, validStart)) {
|
||||||
// "Slug date is before the valid date range for this calendar!!!"
|
console.warn(
|
||||||
// );
|
"Slug date is before the valid date range for this calendar!!!"
|
||||||
// router.push(`/${getYear(validStart)}/${getMonth(validStart) + 1}`);
|
);
|
||||||
// } else {
|
return [validStart, "before"];
|
||||||
// console.info(
|
// router.push(`/${getYear(validStart)}/${getMonth(validStart) + 1}`);
|
||||||
// "Slug date is within the valid date range for this calendar."
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
|
|
||||||
// Keeping track of the slug, if it is valid.
|
|
||||||
const parsedSlug = useRef<number[] | null>(null);
|
|
||||||
|
|
||||||
const checkNewSlug = (
|
|
||||||
currSlug: number[],
|
|
||||||
prevSlug: number[]
|
|
||||||
): boolean | null => {
|
|
||||||
if (currSlug[0] === prevSlug[0] && currSlug[1] === prevSlug[1]) {
|
|
||||||
return false;
|
|
||||||
} else if (currSlug[0] !== prevSlug[0] || currSlug[1] !== prevSlug[1]) {
|
|
||||||
return true;
|
|
||||||
} else {
|
} else {
|
||||||
return null;
|
console.info(
|
||||||
|
"Slug date is within the valid date range for this calendar."
|
||||||
|
);
|
||||||
|
return [slugDate, "valid"];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -110,47 +104,77 @@ const DateRoute: React.FC<unknown> = () => {
|
|||||||
const length = slug.length;
|
const length = slug.length;
|
||||||
|
|
||||||
// Parsing the slug to convert it from strings to numbers.
|
// Parsing the slug to convert it from strings to numbers.
|
||||||
const newParsedSlug = slug.map((e) => {
|
const parsedSlug = slug.map((e) => {
|
||||||
return parseInt(e);
|
return parseInt(e);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Checking if the new slug is different from the previous slug.
|
// Checking if the slug is not "now" when the length is 1.
|
||||||
if (checkNewSlug(newParsedSlug, parsedSlug.current)) {
|
// ! Update this to include a check for "today".
|
||||||
// Checking if the slug is not "now" when the length is 1.
|
if (length === 1 && slug[0] !== "now") {
|
||||||
// ! Update this to include a check for "today".
|
setError(true);
|
||||||
if (length === 1 && slug[0] !== "now") {
|
return console.warn("improper date input:", slug);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Checking if the slug has 2 to 3 numbers within the array. year/month/day.
|
||||||
|
if (length >= 2 && slug.length <= 3) {
|
||||||
|
// Validate that the date is valid.
|
||||||
|
const newDate = validateDateInput(parsedSlug);
|
||||||
|
|
||||||
|
// If anything is invalid the year/day/month would be set to 0. This checks for the invalid condition.
|
||||||
|
if (newDate.year === 0 || newDate.month === 0 || newDate.day === 0) {
|
||||||
setError(true);
|
setError(true);
|
||||||
return console.warn("improper date input:", slug);
|
// Set the date to the valid date.
|
||||||
}
|
} else {
|
||||||
|
// TODO: Make sure the date is within the valid range using the validateDateRange function.
|
||||||
|
const validDate = new Date(
|
||||||
|
newDate.year,
|
||||||
|
newDate.month - 1,
|
||||||
|
newDate.day
|
||||||
|
);
|
||||||
|
|
||||||
// Checking if the slug has 2 to 3 numbers within the array. year/month/day.
|
const validDateWithinRange = validateDateRange(validDate)[0];
|
||||||
if (length >= 2 && slug.length <= 3) {
|
|
||||||
// Validate that the date is valid.
|
|
||||||
const newDate = validateDateInput(newParsedSlug);
|
|
||||||
|
|
||||||
// If anything is invalid the year/day/month would be set to 0. This checks for the invalid condition.
|
setDate({
|
||||||
if (newDate.year === 0 || newDate.month === 0 || newDate.day === 0) {
|
...{
|
||||||
setError(true);
|
year: getYear(validDateWithinRange),
|
||||||
// Set the date to the valid date.
|
month: getMonth(validDateWithinRange) + 1,
|
||||||
} else {
|
day: getDate(validDateWithinRange)
|
||||||
// TODO: Make sure the date is within the valid range using the validateDateRange function.
|
}
|
||||||
// const slugDate = new Date(
|
});
|
||||||
// newDate.year,
|
|
||||||
// newDate.month - 1,
|
|
||||||
// newDate.day
|
|
||||||
// );
|
|
||||||
// console.info("Slug date:", slugDate);
|
|
||||||
// validateDateRange(slugDate);
|
|
||||||
|
|
||||||
setDate({
|
|
||||||
...validateDateInput(newParsedSlug)
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [slug]);
|
}, [slug]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// Check is slug and date are valid.
|
||||||
|
if (slug && date && date !== null) {
|
||||||
|
// Check if the slug is an array and has a length of 2.
|
||||||
|
if (Array.isArray(slug) && slug.length === 2) {
|
||||||
|
const dateState = new Date(date.year, date.month - 1, date.day);
|
||||||
|
|
||||||
|
const parsedSlug = slug.map((e) => {
|
||||||
|
return parseInt(e);
|
||||||
|
});
|
||||||
|
const slugDate = new Date(parsedSlug[0], parsedSlug[1] - 1, 1);
|
||||||
|
|
||||||
|
if (!isSameMonth(dateState, slugDate)) {
|
||||||
|
const validDateWithinRange = validateDateRange(dateState);
|
||||||
|
|
||||||
|
if (validDateRange[1] === "after") {
|
||||||
|
router.push("/now");
|
||||||
|
} else {
|
||||||
|
router.push(
|
||||||
|
`/${getYear(validDateWithinRange[0])}/${getMonth(
|
||||||
|
validDateWithinRange[0]
|
||||||
|
)}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [date]);
|
||||||
|
|
||||||
if (router.isFallback) {
|
if (router.isFallback) {
|
||||||
return <ErrorPage statusCode={404} />;
|
return <ErrorPage statusCode={404} />;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user