From 077a38e89170a7c089bf3cf9e83e5e4be676e6af Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Mon, 11 Apr 2022 12:11:43 -0500 Subject: [PATCH 01/13] Attempting to fix and issue with the currDay highlight. Made a currDate in thecontext state rather than using new Date() accross the app. --- components/calender/Day.tsx | 17 ++++++++++------- components/calender/index.tsx | 3 ++- components/calender/modals/AddUpdateSticker.tsx | 6 ++++-- contexts/CalenderContext.tsx | 6 +++++- types/CalenderContext.d.ts | 1 + 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/components/calender/Day.tsx b/components/calender/Day.tsx index ac548fb..941c72c 100644 --- a/components/calender/Day.tsx +++ b/components/calender/Day.tsx @@ -21,6 +21,7 @@ interface DayProps { sticker: StickerVal; date: Date; selectedDate: Date; + currDate: Date; } /** @@ -37,7 +38,8 @@ const Day = ({ overflowDirection, sticker, date, - selectedDate + selectedDate, + currDate }: DayProps): JSX.Element => { const handleNav = (direction: "next" | "prev") => { if (direction === "next") { @@ -90,7 +92,7 @@ const Day = ({ w="100%" h="100%" _hover={{ - cursor: isBefore(date, endOfDay(new Date())) + cursor: isBefore(date, endOfDay(currDate)) ? "pointer" : "default", background: "gray.700", @@ -131,7 +133,7 @@ const Day = ({ justifyContent="flex-start" pt={2} _hover={{ - cursor: isBefore(date, endOfDay(new Date())) + cursor: isBefore(date, endOfDay(currDate)) ? "pointer" : "default", background: "gray.700", @@ -140,7 +142,7 @@ const Day = ({ > 10 ? "0px 6px 3px 6px" : "0px 9px 3px 9px" @@ -148,8 +150,8 @@ const Day = ({ } h="auto" w="auto" - border={isSameDay(new Date(), date) ? "1px solid #0068ff" : "0px"} - borderRadius={isSameDay(new Date(), date) ? "100px" : "0px"} + border={isSameDay(currDate, date) ? "1px solid #0068ff" : "0px"} + borderRadius={isSameDay(currDate, date) ? "100px" : "0px"} > {`${getDate(date)}`} @@ -162,7 +164,7 @@ const Day = ({ /> - {isBefore(date, endOfDay(new Date())) && ( + {isBefore(date, endOfDay(currDate)) && ( )} diff --git a/components/calender/index.tsx b/components/calender/index.tsx index c25f481..ec727d6 100644 --- a/components/calender/index.tsx +++ b/components/calender/index.tsx @@ -7,7 +7,7 @@ import CalenderNav from "./CalenderNav"; import Day from "./Day"; const Calender = (newDate?: UpdateCalendarProps): JSX.Element => { - const { selectedDate, layout, updateDate } = useContext(CalenderContext); + const { selectedDate, layout, updateDate, currDate } = useContext(CalenderContext); const { stickersMonth } = useContext(StickersContext); useEffect(() => { @@ -91,6 +91,7 @@ const Calender = (newDate?: UpdateCalendarProps): JSX.Element => { sticker={sticker} date={date} selectedDate={selectedDate} + currDate={currDate} key={ id.length ? id diff --git a/components/calender/modals/AddUpdateSticker.tsx b/components/calender/modals/AddUpdateSticker.tsx index 9bda161..44ebcee 100644 --- a/components/calender/modals/AddUpdateSticker.tsx +++ b/components/calender/modals/AddUpdateSticker.tsx @@ -30,6 +30,7 @@ interface AddStickerProps { updateStep: React.Dispatch>; selectedSticker: StickerVal; updateSelectedSticker: React.Dispatch>; + currDate: Date; } /** @@ -52,7 +53,8 @@ const AddUpdateSticker = ({ step, updateStep, selectedSticker, - updateSelectedSticker + updateSelectedSticker, + currDate }: AddStickerProps): JSX.Element => { // TODO: Import the stickers array from the calender context. @@ -61,7 +63,7 @@ const AddUpdateSticker = ({ // ! Update these states to say "add" and "edit" for easier reading. const [modalVariant] = useState<"currDate" | "notCurrDate">( - isSameDay(date, new Date()) ? "currDate" : "notCurrDate" + isSameDay(date, currDate) ? "currDate" : "notCurrDate" ); const handleClose = () => { diff --git a/contexts/CalenderContext.tsx b/contexts/CalenderContext.tsx index 6feecc2..a558f80 100644 --- a/contexts/CalenderContext.tsx +++ b/contexts/CalenderContext.tsx @@ -240,7 +240,11 @@ const CalenderContextProvider = ({ } }; - const calenderContextValues = { + // * Attempting to fix an issue with static generation where the date does not appear to be updating after initial generation. + const [currDate] = useState(new Date); + + const calenderContextValues: CalenderContextState = { + currDate, selectedDate, title: selectedDateInfo.title, layout: selectedDateInfo.layout, diff --git a/types/CalenderContext.d.ts b/types/CalenderContext.d.ts index 76df92d..a3e0f71 100644 --- a/types/CalenderContext.d.ts +++ b/types/CalenderContext.d.ts @@ -55,6 +55,7 @@ interface UpdateCalendarProps { } interface CalenderContextState { + currDate: Date; selectedDate: Date; title: string; layout: MonthLayout; -- 2.49.1 From f6115a928ccfc8854231461a145be2b65de0370d Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Mon, 11 Apr 2022 14:08:25 -0500 Subject: [PATCH 02/13] Attempting to force update the date in a useEffect. --- components/calender/index.tsx | 10 +++++++++- contexts/CalenderContext.tsx | 3 ++- types/CalenderContext.d.ts | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/components/calender/index.tsx b/components/calender/index.tsx index ec727d6..3a4dc03 100644 --- a/components/calender/index.tsx +++ b/components/calender/index.tsx @@ -7,7 +7,7 @@ import CalenderNav from "./CalenderNav"; import Day from "./Day"; const Calender = (newDate?: UpdateCalendarProps): JSX.Element => { - const { selectedDate, layout, updateDate, currDate } = useContext(CalenderContext); + const { selectedDate, layout, updateDate, currDate, setCurrDate } = useContext(CalenderContext); const { stickersMonth } = useContext(StickersContext); useEffect(() => { @@ -22,6 +22,14 @@ const Calender = (newDate?: UpdateCalendarProps): JSX.Element => { } }, [newDate, updateDate]); + useEffect(() => { + console.info("Check to update date."); + if (!isSameDay(currDate, new Date())) { + console.info("Updated date.") + setCurrDate(new Date()); + } + }, [currDate, setCurrDate]); + // Simulated user settings context const userSettings = { theme: "default", diff --git a/contexts/CalenderContext.tsx b/contexts/CalenderContext.tsx index a558f80..799bba3 100644 --- a/contexts/CalenderContext.tsx +++ b/contexts/CalenderContext.tsx @@ -241,10 +241,11 @@ const CalenderContextProvider = ({ }; // * Attempting to fix an issue with static generation where the date does not appear to be updating after initial generation. - const [currDate] = useState(new Date); + const [currDate, setCurrDate] = useState(new Date); const calenderContextValues: CalenderContextState = { currDate, + setCurrDate, selectedDate, title: selectedDateInfo.title, layout: selectedDateInfo.layout, diff --git a/types/CalenderContext.d.ts b/types/CalenderContext.d.ts index a3e0f71..946a3fd 100644 --- a/types/CalenderContext.d.ts +++ b/types/CalenderContext.d.ts @@ -56,6 +56,7 @@ interface UpdateCalendarProps { interface CalenderContextState { currDate: Date; + setCurrDate: React.Dispatch>; selectedDate: Date; title: string; layout: MonthLayout; -- 2.49.1 From a256cbd1e33e7166c2f4636bc2e7487ee7843004 Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Mon, 11 Apr 2022 14:15:01 -0500 Subject: [PATCH 03/13] Moved the isToday check out of the day componenet. --- components/calender/Day.tsx | 10 ++++++---- components/calender/index.tsx | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/components/calender/Day.tsx b/components/calender/Day.tsx index 941c72c..62e9d5b 100644 --- a/components/calender/Day.tsx +++ b/components/calender/Day.tsx @@ -22,6 +22,7 @@ interface DayProps { date: Date; selectedDate: Date; currDate: Date; + isToday: boolean; } /** @@ -39,7 +40,8 @@ const Day = ({ sticker, date, selectedDate, - currDate + currDate, + isToday }: DayProps): JSX.Element => { const handleNav = (direction: "next" | "prev") => { if (direction === "next") { @@ -142,7 +144,7 @@ const Day = ({ > 10 ? "0px 6px 3px 6px" : "0px 9px 3px 9px" @@ -150,8 +152,8 @@ const Day = ({ } h="auto" w="auto" - border={isSameDay(currDate, date) ? "1px solid #0068ff" : "0px"} - borderRadius={isSameDay(currDate, date) ? "100px" : "0px"} + border={isToday ? "1px solid #0068ff" : "0px"} + borderRadius={isToday ? "100px" : "0px"} > {`${getDate(date)}`} diff --git a/components/calender/index.tsx b/components/calender/index.tsx index 3a4dc03..524a294 100644 --- a/components/calender/index.tsx +++ b/components/calender/index.tsx @@ -100,6 +100,7 @@ const Calender = (newDate?: UpdateCalendarProps): JSX.Element => { date={date} selectedDate={selectedDate} currDate={currDate} + isToday={isSameDay(currDate, date)} key={ id.length ? id -- 2.49.1 From 76c0dfca91c2966bd950adaf3fce7d4abf09cc86 Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Mon, 11 Apr 2022 14:15:41 -0500 Subject: [PATCH 04/13] Removed unused imports --- components/calender/Day.tsx | 9 ++------- components/calender/index.tsx | 5 +++-- contexts/CalenderContext.tsx | 4 ++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/components/calender/Day.tsx b/components/calender/Day.tsx index 62e9d5b..dd24233 100644 --- a/components/calender/Day.tsx +++ b/components/calender/Day.tsx @@ -5,7 +5,6 @@ import { getMonth, sub, getDate, - isSameDay, isBefore, endOfDay } from "date-fns"; @@ -94,9 +93,7 @@ const Day = ({ w="100%" h="100%" _hover={{ - cursor: isBefore(date, endOfDay(currDate)) - ? "pointer" - : "default", + cursor: isBefore(date, endOfDay(currDate)) ? "pointer" : "default", background: "gray.700", border: "1px solid #FFF", color: "whiteAlpha.900" @@ -135,9 +132,7 @@ const Day = ({ justifyContent="flex-start" pt={2} _hover={{ - cursor: isBefore(date, endOfDay(currDate)) - ? "pointer" - : "default", + cursor: isBefore(date, endOfDay(currDate)) ? "pointer" : "default", background: "gray.700", border: "1px solid #FFF" }} diff --git a/components/calender/index.tsx b/components/calender/index.tsx index 524a294..c70819d 100644 --- a/components/calender/index.tsx +++ b/components/calender/index.tsx @@ -7,7 +7,8 @@ import CalenderNav from "./CalenderNav"; import Day from "./Day"; const Calender = (newDate?: UpdateCalendarProps): JSX.Element => { - const { selectedDate, layout, updateDate, currDate, setCurrDate } = useContext(CalenderContext); + const { selectedDate, layout, updateDate, currDate, setCurrDate } = + useContext(CalenderContext); const { stickersMonth } = useContext(StickersContext); useEffect(() => { @@ -25,7 +26,7 @@ const Calender = (newDate?: UpdateCalendarProps): JSX.Element => { useEffect(() => { console.info("Check to update date."); if (!isSameDay(currDate, new Date())) { - console.info("Updated date.") + console.info("Updated date."); setCurrDate(new Date()); } }, [currDate, setCurrDate]); diff --git a/contexts/CalenderContext.tsx b/contexts/CalenderContext.tsx index 799bba3..da8f6a4 100644 --- a/contexts/CalenderContext.tsx +++ b/contexts/CalenderContext.tsx @@ -240,8 +240,8 @@ const CalenderContextProvider = ({ } }; - // * Attempting to fix an issue with static generation where the date does not appear to be updating after initial generation. - const [currDate, setCurrDate] = useState(new Date); + // * Attempting to fix an issue with static generation where the date does not appear to be updating after initial generation. + const [currDate, setCurrDate] = useState(new Date()); const calenderContextValues: CalenderContextState = { currDate, -- 2.49.1 From 6a15f2c5a1365c5604fc2511ff7b91eec0be0125 Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Mon, 11 Apr 2022 14:28:31 -0500 Subject: [PATCH 05/13] Installing react-redux. Going to try to make the calendar coponent subscribe to the current date and the stickers context. --- package.json | 4 ++- yarn.lock | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 05f9bd8..230ad33 100644 --- a/package.json +++ b/package.json @@ -20,17 +20,19 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@iconify/react": "^3.2.1", - "@types/react": "<=17.0.2", "date-fns": "^2.28.0", "formik": "^2.2.9", "framer-motion": "^6.2.9", "next": "12.1.4", "react": "<=17.0.2", "react-dom": "<=17.0.2", + "react-redux": "^7.2.8", "sharp": "^0.30.3" }, "devDependencies": { "@types/node": "^17.0.23", + "@types/react": "<=17.0.2", + "@types/react-redux": "^7.1.23", "@typescript-eslint/eslint-plugin": "^5.18.0", "eslint": "^8.13.0", "eslint-config-next": "^12.1.4", diff --git a/yarn.lock b/yarn.lock index cec1083..f22a79c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -78,6 +78,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.9.2": + version: 7.17.9 + resolution: "@babel/runtime@npm:7.17.9" + dependencies: + regenerator-runtime: ^0.13.4 + checksum: 4d56bdb82890f386d5a57c40ef985a0ed7f0a78f789377a2d0c3e8826819e0f7f16ba0fe906d9b2241c5f7ca56630ef0653f5bb99f03771f7b87ff8af4bf5fe3 + languageName: node + linkType: hard + "@babel/types@npm:^7.16.0": version: 7.16.0 resolution: "@babel/types@npm:7.16.0" @@ -1365,6 +1374,16 @@ __metadata: languageName: node linkType: hard +"@types/hoist-non-react-statics@npm:^3.3.0": + version: 3.3.1 + resolution: "@types/hoist-non-react-statics@npm:3.3.1" + dependencies: + "@types/react": "*" + hoist-non-react-statics: ^3.3.0 + checksum: 2c0778570d9a01d05afabc781b32163f28409bb98f7245c38d5eaf082416fdb73034003f5825eb5e21313044e8d2d9e1f3fe2831e345d3d1b1d20bcd12270719 + languageName: node + linkType: hard + "@types/json-schema@npm:^7.0.9": version: 7.0.9 resolution: "@types/json-schema@npm:7.0.9" @@ -1416,6 +1435,29 @@ __metadata: languageName: node linkType: hard +"@types/react-redux@npm:^7.1.20, @types/react-redux@npm:^7.1.23": + version: 7.1.23 + resolution: "@types/react-redux@npm:7.1.23" + dependencies: + "@types/hoist-non-react-statics": ^3.3.0 + "@types/react": "*" + hoist-non-react-statics: ^3.3.0 + redux: ^4.0.0 + checksum: 7cedb0f20806ce67255f676fab2d4d9534c12705d43636df95224cfa77fdf5a2e792dc76c6e072c02cad1c88030aea822c14f36fe85d459b898ee68fcff6f05c + languageName: node + linkType: hard + +"@types/react@npm:*": + version: 18.0.1 + resolution: "@types/react@npm:18.0.1" + dependencies: + "@types/prop-types": "*" + "@types/scheduler": "*" + csstype: ^3.0.2 + checksum: ede927ed3766fef5fec513fe75e79180bb3c97d21ca7707321e969193c596bc4a531160238546a845e4131df02ec9be7803277a268bc270156362d16b29b4ffb + languageName: node + linkType: hard + "@types/react@npm:<=17.0.2": version: 17.0.2 resolution: "@types/react@npm:17.0.2" @@ -1426,6 +1468,13 @@ __metadata: languageName: node linkType: hard +"@types/scheduler@npm:*": + version: 0.16.2 + resolution: "@types/scheduler@npm:0.16.2" + checksum: b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc + languageName: node + linkType: hard + "@types/warning@npm:^3.0.0": version: 3.0.0 resolution: "@types/warning@npm:3.0.0" @@ -3131,7 +3180,7 @@ __metadata: languageName: node linkType: hard -"hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1": +"hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1, hoist-non-react-statics@npm:^3.3.2": version: 3.3.2 resolution: "hoist-non-react-statics@npm:3.3.2" dependencies: @@ -3637,6 +3686,7 @@ __metadata: "@iconify/react": ^3.2.1 "@types/node": ^17.0.23 "@types/react": <=17.0.2 + "@types/react-redux": ^7.1.23 "@typescript-eslint/eslint-plugin": ^5.18.0 date-fns: ^2.28.0 eslint: ^8.13.0 @@ -3651,6 +3701,7 @@ __metadata: prettier: ^2.6.2 react: <=17.0.2 react-dom: <=17.0.2 + react-redux: ^7.2.8 sharp: ^0.30.3 typescript: <4.6.0 languageName: unknown @@ -4420,6 +4471,34 @@ __metadata: languageName: node linkType: hard +"react-is@npm:^17.0.2": + version: 17.0.2 + resolution: "react-is@npm:17.0.2" + checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8 + languageName: node + linkType: hard + +"react-redux@npm:^7.2.8": + version: 7.2.8 + resolution: "react-redux@npm:7.2.8" + dependencies: + "@babel/runtime": ^7.15.4 + "@types/react-redux": ^7.1.20 + hoist-non-react-statics: ^3.3.2 + loose-envify: ^1.4.0 + prop-types: ^15.7.2 + react-is: ^17.0.2 + peerDependencies: + react: ^16.8.3 || ^17 || ^18 + peerDependenciesMeta: + react-dom: + optional: true + react-native: + optional: true + checksum: ecf1933e91013f2d41bfc781515b536bf81eb1f70ff228607841094c8330fe77d522372b359687e51c0b52b9888dba73db9ac0486aace1896ab9eb9daec102d5 + languageName: node + linkType: hard + "react-remove-scroll-bar@npm:^2.1.0": version: 2.2.0 resolution: "react-remove-scroll-bar@npm:2.2.0" @@ -4508,6 +4587,15 @@ __metadata: languageName: node linkType: hard +"redux@npm:^4.0.0": + version: 4.1.2 + resolution: "redux@npm:4.1.2" + dependencies: + "@babel/runtime": ^7.9.2 + checksum: 6a839cee5bd580c5298d968e9e2302150e961318253819bcd97f9d945a5a409559eacddf6026f4118bb68b681c593d90e8a2c5bbf278f014aff9bf0d2d8fa084 + languageName: node + linkType: hard + "regenerator-runtime@npm:^0.13.4": version: 0.13.9 resolution: "regenerator-runtime@npm:0.13.9" -- 2.49.1 From b1c84c0922946e219ae75ab4ad9a8c1da789771e Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Mon, 11 Apr 2022 14:36:03 -0500 Subject: [PATCH 06/13] Adding react-redux and types. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 230ad33..c003cf6 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,8 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@iconify/react": "^3.2.1", + "@types/react": "<=17.0.2", + "@types/react-redux": "^7.1.23", "date-fns": "^2.28.0", "formik": "^2.2.9", "framer-motion": "^6.2.9", @@ -31,8 +33,6 @@ }, "devDependencies": { "@types/node": "^17.0.23", - "@types/react": "<=17.0.2", - "@types/react-redux": "^7.1.23", "@typescript-eslint/eslint-plugin": "^5.18.0", "eslint": "^8.13.0", "eslint-config-next": "^12.1.4", -- 2.49.1 From 5ec57ff698c3aaa9464e19c5641f01adfcdb6b8e Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:07:58 -0500 Subject: [PATCH 07/13] Updated logic using a more effecient method to check if the dates are the same. --- contexts/StickerContext.tsx | 8 ++++---- package.json | 4 ++-- pages/_app.tsx | 26 ++++++++++++++------------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/contexts/StickerContext.tsx b/contexts/StickerContext.tsx index 0919ccb..969a533 100644 --- a/contexts/StickerContext.tsx +++ b/contexts/StickerContext.tsx @@ -1,5 +1,5 @@ import React, { createContext, useState, ReactNode } from "react"; -import { format, getDate, isBefore, startOfDay } from "date-fns"; +import { format, getDate, isSameDay } from "date-fns"; import stickersSeeder from "../data/stickerSeeder"; const StickersContext = createContext({} as StickersContextState); @@ -21,9 +21,9 @@ const StickersContextProvider = ({ const edited = currDate.edited ? true - : isBefore(currDate.date, startOfDay(new Date())) - ? true - : false; + : isSameDay(currDate.date, new Date()) + ? false + : true; currDate.edited = edited; // Add manual here when necessary. diff --git a/package.json b/package.json index c003cf6..230ad33 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@iconify/react": "^3.2.1", - "@types/react": "<=17.0.2", - "@types/react-redux": "^7.1.23", "date-fns": "^2.28.0", "formik": "^2.2.9", "framer-motion": "^6.2.9", @@ -33,6 +31,8 @@ }, "devDependencies": { "@types/node": "^17.0.23", + "@types/react": "<=17.0.2", + "@types/react-redux": "^7.1.23", "@typescript-eslint/eslint-plugin": "^5.18.0", "eslint": "^8.13.0", "eslint-config-next": "^12.1.4", diff --git a/pages/_app.tsx b/pages/_app.tsx index f468b0a..1a0bec9 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -7,18 +7,20 @@ import Head from "next/head"; function LCMPottyChart({ Component, pageProps }: AppProps): JSX.Element { return ( - - - - {"LCM Potty Chart"} - - - - - + + + + + {"LCM Potty Chart"} + + + + + + ); } -- 2.49.1 From 5d9e09b3cca1312af1710d98d53d7c48c2bd0eae Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:08:03 -0500 Subject: [PATCH 08/13] Add resolution for types react. --- package.json | 3 +++ yarn.lock | 18 ++++-------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 230ad33..cf7231a 100644 --- a/package.json +++ b/package.json @@ -43,5 +43,8 @@ "prettier": "^2.6.2", "typescript": "<4.6.0" }, + "resolutions": { + "@types/react": "^17.0.38" + }, "packageManager": "yarn@3.1.0" } diff --git a/yarn.lock b/yarn.lock index f22a79c..18492b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1447,24 +1447,14 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*": - version: 18.0.1 - resolution: "@types/react@npm:18.0.1" +"@types/react@npm:^17.0.38": + version: 17.0.44 + resolution: "@types/react@npm:17.0.44" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: ede927ed3766fef5fec513fe75e79180bb3c97d21ca7707321e969193c596bc4a531160238546a845e4131df02ec9be7803277a268bc270156362d16b29b4ffb - languageName: node - linkType: hard - -"@types/react@npm:<=17.0.2": - version: 17.0.2 - resolution: "@types/react@npm:17.0.2" - dependencies: - "@types/prop-types": "*" - csstype: ^3.0.2 - checksum: a5198857165feddcbfc7d33e3322460ac62b8894d702414496a825b0c82272911ec33a42ef7c9d623a59308070eef4dfee6ff834b0674aa3f87eeb644196ee3b + checksum: ebee02778ca08f954c316dc907802264e0121c87b8fa2e7e0156ab0ef2a1b0a09d968c016a3600ec4c9a17dc09b4274f292d9b15a1a5369bb7e4072def82808f languageName: node linkType: hard -- 2.49.1 From d84369f7bcfbba566a4e7104483b8788e33f4115 Mon Sep 17 00:00:00 2001 From: Lucid Kobold Date: Sun, 17 Apr 2022 15:58:17 -0500 Subject: [PATCH 09/13] Added redux toolkit. --- package.json | 5 ++- yarn.lock | 114 ++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 94 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index cf7231a..5b9cd5c 100644 --- a/package.json +++ b/package.json @@ -20,19 +20,20 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@iconify/react": "^3.2.1", + "@reduxjs/toolkit": "^1.8.1", "date-fns": "^2.28.0", "formik": "^2.2.9", "framer-motion": "^6.2.9", "next": "12.1.4", "react": "<=17.0.2", "react-dom": "<=17.0.2", - "react-redux": "^7.2.8", + "react-redux": "^8.0.0", "sharp": "^0.30.3" }, "devDependencies": { "@types/node": "^17.0.23", "@types/react": "<=17.0.2", - "@types/react-redux": "^7.1.23", + "@types/react-redux": "^7.1.24", "@typescript-eslint/eslint-plugin": "^5.18.0", "eslint": "^8.13.0", "eslint-config-next": "^12.1.4", diff --git a/yarn.lock b/yarn.lock index 18492b8..3bbef0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -78,7 +78,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.9.2": version: 7.17.9 resolution: "@babel/runtime@npm:7.17.9" dependencies: @@ -1360,6 +1360,26 @@ __metadata: languageName: node linkType: hard +"@reduxjs/toolkit@npm:^1.8.1": + version: 1.8.1 + resolution: "@reduxjs/toolkit@npm:1.8.1" + dependencies: + immer: ^9.0.7 + redux: ^4.1.2 + redux-thunk: ^2.4.1 + reselect: ^4.1.5 + peerDependencies: + react: ^16.9.0 || ^17.0.0 || ^18 + react-redux: ^7.2.1 || ^8.0.0-beta + peerDependenciesMeta: + react: + optional: true + react-redux: + optional: true + checksum: be5cdea975a8a631fe2d88cafc7077554c7bc3621a4a7031556cc17e5dec26359018f2614c325895e7ab50865f5c511025d1e589ca01de7e2bd88d95e0a1a963 + languageName: node + linkType: hard + "@rushstack/eslint-patch@npm:1.0.8": version: 1.0.8 resolution: "@rushstack/eslint-patch@npm:1.0.8" @@ -1374,7 +1394,7 @@ __metadata: languageName: node linkType: hard -"@types/hoist-non-react-statics@npm:^3.3.0": +"@types/hoist-non-react-statics@npm:^3.3.0, @types/hoist-non-react-statics@npm:^3.3.1": version: 3.3.1 resolution: "@types/hoist-non-react-statics@npm:3.3.1" dependencies: @@ -1435,15 +1455,15 @@ __metadata: languageName: node linkType: hard -"@types/react-redux@npm:^7.1.20, @types/react-redux@npm:^7.1.23": - version: 7.1.23 - resolution: "@types/react-redux@npm:7.1.23" +"@types/react-redux@npm:^7.1.24": + version: 7.1.24 + resolution: "@types/react-redux@npm:7.1.24" dependencies: "@types/hoist-non-react-statics": ^3.3.0 "@types/react": "*" hoist-non-react-statics: ^3.3.0 redux: ^4.0.0 - checksum: 7cedb0f20806ce67255f676fab2d4d9534c12705d43636df95224cfa77fdf5a2e792dc76c6e072c02cad1c88030aea822c14f36fe85d459b898ee68fcff6f05c + checksum: 6582246581331ac7fbbd44aa1f1c136c8a9c8febbcf462432ac81302263308c21e1a2e7868beb7f73bbcb52a8e67935d133cb37f5bdcb6564eaff3a811805101 languageName: node linkType: hard @@ -1465,6 +1485,13 @@ __metadata: languageName: node linkType: hard +"@types/use-sync-external-store@npm:^0.0.3": + version: 0.0.3 + resolution: "@types/use-sync-external-store@npm:0.0.3" + checksum: 161ddb8eec5dbe7279ac971531217e9af6b99f7783213566d2b502e2e2378ea19cf5e5ea4595039d730aa79d3d35c6567d48599f69773a02ffcff1776ec2a44e + languageName: node + linkType: hard + "@types/warning@npm:^3.0.0": version: 3.0.0 resolution: "@types/warning@npm:3.0.0" @@ -3246,6 +3273,13 @@ __metadata: languageName: node linkType: hard +"immer@npm:^9.0.7": + version: 9.0.12 + resolution: "immer@npm:9.0.12" + checksum: bcbec6d76dac65e49068eb67ece4d407116e62b8cde3126aa89c801e408f5047763ba0aeb62f1938c1aa704bb6612f1d8302bb2a86fa1fc60fcc12d8b25dc895 + languageName: node + linkType: hard + "import-fresh@npm:^3.0.0, import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" @@ -3674,9 +3708,10 @@ __metadata: "@emotion/react": ^11.9.0 "@emotion/styled": ^11.8.1 "@iconify/react": ^3.2.1 + "@reduxjs/toolkit": ^1.8.1 "@types/node": ^17.0.23 "@types/react": <=17.0.2 - "@types/react-redux": ^7.1.23 + "@types/react-redux": ^7.1.24 "@typescript-eslint/eslint-plugin": ^5.18.0 date-fns: ^2.28.0 eslint: ^8.13.0 @@ -3691,7 +3726,7 @@ __metadata: prettier: ^2.6.2 react: <=17.0.2 react-dom: <=17.0.2 - react-redux: ^7.2.8 + react-redux: ^8.0.0 sharp: ^0.30.3 typescript: <4.6.0 languageName: unknown @@ -4461,31 +4496,39 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^17.0.2": - version: 17.0.2 - resolution: "react-is@npm:17.0.2" - checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8 +"react-is@npm:^18.0.0": + version: 18.0.0 + resolution: "react-is@npm:18.0.0" + checksum: d38f6afee4d8d791cdd69c715841c01a503c9b06da6158e0893447cea6ba50cd262dca9bde84127720cf44fd05c58185eafc32accace4bb2deb03b3cdbeb6b6b languageName: node linkType: hard -"react-redux@npm:^7.2.8": - version: 7.2.8 - resolution: "react-redux@npm:7.2.8" +"react-redux@npm:^8.0.0": + version: 8.0.0 + resolution: "react-redux@npm:8.0.0" dependencies: - "@babel/runtime": ^7.15.4 - "@types/react-redux": ^7.1.20 + "@babel/runtime": ^7.12.1 + "@types/hoist-non-react-statics": ^3.3.1 + "@types/use-sync-external-store": ^0.0.3 hoist-non-react-statics: ^3.3.2 - loose-envify: ^1.4.0 - prop-types: ^15.7.2 - react-is: ^17.0.2 + react-is: ^18.0.0 + use-sync-external-store: ^1.0.0 peerDependencies: - react: ^16.8.3 || ^17 || ^18 + "@types/react": ^16.8 || ^17.0 || ^18.0 + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + react-native: ">=0.59" + redux: ^4 peerDependenciesMeta: + "@types/react": + optional: true react-dom: optional: true react-native: optional: true - checksum: ecf1933e91013f2d41bfc781515b536bf81eb1f70ff228607841094c8330fe77d522372b359687e51c0b52b9888dba73db9ac0486aace1896ab9eb9daec102d5 + redux: + optional: true + checksum: 466c36e49062fb71b7ea747d6a9d7e0f30ce3d2b657e04958fc35c3d66e5f7f277e3588b095cbb663b807f1ff6d826c3dc771586460610c8f916112d56b46281 languageName: node linkType: hard @@ -4577,7 +4620,16 @@ __metadata: languageName: node linkType: hard -"redux@npm:^4.0.0": +"redux-thunk@npm:^2.4.1": + version: 2.4.1 + resolution: "redux-thunk@npm:2.4.1" + peerDependencies: + redux: ^4 + checksum: af5abb425fb9dccda02e5f387d6f3003997f62d906542a3d35fc9420088f550dc1a018bdc246c7d23ee852b4d4ab8b5c64c5be426e45a328d791c4586a3c6b6e + languageName: node + linkType: hard + +"redux@npm:^4.0.0, redux@npm:^4.1.2": version: 4.1.2 resolution: "redux@npm:4.1.2" dependencies: @@ -4610,6 +4662,13 @@ __metadata: languageName: node linkType: hard +"reselect@npm:^4.1.5": + version: 4.1.5 + resolution: "reselect@npm:4.1.5" + checksum: 54c13c1e795b2ea70cba8384138aebe78adda00cbea303cc94b64da0a70d74c896cc9a03115ae38b8bff990e7a60dcd6452ab68cbec01b0b38c1afda70714cf0 + languageName: node + linkType: hard + "resolve-from@npm:^4.0.0": version: 4.0.0 resolution: "resolve-from@npm:4.0.0" @@ -5322,6 +5381,15 @@ __metadata: languageName: node linkType: hard +"use-sync-external-store@npm:^1.0.0": + version: 1.0.0 + resolution: "use-sync-external-store@npm:1.0.0" + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0-rc + checksum: f3df10af62625169d6a8cd8d4f38942dc6817aa27398fa7f474421fd574b0c4c83679b9d15f983f482c396ee1183416eb146814c81f44241e1480acd701ef018 + languageName: node + linkType: hard + "util-deprecate@npm:^1.0.1, util-deprecate@npm:~1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" -- 2.49.1 From 7f7b2ec20b92bc0c2d08e0c9ac8d0d084ad8c0e8 Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Thu, 28 Apr 2022 09:33:12 -0500 Subject: [PATCH 10/13] Fixed dupe depenency. --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index dbc7c9a..0e1b4ce 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "sharp": "^0.30.4" }, "devDependencies": { - "@types/react": "<=17.0.2", "@types/node": "^17.0.25", "@types/react": "<18.0.0", "@typescript-eslint/eslint-plugin": "^5.20.0", -- 2.49.1 From 34a7844a92f6249488520f552a32333b7e1f9cf4 Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Thu, 28 Apr 2022 09:42:25 -0500 Subject: [PATCH 11/13] Fixed dupe depenency. --- yarn.lock | 55 +------------------------------------------------------ 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6009149..3181e96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -69,7 +69,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.7.2": version: 7.17.9 resolution: "@babel/runtime@npm:7.17.9" dependencies: @@ -1331,26 +1331,6 @@ __metadata: languageName: node linkType: hard -"@reduxjs/toolkit@npm:^1.8.1": - version: 1.8.1 - resolution: "@reduxjs/toolkit@npm:1.8.1" - dependencies: - immer: ^9.0.7 - redux: ^4.1.2 - redux-thunk: ^2.4.1 - reselect: ^4.1.5 - peerDependencies: - react: ^16.9.0 || ^17.0.0 || ^18 - react-redux: ^7.2.1 || ^8.0.0-beta - peerDependenciesMeta: - react: - optional: true - react-redux: - optional: true - checksum: be5cdea975a8a631fe2d88cafc7077554c7bc3621a4a7031556cc17e5dec26359018f2614c325895e7ab50865f5c511025d1e589ca01de7e2bd88d95e0a1a963 - languageName: node - linkType: hard - "@rushstack/eslint-patch@npm:1.0.8": version: 1.0.8 resolution: "@rushstack/eslint-patch@npm:1.0.8" @@ -3244,13 +3224,6 @@ __metadata: languageName: node linkType: hard -"immer@npm:^9.0.7": - version: 9.0.12 - resolution: "immer@npm:9.0.12" - checksum: bcbec6d76dac65e49068eb67ece4d407116e62b8cde3126aa89c801e408f5047763ba0aeb62f1938c1aa704bb6612f1d8302bb2a86fa1fc60fcc12d8b25dc895 - languageName: node - linkType: hard - "import-fresh@npm:^3.0.0, import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" @@ -3679,7 +3652,6 @@ __metadata: "@emotion/react": ^11.9.0 "@emotion/styled": ^11.8.1 "@iconify/react": ^3.2.1 - "@reduxjs/toolkit": ^1.8.1 "@types/node": ^17.0.25 "@types/react": <18.0.0 "@typescript-eslint/eslint-plugin": ^5.20.0 @@ -4542,24 +4514,6 @@ __metadata: languageName: node linkType: hard -"redux-thunk@npm:^2.4.1": - version: 2.4.1 - resolution: "redux-thunk@npm:2.4.1" - peerDependencies: - redux: ^4 - checksum: af5abb425fb9dccda02e5f387d6f3003997f62d906542a3d35fc9420088f550dc1a018bdc246c7d23ee852b4d4ab8b5c64c5be426e45a328d791c4586a3c6b6e - languageName: node - linkType: hard - -"redux@npm:^4.1.2": - version: 4.2.0 - resolution: "redux@npm:4.2.0" - dependencies: - "@babel/runtime": ^7.9.2 - checksum: 75f3955c89b3f18edf5411e5fb482aa2e4f41a416183e8802a6bf6472c4fc3d47675b8b321d147f8af8e0f616436ac507bf5a25f1c4d6180e797b549c7db2c1d - languageName: node - linkType: hard - "regenerator-runtime@npm:^0.13.4": version: 0.13.9 resolution: "regenerator-runtime@npm:0.13.9" @@ -4585,13 +4539,6 @@ __metadata: languageName: node linkType: hard -"reselect@npm:^4.1.5": - version: 4.1.5 - resolution: "reselect@npm:4.1.5" - checksum: 54c13c1e795b2ea70cba8384138aebe78adda00cbea303cc94b64da0a70d74c896cc9a03115ae38b8bff990e7a60dcd6452ab68cbec01b0b38c1afda70714cf0 - languageName: node - linkType: hard - "resolve-from@npm:^4.0.0": version: 4.0.0 resolution: "resolve-from@npm:4.0.0" -- 2.49.1 From ba98266eb4ea923a66fff3a0e02673ea4500f241 Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Fri, 29 Apr 2022 09:02:57 -0500 Subject: [PATCH 12/13] types node, eslint plugin TS, framer motion --- package.json | 6 +-- yarn.lock | 102 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 0e1b4ce..8df3251 100644 --- a/package.json +++ b/package.json @@ -22,16 +22,16 @@ "@iconify/react": "^3.2.1", "date-fns": "^2.28.0", "formik": "^2.2.9", - "framer-motion": "^6.3.1", + "framer-motion": "^6.3.3", "next": "12.1.5", "react": "<=17.0.2", "react-dom": "<=17.0.2", "sharp": "^0.30.4" }, "devDependencies": { - "@types/node": "^17.0.25", + "@types/node": "^17.0.30", "@types/react": "<18.0.0", - "@typescript-eslint/eslint-plugin": "^5.20.0", + "@typescript-eslint/eslint-plugin": "^5.21.0", "eslint": "^8.14.0", "eslint-config-next": "^12.1.5", "eslint-config-prettier": "^8.5.0", diff --git a/yarn.lock b/yarn.lock index 3181e96..e52a7fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1375,10 +1375,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^17.0.25": - version: 17.0.25 - resolution: "@types/node@npm:17.0.25" - checksum: 6a820bd624e69ea772f52a6cdb326484eff5829443dc981939373929ade109f58c21698b9f0a831bd6ceea799e722a75dc49c5fa7a6bc32a81e1cbdfc6507b64 +"@types/node@npm:^17.0.30": + version: 17.0.30 + resolution: "@types/node@npm:17.0.30" + checksum: b3cd2db6474aae3ddac5a312f340f6e4ca200429371e62cb74698fe7f23d7414d0200f643204ddfaa797846328539359e3797d7f2baaf3cdd643b159cf53baa6 languageName: node linkType: hard @@ -1421,13 +1421,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.20.0": - version: 5.20.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.20.0" +"@typescript-eslint/eslint-plugin@npm:^5.21.0": + version: 5.21.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.21.0" dependencies: - "@typescript-eslint/scope-manager": 5.20.0 - "@typescript-eslint/type-utils": 5.20.0 - "@typescript-eslint/utils": 5.20.0 + "@typescript-eslint/scope-manager": 5.21.0 + "@typescript-eslint/type-utils": 5.21.0 + "@typescript-eslint/utils": 5.21.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -1440,7 +1440,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 276251535b38dc5e9165c86d7f9b0a6d601cef82f02dc2a94b4133ad08d8825cb3e27bfd3b686b21b0627e05fa25c5e456c89cc3a66583b109637d1cf2d6c06a + checksum: 52068319798775f320564e98b1361bbe7f8a80ece3ded35145b2cefc5530047a12c6482727eb3c4d845dcd4e4a8d8bf5898125775f99c1d197d45c47a7732813 languageName: node linkType: hard @@ -1471,21 +1471,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.20.0": - version: 5.20.0 - resolution: "@typescript-eslint/scope-manager@npm:5.20.0" +"@typescript-eslint/scope-manager@npm:5.21.0": + version: 5.21.0 + resolution: "@typescript-eslint/scope-manager@npm:5.21.0" dependencies: - "@typescript-eslint/types": 5.20.0 - "@typescript-eslint/visitor-keys": 5.20.0 - checksum: 904fd43f559dc2579958496ffad837eca124940b4a172666f0ea54ed606074d9ec7d2bec0f2141c3f9a8b894dd2644817cb86809e79a7a73ecba2b7babcdb5c9 + "@typescript-eslint/types": 5.21.0 + "@typescript-eslint/visitor-keys": 5.21.0 + checksum: 2bcb5947d7882f08fb8f40eea154c15152957105a3dc80bf8481212a66d35a8d2239437e095a9a7526c6c0043e9bd6bececf4f87d40da85abb2d2b69f774d805 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.20.0": - version: 5.20.0 - resolution: "@typescript-eslint/type-utils@npm:5.20.0" +"@typescript-eslint/type-utils@npm:5.21.0": + version: 5.21.0 + resolution: "@typescript-eslint/type-utils@npm:5.21.0" dependencies: - "@typescript-eslint/utils": 5.20.0 + "@typescript-eslint/utils": 5.21.0 debug: ^4.3.2 tsutils: ^3.21.0 peerDependencies: @@ -1493,7 +1493,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: c9c436122b715d144edae9d36ebd34e9b02b282ada829382770e15170c58f4f27cfde2d5847ea3c4a1b70ca42e2460a204e920eea50b3d05e9d342e8836d4d12 + checksum: 09a9dbaa26c0c56aa36e0d6e119007dcbe2cc326b844892ce9389409d5a1d43951f67e0ca03fb28d4d96a09ab498f125dd3bc09f82e655c2ca7023566ad2cf5f languageName: node linkType: hard @@ -1504,10 +1504,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.20.0": - version: 5.20.0 - resolution: "@typescript-eslint/types@npm:5.20.0" - checksum: d7f6e51e23f59feee8857340828c47a98a0dd5eaa1b045e936dc11199b55754cf78ae5cd8d56c1fafb1b5a40a6f472c1ac921072951217caffe3f06a717fa61c +"@typescript-eslint/types@npm:5.21.0": + version: 5.21.0 + resolution: "@typescript-eslint/types@npm:5.21.0" + checksum: 1581bf79f8c9236844ca8891e26c84503b654359fbfee80d76f9f57fb90c24210687cd30f61592e7d44cacf5417c83aaa5ae8559a4a8b6ce6b6c4a163b8b86c2 languageName: node linkType: hard @@ -1529,12 +1529,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.20.0": - version: 5.20.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.20.0" +"@typescript-eslint/typescript-estree@npm:5.21.0": + version: 5.21.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.21.0" dependencies: - "@typescript-eslint/types": 5.20.0 - "@typescript-eslint/visitor-keys": 5.20.0 + "@typescript-eslint/types": 5.21.0 + "@typescript-eslint/visitor-keys": 5.21.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -1543,23 +1543,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 2b709292b7df3675d1f8eaf2f4e1ecf491f70fc525012c6a0fb5164aa893c165317b0a419022b8b00aaed502864d5b5b84092b58a9950d2633248e8d7627abd8 + checksum: 4f78d61be2f35775d0f2d7fc4e3bb0bfc6b84e608e96a297c948f84a7254c1b9f0062f61a1dce67a8d4eb67476a9b4a9ebd8b6412e97db76f675c03363a5a0ad languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.20.0": - version: 5.20.0 - resolution: "@typescript-eslint/utils@npm:5.20.0" +"@typescript-eslint/utils@npm:5.21.0": + version: 5.21.0 + resolution: "@typescript-eslint/utils@npm:5.21.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.20.0 - "@typescript-eslint/types": 5.20.0 - "@typescript-eslint/typescript-estree": 5.20.0 + "@typescript-eslint/scope-manager": 5.21.0 + "@typescript-eslint/types": 5.21.0 + "@typescript-eslint/typescript-estree": 5.21.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: e387cf96124e34d079804220c5cb9134148fb3efc68d852a344453e285e3016e0b7e37b11308ef58c0e7afc638f145002cebc27c5da0fd03e0c074ff97d8210e + checksum: ed339a4ccb9eeb2a1132c41999d6584c15c4b7e2f0132bce613f502faa1dbbad7e206b642360392a6e2b24e294df90910141c7da0959901efcd600aedc4c4253 languageName: node linkType: hard @@ -1573,13 +1573,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.20.0": - version: 5.20.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.20.0" +"@typescript-eslint/visitor-keys@npm:5.21.0": + version: 5.21.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.21.0" dependencies: - "@typescript-eslint/types": 5.20.0 + "@typescript-eslint/types": 5.21.0 eslint-visitor-keys: ^3.0.0 - checksum: 1e1aa5f14fd60f1846ee26947d571953898dc82eb635a7eab3984c6b7db9bb8897743416713a129cc95c8cd63325cc0c64b3935d264f73100911fc5da76fc65f + checksum: 328b18faa61872160f3e5faacb5b68022bdabd04b5414f115133245a4a1ecfb5762c67fd645ab3253005480bd25a38598f57fdc2ff2b01d830ac68b37d3d06a5 languageName: node linkType: hard @@ -2847,9 +2847,9 @@ __metadata: languageName: node linkType: hard -"framer-motion@npm:^6.3.1": - version: 6.3.1 - resolution: "framer-motion@npm:6.3.1" +"framer-motion@npm:^6.3.3": + version: 6.3.3 + resolution: "framer-motion@npm:6.3.3" dependencies: "@emotion/is-prop-valid": ^0.8.2 framesync: 6.0.1 @@ -2863,7 +2863,7 @@ __metadata: dependenciesMeta: "@emotion/is-prop-valid": optional: true - checksum: 23971369855d0d6504ad126ff33e393dc153edf470f7150e6b74667ef0104089daf28105d9841a8f0aea35e459bffabbda6b682b7722e014eef5a54214ee1680 + checksum: 905ccf2679a45b00f6fd3fa6220f73f176e0c14b43d65ceb5feb93e23b12098def275930b98926c9bd4320f0436564745ebcfd488d7a477646a7a4600362fdbf languageName: node linkType: hard @@ -3652,9 +3652,9 @@ __metadata: "@emotion/react": ^11.9.0 "@emotion/styled": ^11.8.1 "@iconify/react": ^3.2.1 - "@types/node": ^17.0.25 + "@types/node": ^17.0.30 "@types/react": <18.0.0 - "@typescript-eslint/eslint-plugin": ^5.20.0 + "@typescript-eslint/eslint-plugin": ^5.21.0 date-fns: ^2.28.0 eslint: ^8.14.0 eslint-config-next: ^12.1.5 @@ -3663,7 +3663,7 @@ __metadata: eslint-plugin-react: ^7.29.4 eslint-plugin-react-hooks: <=4.3.0 formik: ^2.2.9 - framer-motion: ^6.3.1 + framer-motion: ^6.3.3 next: 12.1.5 prettier: ^2.6.2 react: <=17.0.2 -- 2.49.1 From 9428e5944e0cfa115fc26882c952bfc82a6d613f Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Fri, 29 Apr 2022 09:05:35 -0500 Subject: [PATCH 13/13] Update version info. --- package.json | 2 +- src/theme/layout/Header.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8df3251..2fe6f0c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "name": "lucid-creations-media-potty-chart", "homepage": "https://lucidcreations.media/introducing-code-name-potty-chart/", - "version": "v0.0.9.8-alpha", + "version": "v0.0.9.9-alpha", "author": { "name": "Lucid Creations Media", "url": "https://lucidcreations.media", diff --git a/src/theme/layout/Header.tsx b/src/theme/layout/Header.tsx index 0e66add..40434ac 100644 --- a/src/theme/layout/Header.tsx +++ b/src/theme/layout/Header.tsx @@ -15,7 +15,7 @@ import appLogo from "../../../public/images/logo.svg"; const Header = (): JSX.Element => { const appName = "LCM Potty Chart"; - const appVersion = "v0.0.9.8-alpha"; + const appVersion = "v0.0.9.9-alpha"; // Add transparency while not at the top of the page. const [transparentNavbar, setTransparentNavbar] = useState(false); -- 2.49.1