From 26d996c695cd9658aa009db9d43c4f7b833c714f Mon Sep 17 00:00:00 2001 From: Puyodead1 Date: Mon, 20 Mar 2023 17:56:00 -0400 Subject: [PATCH] aaaa --- package.json | 14 +++++---- pnpm-lock.yaml | 70 +++++++++++++++++++++++--------------------- public/index.html | 2 +- public/manifest.json | 4 +-- src/App.tsx | 20 ++++--------- src/index.tsx | 4 +++ 6 files changed, 57 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index 954e162..eaa287d 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,8 @@ "dependencies": { "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", + "@fontsource/roboto": "^4.5.8", + "@mattjennings/react-modal-stack": "^1.0.4", "@mui/material": "^5.11.13", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", @@ -13,12 +15,13 @@ "@types/node": "^16.18.16", "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", - "formik": "^2.2.9", "mobx": "^6.8.0", "react": "^18.2.0", "react-advanced-cropper": "^0.18.0", "react-colorful": "^5.6.1", "react-dom": "^18.2.0", + "react-hook-form": "^7.43.7", + "react-icons": "^4.8.0", "react-loading-skeleton": "^3.2.0", "react-responsive": "^9.0.2", "react-scripts": "5.0.1", @@ -26,13 +29,12 @@ "slate": "^0.91.4", "slate-react": "^0.92.0", "styled-components": "^5.3.9", - "typescript": "^4.9.5", - "web-vitals": "^2.1.4" + "typescript": "^4.9.5" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", - "test": "react-scripts test", + "start": "craco start", + "build": "craco build", + "test": "craco test", "eject": "react-scripts eject" }, "eslintConfig": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b23022..1bf3fc0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,8 @@ specifiers: '@craco/craco': ^7.1.0 '@emotion/react': ^11.10.6 '@emotion/styled': ^11.10.6 + '@fontsource/roboto': ^4.5.8 + '@mattjennings/react-modal-stack': ^1.0.4 '@mui/material': ^5.11.13 '@testing-library/jest-dom': ^5.16.5 '@testing-library/react': ^13.4.0 @@ -13,12 +15,13 @@ specifiers: '@types/react': ^18.0.28 '@types/react-dom': ^18.0.11 craco-esbuild: ^0.5.2 - formik: ^2.2.9 mobx: ^6.8.0 react: ^18.2.0 react-advanced-cropper: ^0.18.0 react-colorful: ^5.6.1 react-dom: ^18.2.0 + react-hook-form: ^7.43.7 + react-icons: ^4.8.0 react-loading-skeleton: ^3.2.0 react-responsive: ^9.0.2 react-scripts: 5.0.1 @@ -27,11 +30,12 @@ specifiers: slate-react: ^0.92.0 styled-components: ^5.3.9 typescript: ^4.9.5 - web-vitals: ^2.1.4 dependencies: '@emotion/react': 11.10.6_pmekkgnqduwlme35zpnqhenc34 '@emotion/styled': 11.10.6_oouaibmszuch5k64ms7uxp2aia + '@fontsource/roboto': 4.5.8 + '@mattjennings/react-modal-stack': 1.0.4_react@18.2.0 '@mui/material': 5.11.13_xqeqsl5kvjjtyxwyi3jhw3yuli '@testing-library/jest-dom': 5.16.5 '@testing-library/react': 13.4.0_biqbaboplfbrettd7655fr4n2y @@ -40,12 +44,13 @@ dependencies: '@types/node': 16.18.16 '@types/react': 18.0.28 '@types/react-dom': 18.0.11 - formik: 2.2.9_react@18.2.0 mobx: 6.8.0 react: 18.2.0 react-advanced-cropper: 0.18.0_react@18.2.0 react-colorful: 5.6.1_biqbaboplfbrettd7655fr4n2y react-dom: 18.2.0_react@18.2.0 + react-hook-form: 7.43.7_react@18.2.0 + react-icons: 4.8.0_react@18.2.0 react-loading-skeleton: 3.2.0_react@18.2.0 react-responsive: 9.0.2_react@18.2.0 react-scripts: 5.0.1_j5ip3o3v6sktjzl5cxtjyfbuo4 @@ -54,7 +59,6 @@ dependencies: slate-react: 0.92.0_6tgy34rvmll7duwkm4ydcekf3u styled-components: 5.3.9_biqbaboplfbrettd7655fr4n2y typescript: 4.9.5 - web-vitals: 2.1.4 devDependencies: '@craco/craco': 7.1.0_t5qpnnrvp3p35ejzfaqjqkexiq @@ -1883,6 +1887,10 @@ packages: resolution: {integrity: sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@fontsource/roboto/4.5.8: + resolution: {integrity: sha512-CnD7zLItIzt86q4Sj3kZUiLcBk1dSk81qcqgMGaZe7SQ1P8hFNxhMl5AZthK1zrDM5m74VVhaOpuMGIL4gagaA==} + dev: false + /@humanwhocodes/config-array/0.11.8: resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==} engines: {node: '>=10.10.0'} @@ -2217,6 +2225,15 @@ packages: /@leichtgewicht/ip-codec/2.0.4: resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} + /@mattjennings/react-modal-stack/1.0.4_react@18.2.0: + resolution: {integrity: sha512-9QAanK1kHBxQMgW0wEozBC95CV65NIeNEX/G2fCeNWvOD1V4g9F0XsySFd325snvte+NIb5M0+QRwKjY9BxB0g==} + engines: {node: '>=10'} + peerDependencies: + react: '>=16' + dependencies: + react: 18.2.0 + dev: false + /@mui/base/5.0.0-alpha.121_zula6vjvt3wdocc4mwcxqa6nzi: resolution: {integrity: sha512-8nJRY76UqlJV+q/Yzo0tgGfPWEOa+4N9rjO81fMmcJqP0I6m54hLDXsjvMg4tvelY5eKHXUK6Tb7en+GHfTqZA==} engines: {node: '>=12.0.0'} @@ -4586,11 +4603,6 @@ packages: /deep-is/0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} - /deepmerge/2.2.1: - resolution: {integrity: sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==} - engines: {node: '>=0.10.0'} - dev: false - /deepmerge/4.3.1: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} @@ -5685,21 +5697,6 @@ packages: combined-stream: 1.0.8 mime-types: 2.1.35 - /formik/2.2.9_react@18.2.0: - resolution: {integrity: sha512-LQLcISMmf1r5at4/gyJigGn0gOwFbeEAlji+N9InZF6LIMXnFNkO42sCI8Jt84YZggpD4cPWObAZaxpEFtSzNA==} - peerDependencies: - react: '>=16.8.0' - dependencies: - deepmerge: 2.2.1 - hoist-non-react-statics: 3.3.2 - lodash: 4.17.21 - lodash-es: 4.17.21 - react: 18.2.0 - react-fast-compare: 2.0.4 - tiny-warning: 1.0.3 - tslib: 1.14.1 - dev: false - /forwarded/0.2.0: resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} engines: {node: '>= 0.6'} @@ -7342,10 +7339,6 @@ packages: dependencies: p-locate: 5.0.0 - /lodash-es/4.17.21: - resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} - dev: false - /lodash.debounce/4.0.8: resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} @@ -8887,8 +8880,21 @@ packages: /react-error-overlay/6.0.11: resolution: {integrity: sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==} - /react-fast-compare/2.0.4: - resolution: {integrity: sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==} + /react-hook-form/7.43.7_react@18.2.0: + resolution: {integrity: sha512-38yehQkQQ5uufaPKFScs7jhLE8n3+LG9H/BZfFAiBL2+7piDmw/BrdNJV4irzMaPnWZGhmGLHVICHXNVGIuXZg==} + engines: {node: '>=12.22.0'} + peerDependencies: + react: ^16.8.0 || ^17 || ^18 + dependencies: + react: 18.2.0 + dev: false + + /react-icons/4.8.0_react@18.2.0: + resolution: {integrity: sha512-N6+kOLcihDiAnj5Czu637waJqSnwlMNROzVZMhfX68V/9bu9qHaMIJC4UdozWoOk57gahFCNHwVvWzm0MTzRjg==} + peerDependencies: + react: '*' + dependencies: + react: 18.2.0 dev: false /react-is/16.13.1: @@ -10455,10 +10461,6 @@ packages: dependencies: minimalistic-assert: 1.0.1 - /web-vitals/2.1.4: - resolution: {integrity: sha512-sVWcwhU5mX6crfI5Vd2dC4qchyTqxV8URinzt25XqVh+bHEPGH4C3NPrNionCP7Obx59wrYEbNlw4Z8sjALzZg==} - dev: false - /webidl-conversions/4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} diff --git a/public/index.html b/public/index.html index aa069f2..e9af5a5 100644 --- a/public/index.html +++ b/public/index.html @@ -24,7 +24,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - React App + Fosscord diff --git a/public/manifest.json b/public/manifest.json index 080d6c7..931df70 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "React App", - "name": "Create React App Sample", + "short_name": "Fosscord", + "name": "Fosscord", "icons": [ { "src": "favicon.ico", diff --git a/src/App.tsx b/src/App.tsx index 7caf9b2..b30e2a0 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,21 +1,13 @@ +import Typography from "@mui/material/Typography"; import "./App.css"; function App() { return ( -
-
-

- Edit src/App.tsx and save to reload. -

- - Learn React - -
+
+ + Fosscord Client + + ;
); } diff --git a/src/index.tsx b/src/index.tsx index 5229634..27e4993 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,3 +1,7 @@ +import "@fontsource/roboto/300.css"; +import "@fontsource/roboto/400.css"; +import "@fontsource/roboto/500.css"; +import "@fontsource/roboto/700.css"; import React from "react"; import ReactDOM from "react-dom/client"; import App from "./App";