Stable #85

Merged
LucidKobold merged 32 commits from stable into stable 2022-12-14 16:13:23 -05:00
19 changed files with 1475 additions and 1121 deletions

View File

@@ -42,7 +42,7 @@ jobs:
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v1 uses: github/codeql-action/init@v2
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file. # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below) # If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild - name: Autobuild
uses: github/codeql-action/autobuild@v1 uses: github/codeql-action/autobuild@v2
# Command-line programs to run using the OS shell. # Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
# make release # make release
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1 uses: github/codeql-action/analyze@v2

View File

@@ -30,6 +30,6 @@ jobs:
with: with:
args: ". --sarif --output results.sarif || true" args: ". --sarif --output results.sarif || true"
- name: Upload njsscan report - name: Upload njsscan report
uses: github/codeql-action/upload-sarif@v1 uses: github/codeql-action/upload-sarif@v2
with: with:
sarif_file: results.sarif sarif_file: results.sarif

View File

@@ -2,7 +2,7 @@
"private": true, "private": true,
"name": "lucid-creations-media-potty-chart", "name": "lucid-creations-media-potty-chart",
"homepage": "https://lucidcreations.media/introducing-code-name-potty-chart/", "homepage": "https://lucidcreations.media/introducing-code-name-potty-chart/",
"version": "0.1.6", "version": "0.1.10",
"author": { "author": {
"name": "Lucid Creations Media", "name": "Lucid Creations Media",
"url": "https://lucidcreations.media", "url": "https://lucidcreations.media",
@@ -16,33 +16,33 @@
"pretty": "prettier --write ." "pretty": "prettier --write ."
}, },
"dependencies": { "dependencies": {
"@chakra-ui/react": "^2.3.4", "@chakra-ui/react": "^2.4.3",
"@emotion/react": "^11.10.4", "@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.4", "@emotion/styled": "^11.10.5",
"@iconify/react": "^4.0.0", "@iconify/react": "^4.0.1",
"@reduxjs/toolkit": "^1.8.5", "@reduxjs/toolkit": "^1.9.1",
"date-fns": "^2.29.3", "date-fns": "^2.29.3",
"formik": "^2.2.9", "formik": "^2.2.9",
"framer-motion": "^7.3.6", "framer-motion": "^7.9.1",
"next": "12.3.1", "next": "13.0.6",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-redux": "^8.0.4", "react-redux": "^8.0.5",
"sharp": "^0.31.0" "sharp": "^0.31.2"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^18.7.19", "@types/node": "^18.11.15",
"@types/react": "^18.0.21", "@types/react": "^18.0.26",
"@types/react-redux": "^7.1.24", "@types/react-redux": "^7.1.24",
"@typescript-eslint/eslint-plugin": "^5.38.0", "@typescript-eslint/eslint-plugin": "^5.46.1",
"eslint": "^8.23.1", "eslint": "^8.29.0",
"eslint-config-next": "^12.3.1", "eslint-config-next": "^13.0.6",
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.5.0",
"eslint-plugin-jsx-a11y": "^6.6.1", "eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-react": "^7.31.8", "eslint-plugin-react": "^7.31.11",
"eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-hooks": "^4.6.0",
"prettier": "^2.7.1", "prettier": "^2.8.1",
"typescript": "^4.8.3" "typescript": "^4.9.4"
}, },
"resolutions": { "resolutions": {
"@types/react": "^17.0.38" "@types/react": "^17.0.38"

View File

@@ -1,27 +0,0 @@
import React from "react";
import { Box, Link, Button, BoxProps } from "@chakra-ui/react";
import { Icon } from "@iconify/react";
import { motion } from "framer-motion";
const MotionBox = motion<BoxProps>(Box);
const Twitter = (): JSX.Element => {
return (
<MotionBox whileHover={{ scale: 1.1 }} whileTap={{ scale: 0.9 }}>
<Link
href="https://twitter.com/LCMDevelopment"
target="_blank"
rel="noopener"
>
<Button
variant="twitter"
leftIcon={<Icon icon="akar-icons:twitter-fill" />}
>
{"Dev Updates"}
</Button>
</Link>
</MotionBox>
);
};
export default Twitter;

View File

@@ -1,7 +1,7 @@
export interface LinkObj { export interface LinkObj {
href?: string; href?: string;
name?: string; name?: string;
type: "primary" | "secondary" | "twitter" | "ko-fi"; type: "primary" | "secondary" | "updates" | "ko-fi";
} }
type Links = LinkObj[]; type Links = LinkObj[];
@@ -21,7 +21,9 @@ const links: Links = [
type: "ko-fi" type: "ko-fi"
}, },
{ {
type: "twitter" href: "https://t.me/LucidCreationsMedia",
name: "Dev Updates",
type: "secondary"
} }
]; ];

View File

