From 39abadc1c4b5911efb7468a5bfcb4c28e4b64e74 Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Thu, 29 Feb 2024 17:23:17 -0500 Subject: [PATCH] Removed most code, logos, and other references to the potty chart. Updated everything to be LCM website. --- public/images/logo.png | Bin 3255 -> 13373 bytes public/images/logo.svg | 213 ++++++++++++- src/components/buttons/data/links.ts | 13 +- src/components/calender/CalenderNav.tsx | 70 ----- src/components/calender/DatePicker.tsx | 284 ------------------ src/components/calender/Day.tsx | 262 ---------------- src/components/calender/FormValidateEmoji.tsx | 35 --- src/components/calender/index.tsx | 166 ---------- .../calender/modals/AddUpdateSticker.tsx | 271 ----------------- .../calender/modals/StickerSelector.tsx | 74 ----- .../calender/stickers/DemoStickers.tsx | 56 ---- src/components/tutorial/CalenderExample.tsx | 210 ------------- src/components/tutorial/data/aboutApp.ts | 10 - .../tutorial/data/appFunctionality.ts | 9 - src/components/tutorial/index.tsx | 38 --- .../tutorial/sections/TutorialAboutApp.tsx | 33 -- .../sections/TutorialAppFunctionality.tsx | 33 -- .../tutorial/sections/TutorialCalender.tsx | 74 ----- .../tutorial/sections/TutorialHeading.tsx | 22 -- .../tutorial/sections/TutorialLinks.tsx | 23 -- .../sections/TutorialSubmitButtons.tsx | 83 ----- src/pages/_app.tsx | 2 +- src/pages/_document.tsx | 25 +- src/pages/calendar/[...date].tsx | 209 ------------- src/pages/calendar/index.tsx | 23 -- src/pages/index.tsx | 121 +------- src/theme/AppTheme.ts | 3 +- src/theme/layout/Header.tsx | 2 +- 28 files changed, 232 insertions(+), 2132 deletions(-) delete mode 100644 src/components/calender/CalenderNav.tsx delete mode 100644 src/components/calender/DatePicker.tsx delete mode 100644 src/components/calender/Day.tsx delete mode 100644 src/components/calender/FormValidateEmoji.tsx delete mode 100644 src/components/calender/index.tsx delete mode 100644 src/components/calender/modals/AddUpdateSticker.tsx delete mode 100644 src/components/calender/modals/StickerSelector.tsx delete mode 100644 src/components/calender/stickers/DemoStickers.tsx delete mode 100644 src/components/tutorial/CalenderExample.tsx delete mode 100644 src/components/tutorial/data/aboutApp.ts delete mode 100644 src/components/tutorial/data/appFunctionality.ts delete mode 100644 src/components/tutorial/index.tsx delete mode 100644 src/components/tutorial/sections/TutorialAboutApp.tsx delete mode 100644 src/components/tutorial/sections/TutorialAppFunctionality.tsx delete mode 100644 src/components/tutorial/sections/TutorialCalender.tsx delete mode 100644 src/components/tutorial/sections/TutorialHeading.tsx delete mode 100644 src/components/tutorial/sections/TutorialLinks.tsx delete mode 100644 src/components/tutorial/sections/TutorialSubmitButtons.tsx delete mode 100644 src/pages/calendar/[...date].tsx delete mode 100644 src/pages/calendar/index.tsx diff --git a/public/images/logo.png b/public/images/logo.png index 1009fd018791d340a7c77174de869154a7c9acc2..d6ad4118e3d32ca7576fbfe5524b1c23da9a2549 100644 GIT binary patch literal 13373 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 literal 3255 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 LE5kbd`w9OAfE9NH diff --git a/public/images/logo.svg b/public/images/logo.svg index 295413e..84cfb1a 100644 --- a/public/images/logo.svg +++ b/public/images/logo.svg @@ -1 +1,212 @@ - \ No newline at end of file + + + + diff --git a/src/components/buttons/data/links.ts b/src/components/buttons/data/links.ts index 834cea3..9835682 100644 --- a/src/components/buttons/data/links.ts +++ b/src/components/buttons/data/links.ts @@ -8,18 +8,13 @@ type Links = LinkObj[]; const links: Links = [ { - href: "https://docs.google.com/document/d/1hrerGKHTO3iach8A-CabtfIB4lyZWlgO8EGTyOCrI2Y", + href: "https://docs.google.com/document/d/1y1tbTG6TYoLMEde4XHzInByyHQ0T6Aw2RF6Y4Z7Yabs", name: "Roadmap and Progress", type: "secondary" }, - { - href: "https://lucidcreations.media/lcm-potty-chart/", - name: "Official Announcement", - type: "secondary" - }, - { - type: "ko-fi" - }, + // { + // type: "ko-fi" + // }, { href: "https://t.me/LucidCreationsMedia", name: "Dev Updates", diff --git a/src/components/calender/CalenderNav.tsx b/src/components/calender/CalenderNav.tsx deleted file mode 100644 index 94a46e9..0000000 --- a/src/components/calender/CalenderNav.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import React from "react"; -import { useAppSelector } from "../../redux/hooks"; -import { useRouter } from "next/router"; -import { HStack, IconButton } from "@chakra-ui/react"; -import { Icon } from "@iconify/react"; -import { format, isSameMonth, addMonths, subMonths } from "date-fns"; -import findValidDateRange from "../../../lib/findValidDateRange"; -import DatePicker from "./DatePicker"; - -interface CalenderNavProps { - isLoading: boolean; - title: string; -} - -/** - * @param {boolean} isLoading is the component loading? - * @param {string} title the title for the current date. - */ - -const CalenderNav = ({ title, isLoading }: CalenderNavProps): JSX.Element => { - const selectedDate = useAppSelector( - (state) => state.calender.selectedDateInfo - ); - const { date } = selectedDate; - - const selectedDateObj = new Date(date); - - const validDateRange = findValidDateRange(); - const { start: validStart, end: validEnd } = validDateRange; - - const router = useRouter(); - - const handleNavButtons = (direction: "next" | "prev") => { - if (direction === "next") { - const newMonth = addMonths(selectedDateObj, 1); - - const year = format(newMonth, "y"); - const month = format(newMonth, "L"); - - router.push(`/calendar/${year}/${month}`); - } else if (direction === "prev") { - const newMonth = subMonths(selectedDateObj, 1); - - const year = format(newMonth, "y"); - const month = format(newMonth, "L"); - - router.push(`/calendar/${year}/${month}`); - } - }; - - return ( - - } - onClick={() => handleNavButtons("prev")} - /> - - } - onClick={() => handleNavButtons("next")} - /> - - ); -}; - -export default CalenderNav; diff --git a/src/components/calender/DatePicker.tsx b/src/components/calender/DatePicker.tsx deleted file mode 100644 index 459a852..0000000 --- a/src/components/calender/DatePicker.tsx +++ /dev/null @@ -1,284 +0,0 @@ -import React, { useRef, useState } from "react"; -import { useRouter } from "next/router"; -import { - Button, - FormControl, - FormErrorMessage, - FormLabel, - Heading, - HStack, - Input, - Popover, - PopoverBody, - PopoverCloseButton, - PopoverContent, - PopoverHeader, - PopoverTrigger, - Skeleton, - VStack -} from "@chakra-ui/react"; -import { - Formik, - // FormikHelpers, - FormikProps, - Form, - Field, - FieldProps -} from "formik"; -import { format } from "date-fns"; -import findValidDateRange from "../../../lib/findValidDateRange"; -import FormValidateEmoji from "./FormValidateEmoji"; - -interface DatePickerProps { - isLoading: boolean; - title: string; -} - -/** - * @param {boolean} isLoading is the component loading? - * @param {string} title the title for the current date. - */ - -const DatePicker = ({ title, isLoading }: DatePickerProps): JSX.Element => { - const router = useRouter(); - - const [valid, setValid] = useState(false); - - const validDateRange = findValidDateRange(); - - const validateDate = ( - dateString?: string | undefined - ): string | undefined => { - let dateError; - - if (dateString) { - const dateArr = dateString.split("-"); - if (dateArr.length !== 3) { - dateError = "Please select a date."; - setValid(false); - } else if (dateArr.length === 3) { - const date: UpdateCalenderPropsDateLayout = { - year: parseInt(dateArr[0]), - month: parseInt(dateArr[1]), - day: parseInt(dateArr[2]) - }; - - if (!/^(19|20)\d{2}$/.test(`${date.year}`)) { - dateError = "Please use a year between 1900 and 2099"; - setValid(false); - } - - if (date.month < 1 || date.month > 12) { - dateError = "Please use a month between 1 and 12"; - setValid(false); - } - - if (date.day < 1 || date.day > 31) { - dateError = "Please use a day between 1 and 31"; - setValid(false); - } - - setValid(true); - } else { - setValid(true); - } - } else if (dateString.length === 0) { - dateError = "Please select a date."; - setValid(false); - } else { - setValid(true); - } - - return dateError; - }; - - const handleSubmit = (formInput?: { date?: string }): Promise => { - return new Promise((resolve, reject) => { - if (formInput.date) { - if (!validateDate(formInput.date)) { - const dateArr = formInput.date.split("-"); - const date: UpdateCalenderPropsDateLayout = { - year: parseInt(dateArr[0]), - month: parseInt(dateArr[1]), - day: parseInt(dateArr[2]) - }; - - return resolve(router.push(`/calendar/${date.year}/${date.month}`)); - } else { - return reject("Error validating date."); - } - } else { - return reject("Date not provided."); - } - }); - }; - - // Field theme - const fieldTheme = { - width: "auto", - bg: "gray.900", - borderColor: "white", - _placeholder: { - color: "white" - }, - _focus: { - bg: "#000", - color: "#FFF", - borderColor: "#63b3ed", - boxShadow: "0 0 0 1px #63b3ed", - zIndex: "1" - } - }; - - const initRef = useRef(); - - return ( - - - - - - - - {"Choose a Date"} - - - - - { - handleSubmit(data) - .then(() => { - actions.setSubmitting(false); - actions.resetForm({ - values: { - date: "" - } - }); - }) - .catch(() => { - actions.setSubmitting(false); - }); - }} - > - {( - formProps: FormikProps<{ - date: string; - }> - ) => ( -
- - - {"Required fields indicated with"} - - - - {({ field, form }: FieldProps) => ( - - - - - {"Date:"} - - - {!form.touched.date && ( - - )} - {form.errors.name && form.touched.date && ( - - )} - {!form.errors.name && form.touched.date && ( - - )} - - - {typeof form.errors.date === "string" && - form.errors.date} - - - - )} - - - -
- )} - - - - - ); -}; - -export default DatePicker; diff --git a/src/components/calender/Day.tsx b/src/components/calender/Day.tsx deleted file mode 100644 index b5e5245..0000000 --- a/src/components/calender/Day.tsx +++ /dev/null @@ -1,262 +0,0 @@ -import React, { useState } from "react"; -import { Provider } from "react-redux"; -import { store } from "../../redux/store"; -import { Box, Skeleton, VStack } from "@chakra-ui/react"; -import { - add, - getYear, - getMonth, - sub, - getDate, - isBefore, - endOfDay, - isToday as isTodayFun -} from "date-fns"; -import router from "next/router"; -import AddUpdateSticker from "./modals/AddUpdateSticker"; -import DemoStickers from "./stickers/DemoStickers"; - -interface DayProps { - isLoading: boolean; - isOverflow?: boolean; - overflowDirection?: "next" | "prev" | null; - currSticker: StickerVal; - date: string; - selectedDate: string; - currDate: Date; - tutorial?: "add" | "edit"; -} - -/** - * The individual days in the calender component. - * @param {boolean} isLoading is the component loading? - * @param {boolean} isOverflow is the current date being given before or after the current month. - * @param {"next" | "prev" | null} overflowDirection the direction the overflow is. This will navigate the calender forward or backwards 1 month. - * @param {StickerVal} currSticker the sticker for this date. - * @param {date} date the date for this day. - * @param {date} selectedDate the date for the selected month. - * @param {Date} currDate today's date. - */ -const Day = ({ - isLoading, - isOverflow, - overflowDirection, - currSticker, - date, - selectedDate, - currDate, - tutorial -}: DayProps): JSX.Element => { - const selectedDateObj = new Date(selectedDate); - const currDateObj = new Date(date); - const isToday = isTodayFun(currDateObj); - - const handleNav = (direction: "next" | "prev") => { - if (direction === "next") { - console.log(overflowDirection); - const newMonth = add(selectedDateObj, { months: 1 }); - - const year = getYear(newMonth); - const month = getMonth(newMonth) + 1; - - router.push(`/calendar/${year}/${month}`); - } else if (direction === "prev") { - const newMonth = sub(selectedDateObj, { months: 1 }); - - const year = getYear(newMonth); - const month = getMonth(newMonth) + 1; - - router.push(`/calendar/${year}/${month}`); - } - }; - - // This handles the modal for the day. - const [isOpen, setIsOpen] = useState(false); - - // The step the modal is at. - const [step, setStep] = useState(0); - - // The current selected sticker. (To be added or updated) - const [selectedSticker, setSelectedSticker] = useState(null); - - /** - * TODO: Add logic to remove the onClick within overflow dates. - * Do not give dates for the next month an onClick. - * Do not give dates in the past an onClick there is nothing before that month. - * (Creation date of a chart) - */ - - // TODO: When the valid date range is created, disallow pointer cursor outside of the date range. - - return isOverflow ? ( - - selectedSticker !== null ? handleNav(overflowDirection) : "" - } - spacing="0.5rem" - alignContent="center" - justifyContent="flex-start" - > - - {`${getDate(currDateObj)}`} - - {isLoading ? ( - - - - - - ) : ( - - - - )} - - ) : ( - { - setStep(0); - setSelectedSticker(null); - setIsOpen(true); - }} - alignContent="center" - justifyContent="flex-start" - pt={2} - _hover={{ - cursor: isBefore(currDateObj, endOfDay(currDate)) - ? "pointer" - : "default", - bg: tutorial - ? tutorial === "add" && isToday - ? "gray.600" - : tutorial === "edit" && - !isToday && - isBefore(currDateObj, endOfDay(currDate)) - ? "gray.600" - : "transparent" - : "transparent", - border: "1px solid #FFF" - }} - > - {isToday ? ( - - {`${getDate(currDateObj)}`} - - ) : ( - - {`${getDate(currDateObj)}`} - - )} - {isLoading ? ( - - - - - - ) : ( - - - - )} - {tutorial ? ( - - {tutorial.toLowerCase() === "add" && isToday && !isLoading && ( - - )} - {tutorial.toLowerCase() === "edit" && - !isToday && - isBefore(currDateObj, endOfDay(currDate)) && - !isLoading && ( - - )} - - ) : ( - - {isBefore(currDateObj, endOfDay(currDate)) && !isLoading && ( - - )} - - )} - - ); -}; - -export default Day; diff --git a/src/components/calender/FormValidateEmoji.tsx b/src/components/calender/FormValidateEmoji.tsx deleted file mode 100644 index a231114..0000000 --- a/src/components/calender/FormValidateEmoji.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import React, { FC } from "react"; - -interface FormValidateEmojiProps { - type: string; -} - -const FormValidateEmoji: FC = ({ - type -}: FormValidateEmojiProps) => { - interface Validations { - [key: string]: JSX.Element; - } - - const validations: Validations = { - Required: ( - - ❗ - - ), - Error: ( - - ❌ - - ), - Valid: ( - - ✔ - - ) - }; - - return validations[`${type}`]; -}; - -export default FormValidateEmoji; diff --git a/src/components/calender/index.tsx b/src/components/calender/index.tsx deleted file mode 100644 index 01f9dda..0000000 --- a/src/components/calender/index.tsx +++ /dev/null @@ -1,166 +0,0 @@ -import React, { useEffect } from "react"; -import { useAppDispatch, useAppSelector } from "../../redux/hooks"; -import { updateCurrDate, updateMonth } from "../../features/calender"; -import { Box, HStack, SimpleGrid, Text, VStack } from "@chakra-ui/react"; -import { isSameDay, format } from "date-fns"; -import CalenderNav from "./CalenderNav"; -import Day from "./Day"; - -const Calender = ({ - date: newDate, - isLoading -}: UpdateCalendarProps): JSX.Element => { - const dispatch = useAppDispatch(); - - // * Month * // - const currDate: string = useAppSelector((state) => state.calender.currDate); - const selectedDate: SelectedDateInfo = useAppSelector( - (state) => state.calender.selectedDateInfo - ); - const { layout, title, date: currentSelectedDateStr } = selectedDate; - - const currDateObj = new Date(currDate); - - // * Stickers * // - - const stickersMonth: StickerDays = useAppSelector( - (state) => state.stickers.stickersMonth - ); - - useEffect(() => { - if (newDate && newDate.year && newDate.month && newDate.day) { - const { year, month, day } = newDate; - - if (year > 0 && month > 0 && day > 0) { - const generatedDate: Date = new Date(year, month - 1, day); - const currSelectedDateObj = new Date(currentSelectedDateStr); - const dateString: string = generatedDate.toJSON(); - - if (!isSameDay(currSelectedDateObj, generatedDate)) { - dispatch(updateMonth(dateString)); - } - } else { - console.warn("Invalid date format: ", newDate); - } - } - }, [currentSelectedDateStr, dispatch, newDate]); - - useEffect(() => { - // console.info("Check to update date."); - - const currDateObj = new Date(currDate); - - if (!isSameDay(currDateObj, new Date())) { - // console.info("Updated date."); - dispatch(updateCurrDate()); - } - }, [currDate, dispatch]); - - // Simulated user settings. - const userSettings = { - theme: "default", - startOfWeek: "Sunday" - }; - - const currMonth: WeekLayout = - layout[`${userSettings.startOfWeek.toLowerCase()}`]; - const { month, weekdays } = currMonth; - - // TODO: Move the weekdays into it's own component for responsiveness. - - return ( - - - - - {weekdays.map((weekDay) => { - return ( - - - {weekDay} - - - {weekDay.substring(0, 3)} - - - {weekDay.substring(0, 2)} - - - ); - })} - - - {Object.keys(month).map((week) => { - const thisWeek = month[week]; - - return thisWeek.map((day: MonthDay) => { - const { date, isOverflow, overflowDirection } = day; - - const toDateObj: Date = new Date(date); - - let sticker = null; - - let id = ""; - - stickersMonth.map((stickerDay) => { - const { date: stickerDate } = stickerDay; - - if (isSameDay(new Date(stickerDate), toDateObj)) { - sticker = stickerDay.sticker; - - id = stickerDay.id; - } - }); - - return ( - - ); - }); - })} - - - - ); -}; - -export default Calender; diff --git a/src/components/calender/modals/AddUpdateSticker.tsx b/src/components/calender/modals/AddUpdateSticker.tsx deleted file mode 100644 index 60f2146..0000000 --- a/src/components/calender/modals/AddUpdateSticker.tsx +++ /dev/null @@ -1,271 +0,0 @@ -import React, { useState, useRef } from "react"; -import { useAppDispatch } from "../../../redux/hooks"; -import { addEditSticker } from "../../../features/calender/stickers"; -import { - Button, - Modal, - ModalOverlay, - ModalContent, - ModalHeader, - ModalBody, - ModalFooter, - Heading, - HStack, - Text, - VStack, - SimpleGrid, - Box -} from "@chakra-ui/react"; -import { format, isSameDay } from "date-fns"; -import { Icon } from "@iconify/react"; -import StickerSelector from "./StickerSelector"; -import DemoStickers from "../stickers/DemoStickers"; - -interface AddStickerProps { - isOpen: boolean; - updateIsOpen: React.Dispatch>; - stickerDate: string; - currSticker: StickerVal; - step: number; - updateStep: React.Dispatch>; - selectedSticker: StickerVal; - updateSelectedSticker: React.Dispatch>; - currDate: Date; -} - -/** - * Handles adding and modifying the stickers for the given month. - * @param {boolean} isOpen Tells the component when the modal should be open. - * @param {React.Dispatch>} updateIsOpen Used to close the modal. - * @param {date} stickerDate The date for which the sticker will be added or modified. - * @param {StickerVal} currSticker The current sticker for the date. - * @param {number} step A numerical variable that represents the page the modal should be at. - * @param {React.Dispatch>} updateStep Used to navigate the pages of the modal by updating the step the modal is on. - * @param {StickerVal} selectedSticker the value of the selected sticker. - * @param {React.Dispatch>} updateSelectedSticker The react state function to update the selected sticker that will be added or updated. - * @param {Date} currDate the current date. - */ -const AddUpdateSticker = ({ - isOpen, - updateIsOpen, - stickerDate, - currSticker, - step, - updateStep, - selectedSticker, - updateSelectedSticker, - currDate -}: AddStickerProps): JSX.Element => { - const dispatch = useAppDispatch(); - const stickerDateObj = new Date(stickerDate); - - const [modalVariant] = useState<"add" | "edit">( - isSameDay(stickerDateObj, currDate) ? "add" : "edit" - ); - - const handleClose = () => { - updateIsOpen(false); - }; - - // TODO: Validate that the provided sticker is not the current sticker. Throw an error if the same sticker is attempted. - const handleSubmit = (sticker: StickerVal) => { - dispatch(addEditSticker({ stickerDate, sticker })); - handleClose(); - }; - - // The first sticker to have focus when the modal opens. - const initialRef = useRef(); - - // * Double check that the submit button is disabled if the selected sticker is the same as the current sticker. - - const variants = { - add: [ - { - header: `Which sticker did you earn for ${format( - stickerDateObj, - "LLL d, y" - )}?`, - body: ( - - - {"Select a sticker"} - - - - ), - footer: ( - - ) - } - ], - edit: [ - { - header: `Which sticker did you want to update for ${format( - stickerDateObj, - "LLL d, y" - )}?`, - body: ( - - - {"Current Sticker"} - - - - - - {"Select your new sticker"} - - - - ), - footer: ( - - ) - }, - { - header: `Are you sure you want to change the sticker for ${format( - stickerDateObj, - "M/d/y" - )}?`, - body: ( - - - {"Previous Sticker"} - - - - {"New Sticker"} - - - - - - - - - - - - ), - footer: ( - - - - - - - - ) - } - ] - }; - - return ( - handleClose()} - motionPreset="slideInBottom" - scrollBehavior="inside" - size={modalVariant === "add" ? "xl" : "2xl"} - > - - - - - - {modalVariant && variants[modalVariant][step].header} - - - - - - {modalVariant && variants[modalVariant][step].body} - - - {modalVariant && variants[modalVariant][step].footer} - - - - ); -}; - -export default AddUpdateSticker; diff --git a/src/components/calender/modals/StickerSelector.tsx b/src/components/calender/modals/StickerSelector.tsx deleted file mode 100644 index 63b5199..0000000 --- a/src/components/calender/modals/StickerSelector.tsx +++ /dev/null @@ -1,74 +0,0 @@ -import { HStack, Button } from "@chakra-ui/react"; -import React from "react"; -import DemoStickers from "../stickers/DemoStickers"; - -interface StickerSelectorProps { - stickerSet: "Demo"; - currSticker: StickerVal; - selectedSticker: StickerVal; - updateSelectedSticker: React.Dispatch>; - initialSticker: React.MutableRefObject; -} - -/** - * Handles displaying a list of dynamic stickers to be selected. - * @param {string} stickerSet The name of the stickers that should be displayed. - * @param {StickerVal} currSticker The current sticker for the date. - * @param {StickerVal} selectedSticker The selected sticker for the current. date - * @param {React.Dispatch>} updateSelectedSticker TThe react state function to update the selected sticker that will be added or updated. - * @param {React.MutableRefObject} initialSticker the sticker that should have be in focus when the modal opens. - */ - -const StickerSelector = ({ - stickerSet, - currSticker, - selectedSticker, - updateSelectedSticker, - initialSticker -}: StickerSelectorProps): JSX.Element => { - const stickers = { - Demo: ( - - - - - - ) - }; - - return stickers[stickerSet]; -}; - -export default StickerSelector; diff --git a/src/components/calender/stickers/DemoStickers.tsx b/src/components/calender/stickers/DemoStickers.tsx deleted file mode 100644 index e7d60f3..0000000 --- a/src/components/calender/stickers/DemoStickers.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import React, { FC } from "react"; - -// TODO: When themes are made import the theme from user settings store. Refactor to use whatever those SVGs are. - -interface DemoStickersProps { - stickerVal: StickerVal; -} - -const DemoStickers: FC = ({ - stickerVal -}: DemoStickersProps) => { - // If sticker is null return an empty space. - if (stickerVal === null) { - return  ; - } - - interface StickerToEmoji { - [key: string]: JSX.Element; - } - - /** - * ? Temporarily using values -1 to 1. - * ? In the full app the values will be between -2 and 2. - */ - let key = "0"; - - if (stickerVal > 0) { - key = "1"; - } else if (stickerVal < 0) { - key = "-1"; - } - - // Link value to an emoji representing a sticker. - const stickerToEmoji: StickerToEmoji = { - "1": ( - - ☀️ - - ), - "0": ( - - ☁️ - - ), - "-1": ( - - 🌧️ - - ) - }; - - // Return the appropriate sticker. - return stickerToEmoji[`${key}`]; -}; - -export default DemoStickers; diff --git a/src/components/tutorial/CalenderExample.tsx b/src/components/tutorial/CalenderExample.tsx deleted file mode 100644 index 3c8531d..0000000 --- a/src/components/tutorial/CalenderExample.tsx +++ /dev/null @@ -1,210 +0,0 @@ -import React, { useEffect } from "react"; -import { useAppDispatch, useAppSelector } from "../../redux/hooks"; -import { updateMonth } from "../../features/calender"; -import { Box, HStack, SimpleGrid, Text, VStack } from "@chakra-ui/react"; -import { format, isSameDay, isToday } from "date-fns"; -import Day from "../calender/Day"; -import { setCurrentWeek } from "../../features/tutorial"; - -interface CalenderExampleProps { - type: "add" | "edit"; - isLoading: boolean; -} - -const CalenderExample = ({ - type, - isLoading -}: CalenderExampleProps): JSX.Element => { - // TODO: Check if the current date is the start of the user's preferred start of the week and use the previous week for the edit example. - - const currDateStr: string = useAppSelector( - (state) => state.calender.currDate - ); - const currDateObj: Date = new Date(currDateStr); - - const dispatch = useAppDispatch(); - - // * Current Month * // - const selectedDate: SelectedDateInfo = useAppSelector( - (state) => state.calender.selectedDateInfo - ); - const { layout, date: currSelectedDateStr } = selectedDate; - - // * Stickers * // - const stickersMonth: StickerDays = useAppSelector( - (state) => state.stickers.stickersMonth - ); - - // Simulated user settings. - const userSettings = { - theme: "default", - startOfWeek: "Sunday" - }; - - // * Week Names * // - const currMonth: WeekLayout = - layout[`${userSettings.startOfWeek.toLowerCase()}`]; - const { month, weekdays } = currMonth; - - useEffect(() => { - const currDateObj: Date = new Date(currDateStr); - const currSelectedDateOj: Date = new Date(currSelectedDateStr); - - if (!isSameDay(currDateObj, currSelectedDateOj)) { - dispatch(updateMonth(currDateObj.toJSON())); - } - }, [currDateStr, currSelectedDateStr, dispatch]); - - // * The current week * // - const currWeek = useAppSelector((state) => state.tutorial.currWeek); - - useEffect(() => { - const getCurrentWeek = (): MonthDay[] => { - let foundWeek: MonthDay[]; - - for (const week in month) { - const currWeek = month[week]; - - currWeek.forEach((day: MonthDay) => { - const { date } = day; - - if (isToday(new Date(date))) { - foundWeek = currWeek; - } - }); - } - - return foundWeek || ([] as MonthDay[]); - }; - - if (currWeek === null) { - dispatch(setCurrentWeek(getCurrentWeek())); - } - }, [currWeek, dispatch, month]); - - return ( - - - - {weekdays.map((weekDay) => { - return ( - - - {weekDay} - - - {weekDay.substring(0, 3)} - - - {weekDay.substring(0, 2)} - - - ); - })} - - - {currWeek && - currWeek.map((day: MonthDay) => { - const { date, isOverflow, overflowDirection } = day; - - const toDateObj: Date = new Date(date); - - let sticker = null; - - let id = ""; - - stickersMonth.map((stickerDay) => { - const { date: stickerDate } = stickerDay; - - if (isSameDay(new Date(stickerDate), toDateObj)) { - sticker = stickerDay.sticker; - - id = stickerDay.id; - } - }); - - return ( - - ); - })} - - - {type === "edit" && ( - - - { - "Not being able to edit within this tutorial when the current date is the start of the week or month is a known bug." - } - - - {"This bug will be fixed in beta v2."} - - - {"You can skip the tutorial and try again tomorrow."} - - - )} - - ); -}; - -export default CalenderExample; diff --git a/src/components/tutorial/data/aboutApp.ts b/src/components/tutorial/data/aboutApp.ts deleted file mode 100644 index e6fcd35..0000000 --- a/src/components/tutorial/data/aboutApp.ts +++ /dev/null @@ -1,10 +0,0 @@ -type AboutApp = string[]; - -const aboutApp: AboutApp = [ - "The Potty Chart is an app that mimics a potty/star chart commonly used while potty training toddler or child.", - "The app can be used to track behavior, habits, diaper training, potty training (good luck), daily chores/tasks, or anything else you might want to track in a fun and visual way with colorful themes, stickers, and even receive encouraging messaged from your big/dom, followers, and friends.", - "The final app will have settings to disable any mentions and references of ABDL to allow a more general audience to use, such as for a master and pet relationship.", - "This is a beta build of the app. Some functionality may not work as intended, is not fully functional, and may be missing entirely." -]; - -export default aboutApp; diff --git a/src/components/tutorial/data/appFunctionality.ts b/src/components/tutorial/data/appFunctionality.ts deleted file mode 100644 index 9c62325..0000000 --- a/src/components/tutorial/data/appFunctionality.ts +++ /dev/null @@ -1,9 +0,0 @@ -type AppFunctionality = string[]; - -const appFunctionality: AppFunctionality = [ - "The app will generate stickers to display from the 1st of the month to the day before today. This is to simulate previous and continued use.", - "Ability to add a sticker to the current date.", - "Ability to add edit a sticker from a previous date with a confirmation prompt." -]; - -export default appFunctionality; diff --git a/src/components/tutorial/index.tsx b/src/components/tutorial/index.tsx deleted file mode 100644 index 3ad41b0..0000000 --- a/src/components/tutorial/index.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import React from "react"; -import { VStack } from "@chakra-ui/react"; -import TutorialCalender from "./sections/TutorialCalender"; -import TutorialLinks from "./sections/TutorialLinks"; -import TutorialHeading from "./sections/TutorialHeading"; -import TutorialAboutApp from "./sections/TutorialAboutApp"; -import TutorialSubmitButtons from "./sections/TutorialSubmitButtons"; -import TutorialAppFunctionality from "./sections/TutorialAppFunctionality"; - -interface TutorialProps { - isLoading: boolean; -} - -const Tutorial = ({ isLoading }: TutorialProps): JSX.Element => { - return ( - - - - - - - - - ); -}; - -export default Tutorial; diff --git a/src/components/tutorial/sections/TutorialAboutApp.tsx b/src/components/tutorial/sections/TutorialAboutApp.tsx deleted file mode 100644 index 5017de0..0000000 --- a/src/components/tutorial/sections/TutorialAboutApp.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React from "react"; -import { VStack, Heading, Divider, Text } from "@chakra-ui/react"; -import aboutApp from "../data/aboutApp"; - -const TutorialAboutApp = (): JSX.Element => { - return ( - - - {"About the App"} - - - {aboutApp.map((string: string) => { - return {string}; - })} - - - - ); -}; - -export default TutorialAboutApp; diff --git a/src/components/tutorial/sections/TutorialAppFunctionality.tsx b/src/components/tutorial/sections/TutorialAppFunctionality.tsx deleted file mode 100644 index c4f5b1c..0000000 --- a/src/components/tutorial/sections/TutorialAppFunctionality.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React from "react"; -import { VStack, Heading, Divider, Text } from "@chakra-ui/react"; -import appFunctionality from "../data/appFunctionality"; - -const TutorialAppFunctionality = (): JSX.Element => { - return ( - - - {"App Functionality"} - - - {appFunctionality.map((string: string) => { - return {string}; - })} - - - - ); -}; - -export default TutorialAppFunctionality; diff --git a/src/components/tutorial/sections/TutorialCalender.tsx b/src/components/tutorial/sections/TutorialCalender.tsx deleted file mode 100644 index 4a110e7..0000000 --- a/src/components/tutorial/sections/TutorialCalender.tsx +++ /dev/null @@ -1,74 +0,0 @@ -import React from "react"; -import { Divider, Heading, HStack, Text, VStack } from "@chakra-ui/react"; -import CalenderExample from "../CalenderExample"; - -interface CalenderExampleProps { - isLoading: boolean; -} - -const TutorialCalender = ({ isLoading }: CalenderExampleProps): JSX.Element => { - return ( - - - {"How to Use The Calender"} - - - - {"Add a Sticker to Today's Date"} - - - {"Select the date with the"} - {" green "} - {"border."} - - - - - - {"Add a Sticker to Previous Dates"} - - - {"Select a date with a"} - {" green "} - {"border."} - - - - - - ); -}; - -export default TutorialCalender; diff --git a/src/components/tutorial/sections/TutorialHeading.tsx b/src/components/tutorial/sections/TutorialHeading.tsx deleted file mode 100644 index 852f065..0000000 --- a/src/components/tutorial/sections/TutorialHeading.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import React from "react"; -import { VStack, Heading, Divider } from "@chakra-ui/react"; - -const TutorialHeading = (): JSX.Element => { - return ( - - {"Welcome to Code Name: LCM Potty Chart"} - - {"A Lucid Creations Media Project"} - - - - ); -}; - -export default TutorialHeading; diff --git a/src/components/tutorial/sections/TutorialLinks.tsx b/src/components/tutorial/sections/TutorialLinks.tsx deleted file mode 100644 index a0cb1a0..0000000 --- a/src/components/tutorial/sections/TutorialLinks.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import React from "react"; -import { Divider, Heading, VStack } from "@chakra-ui/react"; -import Buttons from "../../buttons"; - -const TutorialLinks = (): JSX.Element => { - return ( - - - {"More Info"} - - - - - ); -}; - -export default TutorialLinks; diff --git a/src/components/tutorial/sections/TutorialSubmitButtons.tsx b/src/components/tutorial/sections/TutorialSubmitButtons.tsx deleted file mode 100644 index 4c619d4..0000000 --- a/src/components/tutorial/sections/TutorialSubmitButtons.tsx +++ /dev/null @@ -1,83 +0,0 @@ -import { HStack, Button, VStack, Checkbox } from "@chakra-ui/react"; -import React from "react"; -import { useAppDispatch, useAppSelector } from "../../../redux/hooks"; -import { - setTutorialCompleted, - setTempTutorialComplete, - toggleRememberCompleted -} from "../../../features/tutorial"; - -interface TutorialSubmitButtonsProps { - isLoading: boolean; -} - -const TutorialSubmitButtons = ({ - isLoading -}: TutorialSubmitButtonsProps): JSX.Element => { - const rememberComplete: boolean = useAppSelector( - (state) => state.tutorial.rememberCompleted - ); - const dispatch = useAppDispatch(); - - const handleComplete = (): void => { - if (rememberComplete) { - dispatch(setTutorialCompleted()); - } - - if (!rememberComplete) { - dispatch(setTempTutorialComplete()); - } - }; - - const handleSkip = (): void => { - dispatch(setTempTutorialComplete()); - }; - - const handleUpdateCheck = (): void => { - dispatch(toggleRememberCompleted()); - }; - - return ( - - - - - handleUpdateCheck()} - > - {"Remember completed?"} - - - - ); -}; - -export default TutorialSubmitButtons; diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 2eed775..e4eb060 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -13,7 +13,7 @@ function LCMPottyChart({ Component, pageProps }: AppProps): JSX.Element { - {"LCM Potty Chart"} + {"LCM Website"} - + - + - + - + - + - + - + - - - + + diff --git a/src/pages/calendar/[...date].tsx b/src/pages/calendar/[...date].tsx deleted file mode 100644 index a174e88..0000000 --- a/src/pages/calendar/[...date].tsx +++ /dev/null @@ -1,209 +0,0 @@ -import React, { useEffect, useState } from "react"; -import { Provider } from "react-redux"; -import { store } from "../../redux/store"; -import { Box } from "@chakra-ui/react"; -import { useRouter } from "next/router"; -import { - endOfMonth, - getDate - // getMonth, - // getYear, - // isAfter, - // isBefore, - // isSameMonth -} from "date-fns"; -// import findValidDateRange from "../../lib/findValidDateRange"; -import ErrorPage from "next/error"; -import Calender from "../../components/calender"; - -const DateRoute: React.FC = () => { - const router = useRouter(); - const { date: slug } = router.query; - - const [date, setDate] = useState(null); - - const [error, setError] = useState(false); - - // const dateRange = useRef(findValidDateRange()); - // const validDateRange = Object.assign({}, dateRange.current); - - const validateDateInput = ( - dateArr: number[] - ): UpdateCalenderPropsDateLayout => { - if (!(dateArr.length >= 2) && !(dateArr.length <= 3)) { - return { - year: 0, - month: 0, - day: 0 - }; - } - - const date = { - year: 0, - month: 0, - day: 0 - }; - - if (/^(19|20)\d{2}$/.test(`${dateArr[0]}`)) { - date.year = dateArr[0]; - } - - if (dateArr[1] > 0 && dateArr[1] <= 12) { - date.month = dateArr[1]; - } - - if (date.month && date.year) { - const lastDay = getDate( - endOfMonth(new Date(date.year, date.month - 1, 1)) - ); - if (dateArr[2] && dateArr[2] > 0 && dateArr[2] <= lastDay) { - date.day = dateArr[2]; - } else if (!dateArr[2]) { - date.day = 1; - } - } - - return date; - }; - - /** - * ! This function does not work as is. It is causing infinite loops whe used within the useEffect. - */ - // const validateDateRange = ( - // slugDate: Date - // ): [Date, "after" | "before" | "valid"] => { - // const { start: validStart, end: validEnd } = validDateRange; - - // // Check if the slug date is beyond the valid end date. - // if (isAfter(slugDate, validEnd)) { - // // router.push("/calender/now"); - // console.warn( - // "Slug date is after the valid date range for this calendar!!!" - // ); - // return [validEnd, "after"]; - // // Check if the slug is before the valid start date. - // } else if (isBefore(slugDate, validStart)) { - // console.warn( - // "Slug date is before the valid date range for this calendar!!!" - // ); - // return [validStart, "before"]; - // // router.push(`/${getYear(validStart)}/${getMonth(validStart) + 1}`); - // } else { - // console.info( - // "Slug date is within the valid date range for this calendar." - // ); - // return [slugDate, "valid"]; - // } - // }; - - useEffect(() => { - // Checking if the slug exists and is an array. - if (slug && Array.isArray(slug)) { - console.log(slug); - // Grabbing the slug length - const length = slug.length; - - // Parsing the slug to convert it from strings to numbers. - const parsedSlug = slug.map((e) => { - return parseInt(e); - }); - - // Checking if the slug has 2 to 3 numbers within the array. year/month/day. - if (length >= 2 && 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); - // 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 - // ); - - // const validDateWithinRange = validateDateRange(validDate)[0]; - - // setDate({ - // ...{ - // year: getYear(validDateWithinRange), - // month: getMonth(validDateWithinRange) + 1, - // day: getDate(validDateWithinRange) - // } - // }); - - setDate({ - ...newDate - }); - } - } else if (length === 1) { - // Checking if the slug is not "now". - // ! Update this to include a check for "today". - if (slug[0] !== "now") { - setError(true); - return console.warn("improper date input:", slug); - } - } - } - }, [slug]); - - /** - * ? Pushing into the router within the use effect does not create the infinite loop. - * ? The way the validate date range or the way it is being used within a useEffect is what is creating the infinite loop. - */ - - // 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) { - return ; - } - - /** - * TODO: Update to disallow navigation in the future and too far in the past. - * Update so that a date given in the future take the user to /now to today's date. - * Update so that a date given beyond the last valid date will bring the user to the - * last month that has stickers within it (When filter is enabled) or to the creation date of the chart.. - */ - - return error ? ( - - ) : ( - - - - - - ); -}; - -export default DateRoute; diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx deleted file mode 100644 index ad0dc52..0000000 --- a/src/pages/calendar/index.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import React, { useEffect } from "react"; -import { useRouter } from "next/router"; -import { Box, Heading } from "@chakra-ui/react"; - -const DateIndex = () => { - const router = useRouter(); - - useEffect(() => { - if (router) { - router.push("calendar/now"); - } - }, [router]); - - return ( - - - Loading - - - ); -}; - -export default DateIndex; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 4c5825e..9b2d53b 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,130 +1,15 @@ -import React, { Fragment, useEffect, useRef } from "react"; +import React from "react"; import { Provider } from "react-redux"; import { store } from "../redux/store"; -import { useAppDispatch, useAppSelector } from "../redux/hooks"; -import { updateLoading } from "../features/calender"; -import { - clearTutorialCompleted, - getAndSetTutorial, - StorageState -} from "../features/tutorial"; import { Box } from "@chakra-ui/react"; -import { format, isAfter, isBefore, startOfDay } from "date-fns"; -import Calender from "../components/calender"; -import Tutorial from "../components/tutorial"; -import LoadingOverlay from "../components/loading/LoadingOverlay"; -import versionStringToNumber from "../../lib/versionStringToNumber"; + const IndexPage = (): JSX.Element => { - const currDateStr: string = useAppSelector( - (state) => state.calender.currDate - ); - const isLoading: boolean = useAppSelector( - (state) => state.calender.isLoading - ); - - const currDateObj: Date = new Date(currDateStr); - - // * Tutorial * // - const completedTutorial: boolean = useAppSelector( - (state) => state.tutorial.completedTutorial - ); - const tutorialCompletionInfo: StorageState = useAppSelector( - (state) => state.tutorial.storageState - ); - const dispatch = useAppDispatch(); - - // Get the completed tutorial cookie or have it set to false. - useEffect(() => { - if (completedTutorial === null && tutorialCompletionInfo === null) { - dispatch(getAndSetTutorial()); - } - - if (completedTutorial !== null) { - dispatch(updateLoading(false)); - } - }, [completedTutorial, dispatch, tutorialCompletionInfo]); - - // Checking the exp date of completed tutorial cookie and if the version completed is out of date. - useEffect(() => { - if (tutorialCompletionInfo !== null) { - const { exp, version } = tutorialCompletionInfo; - const currDateObj: Date = new Date(currDateStr); - - /** - * Checks if the completed tutorial cookie is expired. - * @param {Date} expDate the date when the completed tutorital cookie expires. - * @returns {boolean} true if the cookie is expired, false is otherwise. - */ - const expDateValidator = (expDate: Date): boolean => { - let flag = false; - - const startOfToday = startOfDay(currDateObj); - - if (isAfter(startOfToday, expDate)) { - flag = true; - } - - return flag; - }; - - /** - * Checks if the last time the completed tutorial is before an update to the tutorial. - * @param {number} lastVersionCompleted the version number the tutorial was last completed. - * @returns {boolean} true if the version given is before the changes to the tutorial, false otherwise. - */ - const versionValidator = (lastVersionCompleted: number): boolean => { - const lastVersionWithChangeStr: string = - process.env.NEXT_PUBLIC_NEW_TUTORIAL_VERSION; - const lastVersionWithChange: number = versionStringToNumber( - lastVersionWithChangeStr - ); - - const lastUpdatedDateStr: string = - process.env.NEXT_PUBLIC_LAST_UPDATE_DATE; - const lastUpdatedDate: Date = new Date(lastUpdatedDateStr); - - let flag = false; - - if ( - lastVersionCompleted < lastVersionWithChange || - (lastVersionCompleted === lastVersionWithChange && - isBefore(currDateObj, lastUpdatedDate)) - ) { - flag = true; - console.error("Completed cookie version is out of date."); - } - - return flag; - }; - - if (expDateValidator(new Date(exp)) || versionValidator(version)) { - console.warn("Version outdated or cookie expired."); - dispatch(clearTutorialCompleted()); - } - } - }, [currDateStr, dispatch, tutorialCompletionInfo]); - - // Current date - const currDate = useRef({ - year: parseInt(format(currDateObj, "y")), - month: parseInt(format(currDateObj, "M")), - day: parseInt(format(currDateObj, "d")) - }); return ( - {isLoading === true ? ( - - - - - ) : completedTutorial ? ( - - ) : ( - - )} + ); diff --git a/src/theme/AppTheme.ts b/src/theme/AppTheme.ts index 2d2321f..140f5b8 100644 --- a/src/theme/AppTheme.ts +++ b/src/theme/AppTheme.ts @@ -29,8 +29,7 @@ const AppTheme = extendTheme({ footer: "#0097a7", footerText: "black", content: "#2d3748", - kofi: "#FF5E5B", - twitter: "#1da1f2" + kofi: "#FF5E5B" }, loading: { overlayBg: "#171923cb", diff --git a/src/theme/layout/Header.tsx b/src/theme/layout/Header.tsx index a204165..2cb4bbb 100644 --- a/src/theme/layout/Header.tsx +++ b/src/theme/layout/Header.tsx @@ -14,7 +14,7 @@ import MobileNav from "./MobileNav"; import appLogo from "../../../public/images/logo.svg"; const Header = (): JSX.Element => { - const appName = "LCM Potty Chart"; + const appName = "Lucid Creations Media"; const appVersion = process.env.NEXT_PUBLIC_APP_VERSION_HEADER || ""; // Add transparency while not at the top of the page.