From 17d90ce958c5417cf17dee95f6bbe5b145df494d Mon Sep 17 00:00:00 2001 From: Lucid Kobold Date: Fri, 22 Apr 2022 20:39:56 -0500 Subject: [PATCH 1/3] Upgraded types node, eslint plugin TS, eslint, framer-motion, sharp. --- package.json | 10 ++-- yarn.lock | 155 +++++++++++++++++++++++++++------------------------ 2 files changed, 88 insertions(+), 77 deletions(-) diff --git a/package.json b/package.json index b13c9ee..7a37304 100644 --- a/package.json +++ b/package.json @@ -23,16 +23,16 @@ "@types/react": "<=17.0.2", "date-fns": "^2.28.0", "formik": "^2.2.9", - "framer-motion": "^6.3.0", + "framer-motion": "^6.3.1", "next": "12.1.5", "react": "<=17.0.2", "react-dom": "<=17.0.2", - "sharp": "^0.30.3" + "sharp": "^0.30.4" }, "devDependencies": { - "@types/node": "^17.0.24", - "@typescript-eslint/eslint-plugin": "^5.19.0", - "eslint": "^8.13.0", + "@types/node": "^17.0.25", + "@typescript-eslint/eslint-plugin": "^5.20.0", + "eslint": "^8.14.0", "eslint-config-next": "^12.1.5", "eslint-config-prettier": "^8.5.0", "eslint-plugin-jsx-a11y": "^6.5.1", diff --git a/yarn.lock b/yarn.lock index ec471a8..33b7c82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1106,9 +1106,9 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^1.2.1": - version: 1.2.1 - resolution: "@eslint/eslintrc@npm:1.2.1" +"@eslint/eslintrc@npm:^1.2.2": + version: 1.2.2 + resolution: "@eslint/eslintrc@npm:1.2.2" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -1119,7 +1119,7 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.0.4 strip-json-comments: ^3.1.1 - checksum: 1f797b9f94d71b965992cf6c44e3bcb574643014fd1e3d4862d25056bd5568f59c488461a7e9a1c1758ca7f0def5d3cb69c3d8b38581bcf4a53af74371243797 + checksum: d891036bbffb0efec1462aa4a603ed6e349d546b1632dde7d474ddd15c2a8b6895671b25293f1d3ba10ff629c24a3649ad049373fe695a0e44b612537088563c languageName: node linkType: hard @@ -1395,10 +1395,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^17.0.24": - version: 17.0.24 - resolution: "@types/node@npm:17.0.24" - checksum: 9e7c4f863601b2430b4c2429a89935f22eba692956f5013c90a4c7fb0e1401ed8add8c4307453c5d6b8b985384500f8c3f644427ab88632640cc396159af479a +"@types/node@npm:^17.0.25": + version: 17.0.25 + resolution: "@types/node@npm:17.0.25" + checksum: 6a820bd624e69ea772f52a6cdb326484eff5829443dc981939373929ade109f58c21698b9f0a831bd6ceea799e722a75dc49c5fa7a6bc32a81e1cbdfc6507b64 languageName: node linkType: hard @@ -1433,13 +1433,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.19.0": - version: 5.19.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.19.0" +"@typescript-eslint/eslint-plugin@npm:^5.20.0": + version: 5.20.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.20.0" dependencies: - "@typescript-eslint/scope-manager": 5.19.0 - "@typescript-eslint/type-utils": 5.19.0 - "@typescript-eslint/utils": 5.19.0 + "@typescript-eslint/scope-manager": 5.20.0 + "@typescript-eslint/type-utils": 5.20.0 + "@typescript-eslint/utils": 5.20.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -1452,7 +1452,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 7fa73fc8f988c6876cb51e2581e4d965e2958ad522222d364d295797a5f3460440d3188a197c584a274bf1c55d7fe01ac84cc4f63c074eaecce6908cc30d1f51 + checksum: 276251535b38dc5e9165c86d7f9b0a6d601cef82f02dc2a94b4133ad08d8825cb3e27bfd3b686b21b0627e05fa25c5e456c89cc3a66583b109637d1cf2d6c06a languageName: node linkType: hard @@ -1483,21 +1483,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.19.0": - version: 5.19.0 - resolution: "@typescript-eslint/scope-manager@npm:5.19.0" +"@typescript-eslint/scope-manager@npm:5.20.0": + version: 5.20.0 + resolution: "@typescript-eslint/scope-manager@npm:5.20.0" dependencies: - "@typescript-eslint/types": 5.19.0 - "@typescript-eslint/visitor-keys": 5.19.0 - checksum: 3aced2be7e4a8b98b6b0fe4c6b5a78ac7e16af67cdcaa6f6ad5596ba8a131600aae6a0dad4e8dccb57afd9765800fb49f4e0d5ec9670bdb7df006abe0a14ab9c + "@typescript-eslint/types": 5.20.0 + "@typescript-eslint/visitor-keys": 5.20.0 + checksum: 904fd43f559dc2579958496ffad837eca124940b4a172666f0ea54ed606074d9ec7d2bec0f2141c3f9a8b894dd2644817cb86809e79a7a73ecba2b7babcdb5c9 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.19.0": - version: 5.19.0 - resolution: "@typescript-eslint/type-utils@npm:5.19.0" +"@typescript-eslint/type-utils@npm:5.20.0": + version: 5.20.0 + resolution: "@typescript-eslint/type-utils@npm:5.20.0" dependencies: - "@typescript-eslint/utils": 5.19.0 + "@typescript-eslint/utils": 5.20.0 debug: ^4.3.2 tsutils: ^3.21.0 peerDependencies: @@ -1505,7 +1505,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 9ac20813139de0dc917cd9bc169b3592202faef3ad714c9cff6d07422761b3e138e212827ad3de75aed674df3acc69ecc015923c9496d084aac6855f55ef0f30 + checksum: c9c436122b715d144edae9d36ebd34e9b02b282ada829382770e15170c58f4f27cfde2d5847ea3c4a1b70ca42e2460a204e920eea50b3d05e9d342e8836d4d12 languageName: node linkType: hard @@ -1516,10 +1516,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.19.0": - version: 5.19.0 - resolution: "@typescript-eslint/types@npm:5.19.0" - checksum: 383091f0063c789c07e8e8361f8a2b5c4619fc3672e9b1ac88c83ec3abd9ddeaea7c8adcc62aacfa8139ebff4c87c5871fb8f743a54208cc239c5a0c3bfbc280 +"@typescript-eslint/types@npm:5.20.0": + version: 5.20.0 + resolution: "@typescript-eslint/types@npm:5.20.0" + checksum: d7f6e51e23f59feee8857340828c47a98a0dd5eaa1b045e936dc11199b55754cf78ae5cd8d56c1fafb1b5a40a6f472c1ac921072951217caffe3f06a717fa61c languageName: node linkType: hard @@ -1541,12 +1541,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.19.0": - version: 5.19.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.19.0" +"@typescript-eslint/typescript-estree@npm:5.20.0": + version: 5.20.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.20.0" dependencies: - "@typescript-eslint/types": 5.19.0 - "@typescript-eslint/visitor-keys": 5.19.0 + "@typescript-eslint/types": 5.20.0 + "@typescript-eslint/visitor-keys": 5.20.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -1555,23 +1555,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 57567065a27f6945005e59d0b092c9d4e9537a06c225a8ffdc22f5504e4e4e61a47895ae60301d2c497b67add82ca3bab8fab816df131ab0d2106370e13ba49b + checksum: 2b709292b7df3675d1f8eaf2f4e1ecf491f70fc525012c6a0fb5164aa893c165317b0a419022b8b00aaed502864d5b5b84092b58a9950d2633248e8d7627abd8 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.19.0": - version: 5.19.0 - resolution: "@typescript-eslint/utils@npm:5.19.0" +"@typescript-eslint/utils@npm:5.20.0": + version: 5.20.0 + resolution: "@typescript-eslint/utils@npm:5.20.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.19.0 - "@typescript-eslint/types": 5.19.0 - "@typescript-eslint/typescript-estree": 5.19.0 + "@typescript-eslint/scope-manager": 5.20.0 + "@typescript-eslint/types": 5.20.0 + "@typescript-eslint/typescript-estree": 5.20.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 2778e38574a70695e2d499f2451e4eceb56c1cdb41b8a74b866519fd078417a96e1ddcd28ccb92edcbf4c243930cfdae684163588806160493d1099e8fd78eab + checksum: e387cf96124e34d079804220c5cb9134148fb3efc68d852a344453e285e3016e0b7e37b11308ef58c0e7afc638f145002cebc27c5da0fd03e0c074ff97d8210e languageName: node linkType: hard @@ -1585,13 +1585,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.19.0": - version: 5.19.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.19.0" +"@typescript-eslint/visitor-keys@npm:5.20.0": + version: 5.20.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.20.0" dependencies: - "@typescript-eslint/types": 5.19.0 + "@typescript-eslint/types": 5.20.0 eslint-visitor-keys: ^3.0.0 - checksum: ea878349c716980e8c83fde0b60399c5e59931f74eed14d3db0f630a3ed4d092a069a5cdd3bd652bde5e19d733babd18a70ddbb5e4f6ab5b2110ad5cce857bf7 + checksum: 1e1aa5f14fd60f1846ee26947d571953898dc82eb635a7eab3984c6b7db9bb8897743416713a129cc95c8cd63325cc0c64b3935d264f73100911fc5da76fc65f languageName: node linkType: hard @@ -2032,13 +2032,13 @@ __metadata: languageName: node linkType: hard -"color@npm:^4.2.1": - version: 4.2.1 - resolution: "color@npm:4.2.1" +"color@npm:^4.2.3": + version: 4.2.3 + resolution: "color@npm:4.2.3" dependencies: color-convert: ^2.0.1 color-string: ^1.9.0 - checksum: 03fb3100a8ba457b45f3f9828f64e982d683f48c841e3d26a619bd88924fcc47f1124b2fdf3e4ae518c4129e9885c19052244ba1ea0b06d86beffc5f5e551d62 + checksum: 0579629c02c631b426780038da929cca8e8d80a40158b09811a0112a107c62e10e4aad719843b791b1e658ab4e800558f2e87ca4522c8b32349d497ecb6adeb4 languageName: node linkType: hard @@ -2630,11 +2630,11 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.13.0": - version: 8.13.0 - resolution: "eslint@npm:8.13.0" +"eslint@npm:^8.14.0": + version: 8.14.0 + resolution: "eslint@npm:8.14.0" dependencies: - "@eslint/eslintrc": ^1.2.1 + "@eslint/eslintrc": ^1.2.2 "@humanwhocodes/config-array": ^0.9.2 ajv: ^6.10.0 chalk: ^4.0.0 @@ -2671,7 +2671,7 @@ __metadata: v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: bc7d2fc9a046d42cb2c8987573ecaf534c1fae14747c4695e32388e179c5f21b83eefdb3e4f35924bf76152e226d7cc9dfb21f12348baf12c803109005b17439 + checksum: 87d2e3e5eb93216d4ab36006e7b8c0bfad02f40b0a0f193f1d42754512cd3a9d8244152f1c69df5db2e135b3c4f1c10d0ed2f0881fe8a8c01af55465968174c1 languageName: node linkType: hard @@ -2852,9 +2852,9 @@ __metadata: languageName: node linkType: hard -"framer-motion@npm:^6.3.0": - version: 6.3.0 - resolution: "framer-motion@npm:6.3.0" +"framer-motion@npm:^6.3.1": + version: 6.3.1 + resolution: "framer-motion@npm:6.3.1" dependencies: "@emotion/is-prop-valid": ^0.8.2 framesync: 6.0.1 @@ -2868,7 +2868,7 @@ __metadata: dependenciesMeta: "@emotion/is-prop-valid": optional: true - checksum: 1ccf3b5c8479b10e0b978c9e100f2f5397ff67b1185f05fb4a98f28e5627b0c7bc2fc5cc24f758c372be0ff3da5a581562dd086dadc558f109ba8adbaf1cd803 + checksum: 23971369855d0d6504ad126ff33e393dc153edf470f7150e6b74667ef0104089daf28105d9841a8f0aea35e459bffabbda6b682b7722e014eef5a54214ee1680 languageName: node linkType: hard @@ -3635,23 +3635,23 @@ __metadata: "@emotion/react": ^11.9.0 "@emotion/styled": ^11.8.1 "@iconify/react": ^3.2.1 - "@types/node": ^17.0.24 + "@types/node": ^17.0.25 "@types/react": <=17.0.2 - "@typescript-eslint/eslint-plugin": ^5.19.0 + "@typescript-eslint/eslint-plugin": ^5.20.0 date-fns: ^2.28.0 - eslint: ^8.13.0 + eslint: ^8.14.0 eslint-config-next: ^12.1.5 eslint-config-prettier: ^8.5.0 eslint-plugin-jsx-a11y: ^6.5.1 eslint-plugin-react: ^7.29.4 eslint-plugin-react-hooks: <=4.3.0 formik: ^2.2.9 - framer-motion: ^6.3.0 + framer-motion: ^6.3.1 next: 12.1.5 prettier: ^2.6.2 react: <=17.0.2 react-dom: <=17.0.2 - sharp: ^0.30.3 + sharp: ^0.30.4 typescript: <4.6.0 languageName: unknown linkType: soft @@ -4690,6 +4690,17 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.3.7": + version: 7.3.7 + resolution: "semver@npm:7.3.7" + dependencies: + lru-cache: ^6.0.0 + bin: + semver: bin/semver.js + checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232 + languageName: node + linkType: hard + "set-blocking@npm:^2.0.0, set-blocking@npm:~2.0.0": version: 2.0.0 resolution: "set-blocking@npm:2.0.0" @@ -4697,20 +4708,20 @@ __metadata: languageName: node linkType: hard -"sharp@npm:^0.30.3": - version: 0.30.3 - resolution: "sharp@npm:0.30.3" +"sharp@npm:^0.30.4": + version: 0.30.4 + resolution: "sharp@npm:0.30.4" dependencies: - color: ^4.2.1 + color: ^4.2.3 detect-libc: ^2.0.1 node-addon-api: ^4.3.0 node-gyp: latest prebuild-install: ^7.0.1 - semver: ^7.3.5 + semver: ^7.3.7 simple-get: ^4.0.1 tar-fs: ^2.1.1 tunnel-agent: ^0.6.0 - checksum: 05738f0a74f55217ccbbe74ad7b8b579e2e24cbcebd021ae53cfb81d7a3e8ab42b02526249ad7d04900a4ea0da80fa63805b492edab3bfa0541888169c079057 + checksum: 80070d8cad5fe20e7bbb2a1cfddda3f7d421f6af8302c05af8307c0b3b1972e6ed2690563e90b2897b4b499b32967d28a15e37f5d196a1f8867d630609052211 languageName: node linkType: hard -- 2.49.1 From 436f79b933ae521af3125e880e9259d0fff22fca Mon Sep 17 00:00:00 2001 From: Lucid Kobold Date: Fri, 22 Apr 2022 20:58:15 -0500 Subject: [PATCH 2/3] Added files and folders into /src directory. --- {components => src/components}/calender/CalenderNav.tsx | 4 ++-- {components => src/components}/calender/DatePicker.tsx | 4 ++-- {components => src/components}/calender/Day.tsx | 2 +- {components => src/components}/calender/FormValidateEmoji.tsx | 0 {components => src/components}/calender/index.tsx | 4 ++-- .../components}/calender/modals/AddUpdateSticker.tsx | 2 +- .../components}/calender/modals/StickerSelector.tsx | 0 .../components}/calender/stickers/DemoStickers.tsx | 0 {components => src/components}/loading/LoadingOverlay.tsx | 0 {components => src/components}/loading/LoadingSpinner.tsx | 0 {pages => src/pages}/_app.tsx | 0 {pages => src/pages}/_document.tsx | 0 {pages => src/pages}/calendar/[...date].tsx | 0 {pages => src/pages}/calendar/index.tsx | 0 {pages => src/pages}/index.tsx | 4 ++-- {theme => src/theme}/AppTheme.ts | 0 {theme => src/theme}/components/buttonStyles.ts | 0 {theme => src/theme}/layout/BackToTopButton.tsx | 0 {theme => src/theme}/layout/DesktopNav.tsx | 0 {theme => src/theme}/layout/Footer.tsx | 0 {theme => src/theme}/layout/Header.tsx | 2 +- {theme => src/theme}/layout/Layout.tsx | 0 {theme => src/theme}/layout/MobileNav.tsx | 0 {theme => src/theme}/layout/navItems.ts | 0 24 files changed, 11 insertions(+), 11 deletions(-) rename {components => src/components}/calender/CalenderNav.tsx (92%) rename {components => src/components}/calender/DatePicker.tsx (98%) rename {components => src/components}/calender/Day.tsx (98%) rename {components => src/components}/calender/FormValidateEmoji.tsx (100%) rename {components => src/components}/calender/index.tsx (95%) rename {components => src/components}/calender/modals/AddUpdateSticker.tsx (99%) rename {components => src/components}/calender/modals/StickerSelector.tsx (100%) rename {components => src/components}/calender/stickers/DemoStickers.tsx (100%) rename {components => src/components}/loading/LoadingOverlay.tsx (100%) rename {components => src/components}/loading/LoadingSpinner.tsx (100%) rename {pages => src/pages}/_app.tsx (100%) rename {pages => src/pages}/_document.tsx (100%) rename {pages => src/pages}/calendar/[...date].tsx (100%) rename {pages => src/pages}/calendar/index.tsx (100%) rename {pages => src/pages}/index.tsx (82%) rename {theme => src/theme}/AppTheme.ts (100%) rename {theme => src/theme}/components/buttonStyles.ts (100%) rename {theme => src/theme}/layout/BackToTopButton.tsx (100%) rename {theme => src/theme}/layout/DesktopNav.tsx (100%) rename {theme => src/theme}/layout/Footer.tsx (100%) rename {theme => src/theme}/layout/Header.tsx (98%) rename {theme => src/theme}/layout/Layout.tsx (100%) rename {theme => src/theme}/layout/MobileNav.tsx (100%) rename {theme => src/theme}/layout/navItems.ts (100%) diff --git a/components/calender/CalenderNav.tsx b/src/components/calender/CalenderNav.tsx similarity index 92% rename from components/calender/CalenderNav.tsx rename to src/components/calender/CalenderNav.tsx index 1c45265..e6b730a 100644 --- a/components/calender/CalenderNav.tsx +++ b/src/components/calender/CalenderNav.tsx @@ -3,9 +3,9 @@ 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 findValidDateRange from "../../../lib/findValidDateRange"; import DatePicker from "./DatePicker"; -import { CalenderContext } from "../../contexts/CalenderContext"; +import { CalenderContext } from "../../../contexts/CalenderContext"; const CalenderNav = (): JSX.Element => { const { selectedDate } = useContext(CalenderContext); diff --git a/components/calender/DatePicker.tsx b/src/components/calender/DatePicker.tsx similarity index 98% rename from components/calender/DatePicker.tsx rename to src/components/calender/DatePicker.tsx index e154504..8aabc1e 100644 --- a/components/calender/DatePicker.tsx +++ b/src/components/calender/DatePicker.tsx @@ -25,9 +25,9 @@ import { FieldProps } from "formik"; import { format } from "date-fns"; -import findValidDateRange from "../../lib/findValidDateRange"; +import findValidDateRange from "../../../lib/findValidDateRange"; import FormValidateEmoji from "./FormValidateEmoji"; -import { CalenderContext } from "../../contexts/CalenderContext"; +import { CalenderContext } from "../../../contexts/CalenderContext"; const DatePicker = (): JSX.Element => { const { title } = useContext(CalenderContext); diff --git a/components/calender/Day.tsx b/src/components/calender/Day.tsx similarity index 98% rename from components/calender/Day.tsx rename to src/components/calender/Day.tsx index ac548fb..e8ee979 100644 --- a/components/calender/Day.tsx +++ b/src/components/calender/Day.tsx @@ -11,7 +11,7 @@ import { } from "date-fns"; import router from "next/router"; import React, { Fragment, useState } from "react"; -import { StickersContextProvider } from "../../contexts/StickerContext"; +import { StickersContextProvider } from "../../../contexts/StickerContext"; import AddUpdateSticker from "./modals/AddUpdateSticker"; import DemoStickers from "./stickers/DemoStickers"; diff --git a/components/calender/FormValidateEmoji.tsx b/src/components/calender/FormValidateEmoji.tsx similarity index 100% rename from components/calender/FormValidateEmoji.tsx rename to src/components/calender/FormValidateEmoji.tsx diff --git a/components/calender/index.tsx b/src/components/calender/index.tsx similarity index 95% rename from components/calender/index.tsx rename to src/components/calender/index.tsx index c25f481..e2e587b 100644 --- a/components/calender/index.tsx +++ b/src/components/calender/index.tsx @@ -1,8 +1,8 @@ import React, { useContext, useEffect } from "react"; import { Box, HStack, SimpleGrid, Text, VStack } from "@chakra-ui/react"; import { isSameDay, format } from "date-fns"; -import { CalenderContext } from "../../contexts/CalenderContext"; -import { StickersContext } from "../../contexts/StickerContext"; +import { CalenderContext } from "../../../contexts/CalenderContext"; +import { StickersContext } from "../../../contexts/StickerContext"; import CalenderNav from "./CalenderNav"; import Day from "./Day"; diff --git a/components/calender/modals/AddUpdateSticker.tsx b/src/components/calender/modals/AddUpdateSticker.tsx similarity index 99% rename from components/calender/modals/AddUpdateSticker.tsx rename to src/components/calender/modals/AddUpdateSticker.tsx index 9bda161..ad3d8d2 100644 --- a/components/calender/modals/AddUpdateSticker.tsx +++ b/src/components/calender/modals/AddUpdateSticker.tsx @@ -16,7 +16,7 @@ import { import React, { useState, useContext, useRef } from "react"; import { format, isSameDay } from "date-fns"; import { Icon } from "@iconify/react"; -import { StickersContext } from "../../../contexts/StickerContext"; +import { StickersContext } from "../../../../contexts/StickerContext"; import StickerSelector from "./StickerSelector"; import DemoStickers from "../stickers/DemoStickers"; diff --git a/components/calender/modals/StickerSelector.tsx b/src/components/calender/modals/StickerSelector.tsx similarity index 100% rename from components/calender/modals/StickerSelector.tsx rename to src/components/calender/modals/StickerSelector.tsx diff --git a/components/calender/stickers/DemoStickers.tsx b/src/components/calender/stickers/DemoStickers.tsx similarity index 100% rename from components/calender/stickers/DemoStickers.tsx rename to src/components/calender/stickers/DemoStickers.tsx diff --git a/components/loading/LoadingOverlay.tsx b/src/components/loading/LoadingOverlay.tsx similarity index 100% rename from components/loading/LoadingOverlay.tsx rename to src/components/loading/LoadingOverlay.tsx diff --git a/components/loading/LoadingSpinner.tsx b/src/components/loading/LoadingSpinner.tsx similarity index 100% rename from components/loading/LoadingSpinner.tsx rename to src/components/loading/LoadingSpinner.tsx diff --git a/pages/_app.tsx b/src/pages/_app.tsx similarity index 100% rename from pages/_app.tsx rename to src/pages/_app.tsx diff --git a/pages/_document.tsx b/src/pages/_document.tsx similarity index 100% rename from pages/_document.tsx rename to src/pages/_document.tsx diff --git a/pages/calendar/[...date].tsx b/src/pages/calendar/[...date].tsx similarity index 100% rename from pages/calendar/[...date].tsx rename to src/pages/calendar/[...date].tsx diff --git a/pages/calendar/index.tsx b/src/pages/calendar/index.tsx similarity index 100% rename from pages/calendar/index.tsx rename to src/pages/calendar/index.tsx diff --git a/pages/index.tsx b/src/pages/index.tsx similarity index 82% rename from pages/index.tsx rename to src/pages/index.tsx index 8446ffe..ce26844 100644 --- a/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,8 +1,8 @@ import React, { useRef } from "react"; import { Box } from "@chakra-ui/react"; import Calender from "../components/calender"; -import { StickersContextProvider } from "../contexts/StickerContext"; -import { CalenderContextProvider } from "../contexts/CalenderContext"; +import { StickersContextProvider } from "../../contexts/StickerContext"; +import { CalenderContextProvider } from "../../contexts/CalenderContext"; import { format } from "date-fns"; const IndexPage = (): JSX.Element => { diff --git a/theme/AppTheme.ts b/src/theme/AppTheme.ts similarity index 100% rename from theme/AppTheme.ts rename to src/theme/AppTheme.ts diff --git a/theme/components/buttonStyles.ts b/src/theme/components/buttonStyles.ts similarity index 100% rename from theme/components/buttonStyles.ts rename to src/theme/components/buttonStyles.ts diff --git a/theme/layout/BackToTopButton.tsx b/src/theme/layout/BackToTopButton.tsx similarity index 100% rename from theme/layout/BackToTopButton.tsx rename to src/theme/layout/BackToTopButton.tsx diff --git a/theme/layout/DesktopNav.tsx b/src/theme/layout/DesktopNav.tsx similarity index 100% rename from theme/layout/DesktopNav.tsx rename to src/theme/layout/DesktopNav.tsx diff --git a/theme/layout/Footer.tsx b/src/theme/layout/Footer.tsx similarity index 100% rename from theme/layout/Footer.tsx rename to src/theme/layout/Footer.tsx diff --git a/theme/layout/Header.tsx b/src/theme/layout/Header.tsx similarity index 98% rename from theme/layout/Header.tsx rename to src/theme/layout/Header.tsx index 589296a..772696a 100644 --- a/theme/layout/Header.tsx +++ b/src/theme/layout/Header.tsx @@ -11,7 +11,7 @@ import { import { Icon } from "@iconify/react"; import DesktopNav from "./DesktopNav"; import MobileNav from "./MobileNav"; -import appLogo from "../../public/images/logo.svg"; +import appLogo from "../../../public/images/logo.svg"; const Header = (): JSX.Element => { const appName = "LCM Potty Chart"; diff --git a/theme/layout/Layout.tsx b/src/theme/layout/Layout.tsx similarity index 100% rename from theme/layout/Layout.tsx rename to src/theme/layout/Layout.tsx diff --git a/theme/layout/MobileNav.tsx b/src/theme/layout/MobileNav.tsx similarity index 100% rename from theme/layout/MobileNav.tsx rename to src/theme/layout/MobileNav.tsx diff --git a/theme/layout/navItems.ts b/src/theme/layout/navItems.ts similarity index 100% rename from theme/layout/navItems.ts rename to src/theme/layout/navItems.ts -- 2.49.1 From 6670abc9cd2e4efa84c9364ddf7ddbbe1870f723 Mon Sep 17 00:00:00 2001 From: Lucid Kobold Date: Fri, 22 Apr 2022 20:59:18 -0500 Subject: [PATCH 3/3] updated version info. --- package.json | 2 +- src/pages/calendar/[...date].tsx | 4 ++-- src/theme/layout/Header.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 7a37304..91f88cb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "name": "lucid-creations-media-potty-chart", "homepage": "https://lucidcreations.media/introducing-code-name-potty-chart/", - "version": "v0.0.9.6-alpha", + "version": "v0.0.9.7-alpha", "author": { "name": "Lucid Creations Media", "url": "https://lucidcreations.media", diff --git a/src/pages/calendar/[...date].tsx b/src/pages/calendar/[...date].tsx index db7501a..a86176e 100644 --- a/src/pages/calendar/[...date].tsx +++ b/src/pages/calendar/[...date].tsx @@ -13,8 +13,8 @@ import { // import findValidDateRange from "../../lib/findValidDateRange"; import ErrorPage from "next/error"; import Calender from "../../components/calender"; -import { CalenderContextProvider } from "../../contexts/CalenderContext"; -import { StickersContextProvider } from "../../contexts/StickerContext"; +import { CalenderContextProvider } from "../../../contexts/CalenderContext"; +import { StickersContextProvider } from "../../../contexts/StickerContext"; const DateRoute: React.FC = () => { const router = useRouter(); diff --git a/src/theme/layout/Header.tsx b/src/theme/layout/Header.tsx index 772696a..9dfd3a0 100644 --- a/src/theme/layout/Header.tsx +++ b/src/theme/layout/Header.tsx @@ -15,7 +15,7 @@ import appLogo from "../../../public/images/logo.svg"; const Header = (): JSX.Element => { const appName = "LCM Potty Chart"; - const appVersion = "v0.0.9.6-alpha"; + const appVersion = "v0.0.9.7-alpha"; // Add transparency while not at the top of the page. const [transparentNavbar, setTransparentNavbar] = useState(false); -- 2.49.1