@@ -3,7 +3,6 @@ import { Box, HStack, VStack } from "@chakra-ui/react";
import CustomButton from "./Custom"; import CustomButton from "./Custom";
import links, { LinkObj } from "./data/links"; import links, { LinkObj } from "./data/links";
import KoFi from "./KoFi"; import KoFi from "./KoFi";
import Twitter from "./Twitter";
const Buttons = (): JSX.Element => { const Buttons = (): JSX.Element => {
return ( return (
@@ -33,10 +32,6 @@ const Buttons = (): JSX.Element => {
if (type === "ko-fi") { if (type === "ko-fi") {
return <KoFi key={type} />; return <KoFi key={type} />;
} }
if (type === "twitter") {
return <Twitter key={type} />;
}
})} })}
</HStack> </HStack>
<VStack <VStack
@@ -64,10 +59,6 @@ const Buttons = (): JSX.Element => {
if (type === "ko-fi") { if (type === "ko-fi") {
return <KoFi key={type} />; return <KoFi key={type} />;
} }
if (type === "twitter") {
return <Twitter key={type} />;
}
})} })}
</VStack> </VStack>
</Box> </Box>

View File

@@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { useAppSelector } from "../../app/hooks"; import { useAppSelector } from "../../redux/hooks";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { HStack, IconButton } from "@chakra-ui/react"; import { HStack, IconButton } from "@chakra-ui/react";
import { Icon } from "@iconify/react"; import { Icon } from "@iconify/react";

View File

@@ -1,6 +1,6 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
import { store } from "../../app/store"; import { store } from "../../redux/store";
import { Box, Skeleton, VStack } from "@chakra-ui/react"; import { Box, Skeleton, VStack } from "@chakra-ui/react";
import { import {
add, add,

View File

@@ -1,5 +1,5 @@
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import { useAppDispatch, useAppSelector } from "../../app/hooks"; import { useAppDispatch, useAppSelector } from "../../redux/hooks";
import { updateCurrDate, updateMonth } from "../../features/calender"; import { updateCurrDate, updateMonth } from "../../features/calender";
import { Box, HStack, SimpleGrid, Text, VStack } from "@chakra-ui/react"; import { Box, HStack, SimpleGrid, Text, VStack } from "@chakra-ui/react";
import { isSameDay, format } from "date-fns"; import { isSameDay, format } from "date-fns";

View File

@@ -1,5 +1,5 @@
import React, { useState, useRef } from "react"; import React, { useState, useRef } from "react";
import { useAppDispatch } from "../../../app/hooks"; import { useAppDispatch } from "../../../redux/hooks";
import { addEditSticker } from "../../../features/calender/stickers"; import { addEditSticker } from "../../../features/calender/stickers";
import { import {
Button, Button,

View File

@@ -1,5 +1,5 @@
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import { useAppDispatch, useAppSelector } from "../../app/hooks"; import { useAppDispatch, useAppSelector } from "../../redux/hooks";
import { updateMonth } from "../../features/calender"; import { updateMonth } from "../../features/calender";
import { Box, HStack, SimpleGrid, Text, VStack } from "@chakra-ui/react"; import { Box, HStack, SimpleGrid, Text, VStack } from "@chakra-ui/react";
import { format, isSameDay, isToday } from "date-fns"; import { format, isSameDay, isToday } from "date-fns";

View File

@@ -1,6 +1,6 @@
import { HStack, Button, VStack, Checkbox } from "@chakra-ui/react"; import { HStack, Button, VStack, Checkbox } from "@chakra-ui/react";
import React from "react"; import React from "react";
import { useAppDispatch, useAppSelector } from "../../../app/hooks"; import { useAppDispatch, useAppSelector } from "../../../redux/hooks";
import { import {
setTutorialCompleted, setTutorialCompleted,
setTempTutorialComplete, setTempTutorialComplete,

View File

@@ -3,7 +3,7 @@ import React from "react";
import { ChakraProvider } from "@chakra-ui/react"; import { ChakraProvider } from "@chakra-ui/react";
import AppTheme from "../theme/AppTheme"; import AppTheme from "../theme/AppTheme";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
import { store } from "../app/store"; import { store } from "../redux/store";
import Layout from "../theme/layout/Layout"; import Layout from "../theme/layout/Layout";
import Head from "next/head"; import Head from "next/head";

View File

@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
import { store } from "../../app/store"; import { store } from "../../redux/store";
import { Box } from "@chakra-ui/react"; import { Box } from "@chakra-ui/react";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { import {

View File

@@ -1,7 +1,7 @@
import React, { Fragment, useEffect, useRef } from "react"; import React, { Fragment, useEffect, useRef } from "react";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
import { store } from "../app/store"; import { store } from "../redux/store";
import { useAppDispatch, useAppSelector } from "../app/hooks"; import { useAppDispatch, useAppSelector } from "../redux/hooks";
import { updateLoading } from "../features/calender"; import { updateLoading } from "../features/calender";
import { import {
clearTutorialCompleted, clearTutorialCompleted,

View File

@@ -115,7 +115,7 @@ const Header = (): JSX.Element => {
cursor: "default" cursor: "default"
}} }}
> >
<Image height="30px" width="30px" src={appLogo} alt="App Logo" /> <Image height="30" width="30" src={appLogo} alt="App Logo" />
<Heading as="h1" size="md"> <Heading as="h1" size="md">
{appName} {appName}
@@ -150,7 +150,7 @@ const Header = (): JSX.Element => {
cursor: "default" cursor: "default"
}} }}
> >
<Image height="30px" width="30px" src={appLogo} alt="App Logo" /> <Image height="30" width="30" src={appLogo} alt="App Logo" />
<Heading as="h1" size="md"> <Heading as="h1" size="md">
{appName} {appName}
</Heading> </Heading>

2486
yarn.lock

File diff suppressed because it is too large Load Diff