Merge pull request #68 from LucidKobold/stable

Stable

.yarnrc.yml

@@ -4,4 +4,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.2.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.2.cjs

package.json

@@ -16,36 +16,36 @@
     "pretty": "prettier --write ."
   },
   "dependencies": {
-    "@chakra-ui/react": "^2.2.1",
+    "@chakra-ui/react": "^2.2.6",
-    "@emotion/react": "^11.9.3",
+    "@emotion/react": "^11.10.0",
-    "@emotion/styled": "^11.9.3",
+    "@emotion/styled": "^11.10.0",
     "@iconify/react": "^3.2.2",
-    "@reduxjs/toolkit": "^1.8.2",
+    "@reduxjs/toolkit": "^1.8.4",
-    "date-fns": "^2.28.0",
+    "date-fns": "^2.29.1",
     "formik": "^2.2.9",
-    "framer-motion": "^6.3.15",
+    "framer-motion": "^7.1.0",
-    "next": "12.1.6",
+    "next": "12.2.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-redux": "^8.0.2",
     "sharp": "^0.30.7"
   },
   "devDependencies": {
-    "@types/node": "^18.0.0",
+    "@types/node": "^18.7.2",
-    "@types/react": "^18.0.14",
+    "@types/react": "^18.0.17",
     "@types/react-redux": "^7.1.24",
-    "@typescript-eslint/eslint-plugin": "^5.29.0",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
-    "eslint": "^8.18.0",
+    "eslint": "^8.21.0",
-    "eslint-config-next": "^12.1.6",
+    "eslint-config-next": "^12.2.5",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-jsx-a11y": "^6.6.0",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-react": "^7.30.1",
-    "eslint-plugin-react-hooks": "<4.6.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "^2.7.1",
     "typescript": "^4.7.4"
   },
   "resolutions": {
     "@types/react": "^17.0.38"
   },
-  "packageManager": "yarn@3.2.1"
+  "packageManager": "yarn@3.2.2"
 }

src/theme/components/buttonStyles.ts

