Stable #85

Merged
LucidKobold merged 32 commits from stable into stable 2022-12-14 16:13:23 -05:00
16 changed files with 1398 additions and 1018 deletions
Showing only changes of commit 517a050c92 - Show all commits

View File

@@ -16,33 +16,33 @@
"pretty": "prettier --write ." "pretty": "prettier --write ."
}, },
"dependencies": { "dependencies": {
"@chakra-ui/react": "^2.3.6", "@chakra-ui/react": "^2.4.1",
"@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.0",
"@reduxjs/toolkit": "^1.8.6", "@reduxjs/toolkit": "^1.9.0",
"date-fns": "^2.29.3", "date-fns": "^2.29.3",
"formik": "^2.2.9", "formik": "^2.2.9",
"framer-motion": "^7.6.1", "framer-motion": "^7.6.7",
"next": "12.3.1", "next": "13.0.4",
"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.1" "sharp": "^0.31.2"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^18.11.3", "@types/node": "^18.11.9",
"@types/react": "^18.0.21", "@types/react": "^18.0.25",
"@types/react-redux": "^7.1.24", "@types/react-redux": "^7.1.24",
"@typescript-eslint/eslint-plugin": "^5.40.1", "@typescript-eslint/eslint-plugin": "^5.43.0",
"eslint": "^8.26.0", "eslint": "^8.27.0",
"eslint-config-next": "^12.3.1", "eslint-config-next": "^13.0.4",
"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.10", "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.7.1",
"typescript": "^4.8.4" "typescript": "^4.9.3"
}, },
"resolutions": { "resolutions": {
"@types/react": "^17.0.38" "@types/react": "^17.0.38"

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>

2297
yarn.lock

File diff suppressed because it is too large Load Diff