diff --git a/client/package.json b/client/package.json index 60e1602e3..c35bd0bee 100644 --- a/client/package.json +++ b/client/package.json @@ -3,7 +3,6 @@ "version": "0.1.0", "private": true, "dependencies": { - "@chakra-ui/icons": "^1.0.7", "@chakra-ui/react": "^1.4.1", "@emotion/react": "^11", "@emotion/styled": "^11", diff --git a/client/public/index.html b/client/public/index.html index aa069f27c..a4cf08ece 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -25,6 +25,12 @@ Learn how to configure a non-root public URL by running `npm run build`. --> React App + diff --git a/client/src/App.css b/client/src/App.css index d49c3757f..edce8e121 100644 --- a/client/src/App.css +++ b/client/src/App.css @@ -6,6 +6,5 @@ .App { margin: 0px auto; overflow: hidden; - background-color: rgba(0, 0, 0, 0); height: 100vh; } \ No newline at end of file diff --git a/client/src/index.js b/client/src/index.js index 0ba311676..a7628fbec 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -5,14 +5,21 @@ import App from './App'; import reportWebVitals from './reportWebVitals'; import { BrowserRouter } from 'react-router-dom'; -// 1. import `ChakraProvider` component -import { ChakraProvider, CSSReset } from '@chakra-ui/react'; +// 1. import Chakra components +import { ChakraProvider, extendTheme } from '@chakra-ui/react'; + + +// 2. Extend the theme to include custom colors, fonts, etc +const colors = { + // not yet +}; + +const theme = extendTheme({ colors }); ReactDOM.render( - + - diff --git a/client/yarn.lock b/client/yarn.lock index a1082b01d..1c3030787 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -1308,13 +1308,6 @@ compute-scroll-into-view "1.0.14" copy-to-clipboard "3.3.1" -"@chakra-ui/icon@1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@chakra-ui/icon/-/icon-1.1.3.tgz#5fbc310652fa20da973ea9422ed5e1a654596d23" - integrity sha512-XZ9RTU0J/qB5bZawUK5yk6YN3P2fi74aTLap1qygmodAPo5sIroRzfuXndezjAYFhuRjI62zfSs/FVhwJyhmsw== - dependencies: - "@chakra-ui/utils" "1.4.0" - "@chakra-ui/icon@1.1.5": version "1.1.5" resolved "https://registry.yarnpkg.com/@chakra-ui/icon/-/icon-1.1.5.tgz#f37abe47fd176a4c291d2037df2d6ed480622c09" @@ -1322,14 +1315,6 @@ dependencies: "@chakra-ui/utils" "1.5.1" -"@chakra-ui/icons@^1.0.7": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@chakra-ui/icons/-/icons-1.0.7.tgz#4a2a846468c57436fc61fb991a1126acfcbaede8" - integrity sha512-Fqc8jECA8e02RJ7zjgWUu/b1ue2QevxrIptkzgzE3gZTrndquBm9ikB2In/zRKR07FkUd653amd9OOEyU2COJQ== - dependencies: - "@chakra-ui/icon" "1.1.3" - "@types/react" "^17.0.0" - "@chakra-ui/image@1.0.11": version "1.0.11" resolved "https://registry.yarnpkg.com/@chakra-ui/image/-/image-1.0.11.tgz#de1ee15e81253ca0d71fc99a06a61d3bf749e8d5" @@ -1678,16 +1663,6 @@ "@chakra-ui/hooks" "1.3.1" "@chakra-ui/utils" "1.5.1" -"@chakra-ui/utils@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-1.4.0.tgz#4b20c522141d68dc62b5c7be929bb6d1596db190" - integrity sha512-ND7NIilpncnkzcNBnAySGBFpOXb3urO1X9esSY0+M5zXiq+VSSfK9JuoJd3ilvV4Dbwgzil7hMAELBuHme4uTg== - dependencies: - "@types/lodash.mergewith" "4.6.6" - "@types/object-assign" "4.0.30" - css-box-model "1.2.1" - lodash.mergewith "4.6.2" - "@chakra-ui/utils@1.5.1", "@chakra-ui/utils@^1.5.1": version "1.5.1" resolved "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-1.5.1.tgz#a01fd14f6d948a13c2644cfa844f410299135ffc" @@ -2497,11 +2472,6 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== -"@types/object-assign@4.0.30": - version "4.0.30" - resolved "https://registry.yarnpkg.com/@types/object-assign/-/object-assign-4.0.30.tgz#8949371d5a99f4381ee0f1df0a9b7a187e07e652" - integrity sha1-iUk3HVqZ9Dge4PHfCpt6GH4H5lI= - "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" @@ -2512,25 +2482,11 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0" integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA== -"@types/prop-types@*": - version "15.7.3" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" - integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== - "@types/q@^1.5.1": version "1.5.4" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== -"@types/react@^17.0.0": - version "17.0.3" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79" - integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - "@types/resolve@0.0.8": version "0.0.8" resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194" @@ -2538,11 +2494,6 @@ dependencies: "@types/node" "*" -"@types/scheduler@*": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275" - integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA== - "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"