@@ -1,10 +1,5 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import {
+import { darken, mode, whiten } from "@chakra-ui/theme-tools";
-  darken,
-  mode,
-  StyleFunctionProps,
-  whiten
-} from "@chakra-ui/theme-tools";
 import { Dict } from "@chakra-ui/utils";
 
 const buttonStyles = {
@@ -14,7 +9,7 @@ const buttonStyles = {
   sizes: {},
   // styles for different visual variants ("outline", "solid")
   variants: {
-    primary: (props: Dict<never> | StyleFunctionProps) => ({
+    primary: (props: Dict<never>) => ({
       bg: "brand.primary",
       fontSize: "xl",
       py: 3,
@@ -27,7 +22,7 @@ const buttonStyles = {
         )(props)
       }
     }),
-    secondary: (props: Dict<never> | StyleFunctionProps) => ({
+    secondary: (props: Dict<never>) => ({
       bg: "brand.secondary",
       fontSize: "xl",
       py: 3,
@@ -40,7 +35,7 @@ const buttonStyles = {
         )(props)
       }
     }),
-    skip: (props: Dict<never> | StyleFunctionProps) => ({
+    skip: (props: Dict<never>) => ({
       bg: "transparent",
       fontSize: "xl",
       py: 3,
@@ -51,7 +46,7 @@ const buttonStyles = {
         color: "whiteAlpha.900"
       }
     }),
-    stickerButton: (props: Dict<never> | StyleFunctionProps) => ({
+    stickerButton: (props: Dict<never>) => ({
       bg: "transparent",
       fontSize: "4rem",
       px: 2,
@@ -63,7 +58,7 @@ const buttonStyles = {
         )(props)
       }
     }),
-    nav: (props: Dict<never> | StyleFunctionProps) => ({
+    nav: (props: Dict<never>) => ({
       bg: "transparent",
       fontSize: "md",
       px: 2,
@@ -82,7 +77,7 @@ const buttonStyles = {
         textDecoration: "underline"
       }
     }),
-    footer: (props: Dict<never> | StyleFunctionProps) => ({
+    footer: (props: Dict<never>) => ({
       bg: "brand.main",
       fontSize: "lg",
       py: 3,
@@ -92,7 +87,7 @@ const buttonStyles = {
         bg: mode(whiten("brand.main", 20), darken("brand.main", 20))(props)
       }
     }),
-    backToTop: (props: Dict<never> | StyleFunctionProps) => ({
+    backToTop: (props: Dict<never>) => ({
       bg: "rgba(23, 25, 35, 0.5)",
       fontSize: "lg",
       py: 2,
@@ -112,7 +107,7 @@ const buttonStyles = {
         border: "1px solid rgba(0, 134, 255, 1)"
       }
     }),
-    submit: (props: Dict<never> | StyleFunctionProps) => ({
+    submit: (props: Dict<never>) => ({
       fontSize: "lg",
       py: 2,
       px: 4,
@@ -131,7 +126,7 @@ const buttonStyles = {
         }
       }
     }),
-    mobileNav: (props: Dict<never> | StyleFunctionProps) => ({
+    mobileNav: (props: Dict<never>) => ({
       // bg: "transparent",
       fontSize: "md",
       px: 2,
@@ -152,7 +147,7 @@ const buttonStyles = {
         border: "1px solid #0068ff"
       }
     }),
-    patreon: (props: Dict<never> | StyleFunctionProps) => ({
+    patreon: (props: Dict<never>) => ({
       bg: "brand.patreon",
       fontSize: "lg",
       p: 3,
@@ -164,7 +159,7 @@ const buttonStyles = {
         )(props)
       }
     }),
-    twitter: (props: Dict<never> | StyleFunctionProps) => ({
+    twitter: (props: Dict<never>) => ({
       bg: "brand.twitter",
       fontSize: "lg",
       py: 3,

src/theme/layout/Footer.tsx

@@ -1,48 +1,9 @@
 import React /*, { useEffect, useRef, useState }*/ from "react";
-import {
+import { Box, Text, VStack, Link } from "@chakra-ui/react";
-  Box,
-  Text,
-  VStack,
-  Link,
-  // Image,
-  Button,
-  BoxProps
-} from "@chakra-ui/react";
 // import BackToTopButton from "./BackToTopButton";
-import { motion } from "framer-motion";
-import Patreon from "../../components/buttons/Patreon";
-import CustomButton from "../../components/buttons/Custom";
-import Twitter from "../../components/buttons/Twitter";
 import Buttons from "../../components/buttons";
 
-const MotionBox = motion<BoxProps>(Box);
-
 const Footer = (): JSX.Element => {
-  // const [showBackToTop, setShowBackToTop] = useState<boolean>(false);
-  // const lastScroll = useRef<number>(0);
-
-  // const handleScroll = (): void => {
-  //   if (window.scrollY >= 500) {
-  //     setShowBackToTop(true);
-  //   } else {
-  //     setShowBackToTop(false);
-  //   }
-
-  //   const currentScroll =
-  //     window.pageYOffset || document.documentElement.scrollTop;
-
-  //   lastScroll.current = currentScroll <= 0 ? 0 : currentScroll;
-  // };
-
-  // useEffect(() => {
-  //   if (!window) {
-  //     console.log("waiting for mount");
-  //   } else if (window) {
-  //     window.addEventListener("scroll", handleScroll);
-  //   }
-
-  //   return () => window.removeEventListener("scroll", handleScroll);
-  // }, []);
   return (
     <Box bg="brand.footer" as="footer" w="100%" h="auto">
       {/* <BackToTopButton show={showBackToTop} /> */}
@@ -55,21 +16,6 @@ const Footer = (): JSX.Element => {
         justifyContent="center"
       >
         <VStack spacing={4}>
-          {/* <MotionBox whileHover={{ scale: 1.1 }} whileTap={{ scale: 0.9 }}>
-            <Link
-              href="https://github.com/LucidCreationsMedia"
-              target="_blank"
-              rel="noopener"
-            >
-              <Button
-                color="whiteAlpha"
-                variant="credits"
-                leftIcon={<Icon icon="akar-icons:github-fill" />}
-              >
-                View Codebase
-              </Button>
-            </Link>
-          </MotionBox> */}
           <Buttons />
           <Text color="brand.footerText" fontSize="xs">
             &copy;