Stable #85

Merged
LucidKobold merged 32 commits from stable into stable 2022-12-14 16:13:23 -05:00
16 changed files with 1034 additions and 940 deletions
Showing only changes of commit 90b79907f3 - Show all commits

View File

@@ -24,7 +24,7 @@
"date-fns": "^2.29.3",
"formik": "^2.2.9",
"framer-motion": "^7.6.7",
"next": "12.3.1",
"next": "13.0.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "^8.0.5",
@@ -42,7 +42,7 @@
"eslint-plugin-react": "^7.31.10",
"eslint-plugin-react-hooks": "^4.6.0",
"prettier": "^2.7.1",
"typescript": "^4.8.4"
"typescript": "^4.9.3"
},
"resolutions": {
"@types/react": "^17.0.38"

View File

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

View File

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

View File

@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
import { useAppDispatch, useAppSelector } from "../../app/hooks";
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";

View File

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

View File

@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
import { useAppDispatch, useAppSelector } from "../../app/hooks";
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";

View File

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

View File

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

View File

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

View File

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

View File

@@ -84,8 +84,8 @@ const Header = (): JSX.Element => {
open
? "brand.main"
: transparentNavbar
? "rgba(49, 56, 220, 0.9)"
: "brand.main"
? "rgba(49, 56, 220, 0.9)"
: "brand.main"
}
transition=".5s ease"
borderRadius="0px 0px 10px 10px"

165
yarn.lock
View File

@@ -1530,10 +1530,10 @@ __metadata:
languageName: node
linkType: hard
"@next/env@npm:12.3.1":
version: 12.3.1
resolution: "@next/env@npm:12.3.1"
checksum: ea7f2ad9080bdec91dd9e7d84db063793717fb1e6c668ff99cdd9103b9a7f2dd0afd153f04882944d24124965f2f78cdf24dc71da3dcd5afad3a078816abc528
"@next/env@npm:13.0.4":
version: 13.0.4
resolution: "@next/env@npm:13.0.4"
checksum: f088009b462bbe0b2224ecb7591054cb2adc33fa04b458e0a811cb7bc8f34145c33d15f8d91bd792e3001b83a1539d60489e2917d6a3bf788263253695d7f26e
languageName: node
linkType: hard
@@ -1546,93 +1546,93 @@ __metadata:
languageName: node
linkType: hard
"@next/swc-android-arm-eabi@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-android-arm-eabi@npm:12.3.1"
"@next/swc-android-arm-eabi@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-android-arm-eabi@npm:13.0.4"
conditions: os=android & cpu=arm
languageName: node
linkType: hard
"@next/swc-android-arm64@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-android-arm64@npm:12.3.1"
"@next/swc-android-arm64@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-android-arm64@npm:13.0.4"
conditions: os=android & cpu=arm64
languageName: node
linkType: hard
"@next/swc-darwin-arm64@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-darwin-arm64@npm:12.3.1"
"@next/swc-darwin-arm64@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-darwin-arm64@npm:13.0.4"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
"@next/swc-darwin-x64@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-darwin-x64@npm:12.3.1"
"@next/swc-darwin-x64@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-darwin-x64@npm:13.0.4"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
"@next/swc-freebsd-x64@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-freebsd-x64@npm:12.3.1"
"@next/swc-freebsd-x64@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-freebsd-x64@npm:13.0.4"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard
"@next/swc-linux-arm-gnueabihf@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-linux-arm-gnueabihf@npm:12.3.1"
"@next/swc-linux-arm-gnueabihf@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-linux-arm-gnueabihf@npm:13.0.4"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard
"@next/swc-linux-arm64-gnu@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-linux-arm64-gnu@npm:12.3.1"
"@next/swc-linux-arm64-gnu@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-linux-arm64-gnu@npm:13.0.4"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard
"@next/swc-linux-arm64-musl@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-linux-arm64-musl@npm:12.3.1"
"@next/swc-linux-arm64-musl@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-linux-arm64-musl@npm:13.0.4"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
"@next/swc-linux-x64-gnu@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-linux-x64-gnu@npm:12.3.1"
"@next/swc-linux-x64-gnu@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-linux-x64-gnu@npm:13.0.4"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
"@next/swc-linux-x64-musl@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-linux-x64-musl@npm:12.3.1"
"@next/swc-linux-x64-musl@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-linux-x64-musl@npm:13.0.4"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
"@next/swc-win32-arm64-msvc@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-win32-arm64-msvc@npm:12.3.1"
"@next/swc-win32-arm64-msvc@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-win32-arm64-msvc@npm:13.0.4"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard
"@next/swc-win32-ia32-msvc@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-win32-ia32-msvc@npm:12.3.1"
"@next/swc-win32-ia32-msvc@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-win32-ia32-msvc@npm:13.0.4"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard
"@next/swc-win32-x64-msvc@npm:12.3.1":
version: 12.3.1
resolution: "@next/swc-win32-x64-msvc@npm:12.3.1"
"@next/swc-win32-x64-msvc@npm:13.0.4":
version: 13.0.4
resolution: "@next/swc-win32-x64-msvc@npm:13.0.4"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
@@ -2383,6 +2383,13 @@ __metadata:
languageName: node
linkType: hard
"client-only@npm:0.0.1":
version: 0.0.1
resolution: "client-only@npm:0.0.1"
checksum: 0c16bf660dadb90610553c1d8946a7fdfb81d624adea073b8440b7d795d5b5b08beb3c950c6a2cf16279365a3265158a236876d92bce16423c485c322d7dfaf8
languageName: node
linkType: hard
"color-convert@npm:^1.9.0":
version: 1.9.3
resolution: "color-convert@npm:1.9.3"
@@ -4055,13 +4062,13 @@ __metadata:
eslint-plugin-react-hooks: ^4.6.0
formik: ^2.2.9
framer-motion: ^7.6.7
next: 12.3.1
next: 13.0.4
prettier: ^2.7.1
react: ^18.2.0
react-dom: ^18.2.0
react-redux: ^8.0.5
sharp: ^0.31.2
typescript: ^4.8.4
typescript: ^4.9.3
languageName: unknown
linkType: soft
@@ -4275,34 +4282,34 @@ __metadata:
languageName: node
linkType: hard
"next@npm:12.3.1":
version: 12.3.1
resolution: "next@npm:12.3.1"
"next@npm:13.0.4":
version: 13.0.4
resolution: "next@npm:13.0.4"
dependencies:
"@next/env": 12.3.1
"@next/swc-android-arm-eabi": 12.3.1
"@next/swc-android-arm64": 12.3.1
"@next/swc-darwin-arm64": 12.3.1
"@next/swc-darwin-x64": 12.3.1
"@next/swc-freebsd-x64": 12.3.1
"@next/swc-linux-arm-gnueabihf": 12.3.1
"@next/swc-linux-arm64-gnu": 12.3.1
"@next/swc-linux-arm64-musl": 12.3.1
"@next/swc-linux-x64-gnu": 12.3.1
"@next/swc-linux-x64-musl": 12.3.1
"@next/swc-win32-arm64-msvc": 12.3.1
"@next/swc-win32-ia32-msvc": 12.3.1
"@next/swc-win32-x64-msvc": 12.3.1
"@next/env": 13.0.4
"@next/swc-android-arm-eabi": 13.0.4
"@next/swc-android-arm64": 13.0.4
"@next/swc-darwin-arm64": 13.0.4
"@next/swc-darwin-x64": 13.0.4
"@next/swc-freebsd-x64": 13.0.4
"@next/swc-linux-arm-gnueabihf": 13.0.4
"@next/swc-linux-arm64-gnu": 13.0.4
"@next/swc-linux-arm64-musl": 13.0.4
"@next/swc-linux-x64-gnu": 13.0.4
"@next/swc-linux-x64-musl": 13.0.4
"@next/swc-win32-arm64-msvc": 13.0.4
"@next/swc-win32-ia32-msvc": 13.0.4
"@next/swc-win32-x64-msvc": 13.0.4
"@swc/helpers": 0.4.11
caniuse-lite: ^1.0.30001406
postcss: 8.4.14
styled-jsx: 5.0.7
styled-jsx: 5.1.0
use-sync-external-store: 1.2.0
peerDependencies:
fibers: ">= 3.1.0"
node-sass: ^6.0.0 || ^7.0.0
react: ^17.0.2 || ^18.0.0-0
react-dom: ^17.0.2 || ^18.0.0-0
react: ^18.2.0
react-dom: ^18.2.0
sass: ^1.3.0
dependenciesMeta:
"@next/swc-android-arm-eabi":
@@ -4340,7 +4347,7 @@ __metadata:
optional: true
bin:
next: dist/bin/next
checksum: ac78592379999650f596a945019b14827818879e792ab37876bc71443bd697510d9ea00881787918f1543e6c6c5588111aeecb10342c2166a344e10ccd6bbc3e
checksum: 178694d4c531ea01910ab0c873f24fd30b843f84f49f34217f792a0210da40b7e1943adc5e3c309629db4904db02fd41d27bc5ea59f9622bafd7ade0e52b8786
languageName: node
linkType: hard
@@ -5348,9 +5355,11 @@ __metadata:
languageName: node
linkType: hard
"styled-jsx@npm:5.0.7":
version: 5.0.7
resolution: "styled-jsx@npm:5.0.7"
"styled-jsx@npm:5.1.0":
version: 5.1.0
resolution: "styled-jsx@npm:5.1.0"
dependencies:
client-only: 0.0.1
peerDependencies:
react: ">= 16.8.0 || 17.x.x || ^18.0.0-0"
peerDependenciesMeta:
@@ -5358,7 +5367,7 @@ __metadata:
optional: true
babel-plugin-macros:
optional: true
checksum: 61959993915f4b1662a682dbbefb3512de9399cf6901969bcadd26ba5441d2b5ca5c1021b233bbd573da2541b41efb45d56c6f618dbc8d88a381ebc62461fefe
checksum: e5b70476fd9059147dfe35dd912e537e422a7f900cc88f80456c97da495c655598875d64de2199641d627770a7e55ed08be0fd82646bc386791fdb1d0e5af2b1
languageName: node
linkType: hard
@@ -5539,23 +5548,23 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:^4.8.4":
version: 4.8.4
resolution: "typescript@npm:4.8.4"
"typescript@npm:^4.9.3":
version: 4.9.3
resolution: "typescript@npm:4.9.3"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 3e4f061658e0c8f36c820802fa809e0fd812b85687a9a2f5430bc3d0368e37d1c9605c3ce9b39df9a05af2ece67b1d844f9f6ea8ff42819f13bcb80f85629af0
checksum: 17b8f816050b412403e38d48eef0e893deb6be522d6dc7caf105e54a72e34daf6835c447735fd2b28b66784e72bfbf87f627abb4818a8e43d1fa8106396128dc
languageName: node
linkType: hard
"typescript@patch:typescript@^4.8.4#~builtin<compat/typescript>":
version: 4.8.4
resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=f456af"
"typescript@patch:typescript@^4.9.3#~builtin<compat/typescript>":
version: 4.9.3
resolution: "typescript@patch:typescript@npm%3A4.9.3#~builtin<compat/typescript>::version=4.9.3&hash=f456af"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 563a0ef47abae6df27a9a3ab38f75fc681f633ccf1a3502b1108e252e187787893de689220f4544aaf95a371a4eb3141e4a337deb9895de5ac3c1ca76430e5f0
checksum: ef65c22622d864497d0a0c5db693523329b3284c15fe632e93ad9aa059e8dc38ef3bd767d6f26b1e5ecf9446f49bd0f6c4e5714a2eeaf352805dc002479843d1
languageName: node
linkType: hard