From f2f43805f0eca06f0b947522987cd90355703369 Mon Sep 17 00:00:00 2001 From: henryschoemer Date: Mon, 17 Nov 2025 00:51:42 -0500 Subject: [PATCH 1/7] initial changes to get dev local server running --- README.md | 2 +- pocs-capstone/backend/db/studybuddyemail.py | 2 +- pocs-capstone/backend/requirements.txt | 10 +- pocs-capstone/frontend/package-lock.json | 501 +++++------------- pocs-capstone/frontend/package.json | 2 - .../frontend/src/components/MainMobile.js | 4 +- pocs-capstone/frontend/yarn.lock | 238 +++------ 7 files changed, 238 insertions(+), 521 deletions(-) diff --git a/README.md b/README.md index ec2c08156..57a88afb7 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ cd /sb/frontend ```bash npm install npm run build -nmp start +npm start ``` 8. In your browser, navigate in the search bar to http://localhost:3000. diff --git a/pocs-capstone/backend/db/studybuddyemail.py b/pocs-capstone/backend/db/studybuddyemail.py index 8d3885884..3d506692f 100644 --- a/pocs-capstone/backend/db/studybuddyemail.py +++ b/pocs-capstone/backend/db/studybuddyemail.py @@ -15,7 +15,7 @@ def send_email(email_reciever): load_dotenv(find_dotenv()) - email_sender = 'studybuddyverify@gmail.com' + email_sender = 'productivitypet101@gmail.com' email_password = os.getenv('GMAIL_PASSWORD') email_reciever = email_reciever diff --git a/pocs-capstone/backend/requirements.txt b/pocs-capstone/backend/requirements.txt index d3ffa118b..a926e4ec6 100644 --- a/pocs-capstone/backend/requirements.txt +++ b/pocs-capstone/backend/requirements.txt @@ -30,8 +30,8 @@ Eel==0.14.0 et-xmlfile==1.1.0 exceptiongroup==1.0.3 future==0.18.3 -gevent==22.10.2 -gevent-websocket==0.10.1 +# gevent==22.10.2 +# gevent-websocket==0.10.1 google-api-core==2.11.0 google-api-python-client==2.73.0 google-auth==2.16.0 @@ -77,9 +77,9 @@ PyJWT==2.6.0 pylint==2.6.0 pyparsing==3.0.9 pyperclip==1.8.1 -PyQt5==5.15.7 -PyQt5-Qt5==5.15.2 -PyQt5-sip==12.11.0 +# PyQt5==5.15.7 +# PyQt5-Qt5==5.15.2 +# PyQt5-sip==12.11.0 pyrsistent==0.19.3 pytest==7.2.0 python-dateutil==2.8.2 diff --git a/pocs-capstone/frontend/package-lock.json b/pocs-capstone/frontend/package-lock.json index 81321c8eb..8a9d18060 100644 --- a/pocs-capstone/frontend/package-lock.json +++ b/pocs-capstone/frontend/package-lock.json @@ -14,8 +14,6 @@ "@fortawesome/fontawesome-svg-core": "^6.3.0", "@fortawesome/free-solid-svg-icons": "^6.3.0", "@fortawesome/react-fontawesome": "^0.2.0", - "@material-ui/core": "^4.12.4", - "@material-ui/icons": "^4.11.3", "@mui/icons-material": "^5.11.16", "@mui/material": "^5.11.10", "@react-hook/window-size": "^3.1.1", @@ -3445,189 +3443,6 @@ "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==" }, - "node_modules/@material-ui/core": { - "version": "4.12.4", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz", - "integrity": "sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==", - "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.", - "dependencies": { - "@babel/runtime": "^7.4.4", - "@material-ui/styles": "^4.11.5", - "@material-ui/system": "^4.12.2", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.3", - "@types/react-transition-group": "^4.2.0", - "clsx": "^1.0.4", - "hoist-non-react-statics": "^3.3.2", - "popper.js": "1.16.1-lts", - "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0", - "react-transition-group": "^4.4.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@material-ui/core/node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" - }, - "node_modules/@material-ui/icons": { - "version": "4.11.3", - "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz", - "integrity": "sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==", - "dependencies": { - "@babel/runtime": "^7.4.4" - }, - "engines": { - "node": ">=8.0.0" - }, - "peerDependencies": { - "@material-ui/core": "^4.0.0", - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@material-ui/styles": { - "version": "4.11.5", - "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz", - "integrity": "sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==", - "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.", - "dependencies": { - "@babel/runtime": "^7.4.4", - "@emotion/hash": "^0.8.0", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.3", - "clsx": "^1.0.4", - "csstype": "^2.5.2", - "hoist-non-react-statics": "^3.3.2", - "jss": "^10.5.1", - "jss-plugin-camel-case": "^10.5.1", - "jss-plugin-default-unit": "^10.5.1", - "jss-plugin-global": "^10.5.1", - "jss-plugin-nested": "^10.5.1", - "jss-plugin-props-sort": "^10.5.1", - "jss-plugin-rule-value-function": "^10.5.1", - "jss-plugin-vendor-prefixer": "^10.5.1", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@material-ui/styles/node_modules/@emotion/hash": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", - "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" - }, - "node_modules/@material-ui/styles/node_modules/csstype": { - "version": "2.6.21", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" - }, - "node_modules/@material-ui/system": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz", - "integrity": "sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==", - "dependencies": { - "@babel/runtime": "^7.4.4", - "@material-ui/utils": "^4.11.3", - "csstype": "^2.5.2", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@material-ui/system/node_modules/csstype": { - "version": "2.6.21", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" - }, - "node_modules/@material-ui/types": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz", - "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==", - "peerDependencies": { - "@types/react": "*" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@material-ui/utils": { - "version": "4.11.3", - "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz", - "integrity": "sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==", - "dependencies": { - "@babel/runtime": "^7.4.4", - "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - } - }, - "node_modules/@material-ui/utils/node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" - }, "node_modules/@mui/base": { "version": "5.0.0-alpha.119", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.119.tgz", @@ -4458,6 +4273,26 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" }, + "node_modules/@testing-library/dom": { + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz", + "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.3.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "picocolors": "1.1.1", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@testing-library/jest-dom": { "version": "5.16.5", "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz", @@ -5564,11 +5399,12 @@ } }, "node_modules/aria-query": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", - "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "license": "Apache-2.0", "dependencies": { - "deep-equal": "^2.0.5" + "dequal": "^2.0.3" } }, "node_modules/array-flatten": { @@ -13667,9 +13503,10 @@ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", @@ -13824,11 +13661,6 @@ "node": ">=4" } }, - "node_modules/popper.js": { - "version": "1.16.1-lts", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz", - "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==" - }, "node_modules/postcss": { "version": "8.4.21", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", @@ -17585,6 +17417,20 @@ "is-typedarray": "^1.0.0" } }, + "node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "license": "Apache-2.0", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -20173,12 +20019,14 @@ "@csstools/postcss-unset-value": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz", - "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==" + "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==", + "requires": {} }, "@csstools/selector-specificity": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz", - "integrity": "sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw==" + "integrity": "sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw==", + "requires": {} }, "@emotion/babel-plugin": { "version": "11.10.6", @@ -20281,7 +20129,8 @@ "@emotion/use-insertion-effect-with-fallbacks": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz", - "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==" + "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==", + "requires": {} }, "@emotion/utils": { "version": "1.2.0", @@ -21166,115 +21015,6 @@ "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==" }, - "@material-ui/core": { - "version": "4.12.4", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz", - "integrity": "sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==", - "requires": { - "@babel/runtime": "^7.4.4", - "@material-ui/styles": "^4.11.5", - "@material-ui/system": "^4.12.2", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.3", - "@types/react-transition-group": "^4.2.0", - "clsx": "^1.0.4", - "hoist-non-react-statics": "^3.3.2", - "popper.js": "1.16.1-lts", - "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0", - "react-transition-group": "^4.4.0" - }, - "dependencies": { - "react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" - } - } - }, - "@material-ui/icons": { - "version": "4.11.3", - "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz", - "integrity": "sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==", - "requires": { - "@babel/runtime": "^7.4.4" - } - }, - "@material-ui/styles": { - "version": "4.11.5", - "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz", - "integrity": "sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==", - "requires": { - "@babel/runtime": "^7.4.4", - "@emotion/hash": "^0.8.0", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.3", - "clsx": "^1.0.4", - "csstype": "^2.5.2", - "hoist-non-react-statics": "^3.3.2", - "jss": "^10.5.1", - "jss-plugin-camel-case": "^10.5.1", - "jss-plugin-default-unit": "^10.5.1", - "jss-plugin-global": "^10.5.1", - "jss-plugin-nested": "^10.5.1", - "jss-plugin-props-sort": "^10.5.1", - "jss-plugin-rule-value-function": "^10.5.1", - "jss-plugin-vendor-prefixer": "^10.5.1", - "prop-types": "^15.7.2" - }, - "dependencies": { - "@emotion/hash": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", - "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" - }, - "csstype": { - "version": "2.6.21", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" - } - } - }, - "@material-ui/system": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz", - "integrity": "sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==", - "requires": { - "@babel/runtime": "^7.4.4", - "@material-ui/utils": "^4.11.3", - "csstype": "^2.5.2", - "prop-types": "^15.7.2" - }, - "dependencies": { - "csstype": { - "version": "2.6.21", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" - } - } - }, - "@material-ui/types": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz", - "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==" - }, - "@material-ui/utils": { - "version": "4.11.3", - "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz", - "integrity": "sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==", - "requires": { - "@babel/runtime": "^7.4.4", - "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0" - }, - "dependencies": { - "react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" - } - } - }, "@mui/base": { "version": "5.0.0-alpha.119", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.119.tgz", @@ -21361,7 +21101,8 @@ "@mui/types": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.3.tgz", - "integrity": "sha512-tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw==" + "integrity": "sha512-tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw==", + "requires": {} }, "@mui/utils": { "version": "5.11.12", @@ -21484,12 +21225,14 @@ "@react-hook/event": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@react-hook/event/-/event-1.2.6.tgz", - "integrity": "sha512-JUL5IluaOdn5w5Afpe/puPa1rj8X6udMlQ9dt4hvMuKmTrBS1Ya6sb4sVgvfe2eU4yDuOfAhik8xhbcCekbg9Q==" + "integrity": "sha512-JUL5IluaOdn5w5Afpe/puPa1rj8X6udMlQ9dt4hvMuKmTrBS1Ya6sb4sVgvfe2eU4yDuOfAhik8xhbcCekbg9Q==", + "requires": {} }, "@react-hook/latest": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@react-hook/latest/-/latest-1.0.3.tgz", - "integrity": "sha512-dy6duzl+JnAZcDbNTfmaP3xHiKtbXYOaz3G51MGVljh548Y8MWzTr+PHLOfvpypEVW9zwvl+VyKjbWKEVbV1Rg==" + "integrity": "sha512-dy6duzl+JnAZcDbNTfmaP3xHiKtbXYOaz3G51MGVljh548Y8MWzTr+PHLOfvpypEVW9zwvl+VyKjbWKEVbV1Rg==", + "requires": {} }, "@react-hook/throttle": { "version": "2.2.0", @@ -21761,6 +21504,22 @@ } } }, + "@testing-library/dom": { + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz", + "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", + "peer": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.3.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "picocolors": "1.1.1", + "pretty-format": "^27.0.2" + } + }, "@testing-library/jest-dom": { "version": "5.16.5", "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz", @@ -22509,12 +22268,14 @@ "acorn-import-assertions": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==" + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "requires": {} }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "requires": {} }, "acorn-node": { "version": "1.8.2", @@ -22600,7 +22361,8 @@ "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "requires": {} }, "ansi-escapes": { "version": "4.3.2", @@ -22651,11 +22413,11 @@ } }, "aria-query": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", - "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "requires": { - "deep-equal": "^2.0.5" + "dequal": "^2.0.3" } }, "array-flatten": { @@ -22867,7 +22629,8 @@ "babel-plugin-named-asset-import": { "version": "0.3.8", "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz", - "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==" + "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==", + "requires": {} }, "babel-plugin-polyfill-corejs2": { "version": "0.3.3", @@ -23062,7 +22825,8 @@ "bootstrap": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==" + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "requires": {} }, "brace-expansion": { "version": "1.1.11", @@ -23543,7 +23307,8 @@ "css-declaration-sorter": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz", - "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==" + "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==", + "requires": {} }, "css-has-pseudo": { "version": "3.0.4", @@ -23636,7 +23401,8 @@ "css-prefers-color-scheme": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", - "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==" + "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", + "requires": {} }, "css-select": { "version": "4.3.0", @@ -23749,7 +23515,8 @@ "cssnano-utils": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", - "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==" + "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", + "requires": {} }, "csso": { "version": "4.2.0", @@ -24626,7 +24393,8 @@ "eslint-plugin-react-hooks": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==" + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", + "requires": {} }, "eslint-plugin-testing-library": { "version": "5.10.2", @@ -25660,7 +25428,8 @@ "icss-utils": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==" + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", + "requires": {} }, "idb": { "version": "7.1.1", @@ -26944,7 +26713,8 @@ "jest-pnp-resolver": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==" + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "requires": {} }, "jest-regex-util": { "version": "27.5.1", @@ -28770,9 +28540,9 @@ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" }, "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "picomatch": { "version": "2.3.1", @@ -28880,11 +28650,6 @@ } } }, - "popper.js": { - "version": "1.16.1-lts", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz", - "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==" - }, "postcss": { "version": "8.4.21", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", @@ -28906,7 +28671,8 @@ "postcss-browser-comments": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz", - "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==" + "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==", + "requires": {} }, "postcss-calc": { "version": "8.2.4", @@ -29004,22 +28770,26 @@ "postcss-discard-comments": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", - "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==" + "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", + "requires": {} }, "postcss-discard-duplicates": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", - "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==" + "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", + "requires": {} }, "postcss-discard-empty": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", - "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==" + "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", + "requires": {} }, "postcss-discard-overridden": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", - "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==" + "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", + "requires": {} }, "postcss-double-position-gradients": { "version": "3.1.2", @@ -29041,7 +28811,8 @@ "postcss-flexbugs-fixes": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz", - "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==" + "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==", + "requires": {} }, "postcss-focus-visible": { "version": "6.0.4", @@ -29062,12 +28833,14 @@ "postcss-font-variant": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz", - "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==" + "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==", + "requires": {} }, "postcss-gap-properties": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz", - "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==" + "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==", + "requires": {} }, "postcss-image-set-function": { "version": "4.0.7", @@ -29090,7 +28863,8 @@ "postcss-initial": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz", - "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==" + "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==", + "requires": {} }, "postcss-js": { "version": "4.0.1", @@ -29131,12 +28905,14 @@ "postcss-logical": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz", - "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==" + "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==", + "requires": {} }, "postcss-media-minmax": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz", - "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==" + "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==", + "requires": {} }, "postcss-merge-longhand": { "version": "5.1.7", @@ -29197,7 +28973,8 @@ "postcss-modules-extract-imports": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==" + "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -29255,7 +29032,8 @@ "postcss-normalize-charset": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", - "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==" + "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", + "requires": {} }, "postcss-normalize-display-values": { "version": "5.1.0", @@ -29326,7 +29104,8 @@ "postcss-opacity-percentage": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz", - "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==" + "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==", + "requires": {} }, "postcss-ordered-values": { "version": "5.1.3", @@ -29348,7 +29127,8 @@ "postcss-page-break": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz", - "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==" + "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==", + "requires": {} }, "postcss-place": { "version": "7.0.5", @@ -29442,7 +29222,8 @@ "postcss-replace-overflow-wrap": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz", - "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==" + "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==", + "requires": {} }, "postcss-selector-not": { "version": "6.0.1", @@ -29927,7 +29708,8 @@ "react-onesignal": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/react-onesignal/-/react-onesignal-2.0.4.tgz", - "integrity": "sha512-llZ4PV1+EsWWZDt0BRils6gAxaxMoYP0Z3rlNivQy4xqUaiO1/PcRaIJ6CuzCci/koDsw5IzLOXEHlV4Yn+d9Q==" + "integrity": "sha512-llZ4PV1+EsWWZDt0BRils6gAxaxMoYP0Z3rlNivQy4xqUaiO1/PcRaIJ6CuzCci/koDsw5IzLOXEHlV4Yn+d9Q==", + "requires": {} }, "react-popper": { "version": "2.3.0", @@ -30992,7 +30774,8 @@ "style-loader": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz", - "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==" + "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==", + "requires": {} }, "stylehacks": { "version": "5.1.1", @@ -31460,6 +31243,12 @@ "is-typedarray": "^1.0.0" } }, + "typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "peer": true + }, "unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -31852,7 +31641,8 @@ "ws": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz", - "integrity": "sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==" + "integrity": "sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==", + "requires": {} } } }, @@ -32286,7 +32076,8 @@ "ws": { "version": "7.5.9", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==" + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "requires": {} }, "xml-name-validator": { "version": "3.0.0", diff --git a/pocs-capstone/frontend/package.json b/pocs-capstone/frontend/package.json index c6269c82f..14f5b726e 100644 --- a/pocs-capstone/frontend/package.json +++ b/pocs-capstone/frontend/package.json @@ -9,8 +9,6 @@ "@fortawesome/fontawesome-svg-core": "^6.3.0", "@fortawesome/free-solid-svg-icons": "^6.3.0", "@fortawesome/react-fontawesome": "^0.2.0", - "@material-ui/core": "^4.12.4", - "@material-ui/icons": "^4.11.3", "@mui/icons-material": "^5.11.16", "@mui/material": "^5.11.10", "@react-hook/window-size": "^3.1.1", diff --git a/pocs-capstone/frontend/src/components/MainMobile.js b/pocs-capstone/frontend/src/components/MainMobile.js index 0f2b0f7bc..15a07ed6f 100644 --- a/pocs-capstone/frontend/src/components/MainMobile.js +++ b/pocs-capstone/frontend/src/components/MainMobile.js @@ -11,10 +11,10 @@ import AccountProfilePageMobile from "./AccountProfileTabMobile/AccountProfilePa import canvas_bug_mobile from "../images/canvas_bug_mobile.png"; import useAxiosPrivate from "../hooks/useAxiosPrivate"; import UserContext from "../context/UserContext"; -import { Tabs, Tab } from '@material-ui/core'; +import { Tabs, Tab } from '@mui/material'; import InventoryIcon from '@mui/icons-material/Inventory'; import AccountCircleIcon from '@mui/icons-material/AccountCircle'; -import {List, CalendarToday, } from '@material-ui/icons'; +import {List, CalendarToday, } from '@mui/icons-material'; import { useNavigate } from "react-router-dom"; import { Modal, ModalBody } from "react-bootstrap"; diff --git a/pocs-capstone/frontend/yarn.lock b/pocs-capstone/frontend/yarn.lock index 1593c31be..394feca06 100644 --- a/pocs-capstone/frontend/yarn.lock +++ b/pocs-capstone/frontend/yarn.lock @@ -36,7 +36,7 @@ resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz" integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g== -"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0": +"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.13.0", "@babel/core@^7.16.0", "@babel/core@^7.4.0-0", "@babel/core@^7.7.2", "@babel/core@^7.8.0", "@babel/core@>=7.11.0": version "7.21.0" resolved "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz" integrity sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA== @@ -499,7 +499,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-flow@^7.18.6": +"@babel/plugin-syntax-flow@^7.14.5", "@babel/plugin-syntax-flow@^7.18.6": version "7.18.6" resolved "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz" integrity sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A== @@ -811,7 +811,7 @@ dependencies: "@babel/plugin-transform-react-jsx" "^7.18.6" -"@babel/plugin-transform-react-jsx@^7.18.6": +"@babel/plugin-transform-react-jsx@^7.14.9", "@babel/plugin-transform-react-jsx@^7.18.6": version "7.21.0" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz" integrity sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg== @@ -1035,7 +1035,7 @@ resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.21.0" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz" integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== @@ -1220,11 +1220,6 @@ "@emotion/weak-memoize" "^0.3.0" stylis "4.1.3" -"@emotion/hash@^0.8.0": - version "0.8.0" - resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz" - integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== - "@emotion/hash@^0.9.0": version "0.9.0" resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz" @@ -1254,7 +1249,7 @@ resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.1.tgz" integrity sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg== -"@emotion/react@^11.10.6": +"@emotion/react@^11.0.0-rc.0", "@emotion/react@^11.10.6", "@emotion/react@^11.4.1", "@emotion/react@^11.5.0": version "11.10.6" resolved "https://registry.npmjs.org/@emotion/react/-/react-11.10.6.tgz" integrity sha512-6HT8jBmcSkfzO7mc+N1L9uwvOnlcGoix8Zn7srt+9ga0MjREo6lRpuVX0kzo6Jp6oTqDhREOFsygN6Ew4fEQbw== @@ -1284,7 +1279,7 @@ resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz" integrity sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA== -"@emotion/styled@^11.10.6": +"@emotion/styled@^11.10.6", "@emotion/styled@^11.3.0": version "11.10.6" resolved "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.6.tgz" integrity sha512-OXtBzOmDSJo5Q0AFemHCfl+bUueT8BIcPSxu0EGTpGk6DmI5dnhSzQANm1e1ze0YZL7TDyAyy6s/b/zmGOS3Og== @@ -1346,7 +1341,7 @@ resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz" integrity sha512-4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg== -"@fortawesome/fontawesome-svg-core@^6.3.0": +"@fortawesome/fontawesome-svg-core@^6.3.0", "@fortawesome/fontawesome-svg-core@~1 || ~6": version "6.3.0" resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.3.0.tgz" integrity sha512-uz9YifyKlixV6AcKlOX8WNdtF7l6nakGyLYxYaCa823bEBqyj/U2ssqtctO38itNEwXb8/lMzjdoJ+aaJuOdrw== @@ -1721,77 +1716,6 @@ resolved "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz" integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== -"@material-ui/core@^4.12.4": - version "4.12.4" - resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz" - integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ== - dependencies: - "@babel/runtime" "^7.4.4" - "@material-ui/styles" "^4.11.5" - "@material-ui/system" "^4.12.2" - "@material-ui/types" "5.1.0" - "@material-ui/utils" "^4.11.3" - "@types/react-transition-group" "^4.2.0" - clsx "^1.0.4" - hoist-non-react-statics "^3.3.2" - popper.js "1.16.1-lts" - prop-types "^15.7.2" - react-is "^16.8.0 || ^17.0.0" - react-transition-group "^4.4.0" - -"@material-ui/icons@^4.11.3": - version "4.11.3" - resolved "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz" - integrity sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA== - dependencies: - "@babel/runtime" "^7.4.4" - -"@material-ui/styles@^4.11.5": - version "4.11.5" - resolved "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz" - integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA== - dependencies: - "@babel/runtime" "^7.4.4" - "@emotion/hash" "^0.8.0" - "@material-ui/types" "5.1.0" - "@material-ui/utils" "^4.11.3" - clsx "^1.0.4" - csstype "^2.5.2" - hoist-non-react-statics "^3.3.2" - jss "^10.5.1" - jss-plugin-camel-case "^10.5.1" - jss-plugin-default-unit "^10.5.1" - jss-plugin-global "^10.5.1" - jss-plugin-nested "^10.5.1" - jss-plugin-props-sort "^10.5.1" - jss-plugin-rule-value-function "^10.5.1" - jss-plugin-vendor-prefixer "^10.5.1" - prop-types "^15.7.2" - -"@material-ui/system@^4.12.2": - version "4.12.2" - resolved "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz" - integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw== - dependencies: - "@babel/runtime" "^7.4.4" - "@material-ui/utils" "^4.11.3" - csstype "^2.5.2" - prop-types "^15.7.2" - -"@material-ui/types@5.1.0": - version "5.1.0" - resolved "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz" - integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== - -"@material-ui/utils@^4.11.3": - version "4.11.3" - resolved "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz" - integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg== - dependencies: - "@babel/runtime" "^7.4.4" - prop-types "^15.7.2" - react-is "^16.8.0 || ^17.0.0" - "@mui/base@5.0.0-alpha.119": version "5.0.0-alpha.119" resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.119.tgz" @@ -1818,7 +1742,7 @@ dependencies: "@babel/runtime" "^7.21.0" -"@mui/material@^5.11.10": +"@mui/material@^5.0.0", "@mui/material@^5.11.10": version "5.11.12" resolved "https://registry.npmjs.org/@mui/material/-/material-5.11.12.tgz" integrity sha512-M6BiIeJjySeEzWeiFJQ9pIjJy6mx5mHPWeMT99wjQdAmA2GxCQhE9A0fh6jQP4jMmYzxhOIhjsGcp0vSdpseXg== @@ -1928,7 +1852,7 @@ schema-utils "^3.0.0" source-map "^0.7.3" -"@popperjs/core@^2.11.6", "@popperjs/core@^2.6.0": +"@popperjs/core@^2.0.0", "@popperjs/core@^2.11.6", "@popperjs/core@^2.6.0": version "2.11.6" resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz" integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== @@ -2215,6 +2139,20 @@ lz-string "^1.4.4" pretty-format "^27.0.2" +"@testing-library/dom@>=7.21.4": + version "10.4.1" + resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz" + integrity sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/runtime" "^7.12.5" + "@types/aria-query" "^5.0.1" + aria-query "5.3.0" + dom-accessibility-api "^0.5.9" + lz-string "^1.5.0" + picocolors "1.1.1" + pretty-format "^27.0.2" + "@testing-library/jest-dom@^5.16.5": version "5.16.5" resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz" @@ -2261,7 +2199,7 @@ resolved "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz" integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q== -"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.9": version "7.20.0" resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz" integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== @@ -2447,7 +2385,7 @@ resolved "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz" integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== -"@types/node@*": +"@types/node@*", "@types/node@>= 12": version "18.15.0" resolved "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz" integrity sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w== @@ -2496,14 +2434,14 @@ dependencies: "@types/react" "*" -"@types/react-transition-group@^4.2.0", "@types/react-transition-group@^4.4.4", "@types/react-transition-group@^4.4.5": +"@types/react-transition-group@^4.4.4", "@types/react-transition-group@^4.4.5": version "4.4.5" resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz" integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.9.11": +"@types/react@*", "@types/react@^17.0.0 || ^18.0.0", "@types/react@>= 16", "@types/react@>=16.14.8", "@types/react@>=16.9.11": version "18.0.28" resolved "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz" integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew== @@ -2604,7 +2542,7 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.5.0": +"@typescript-eslint/eslint-plugin@^4.0.0 || ^5.0.0", "@typescript-eslint/eslint-plugin@^5.5.0": version "5.54.1" resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.1.tgz" integrity sha512-a2RQAkosH3d3ZIV08s3DcL/mcGc2M/UC528VkPULFxR9VnVPT8pBu0IyBAJJmVsCmhVfwQX1v6q+QGnmSe1bew== @@ -2627,7 +2565,7 @@ dependencies: "@typescript-eslint/utils" "5.54.1" -"@typescript-eslint/parser@^5.5.0": +"@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.5.0": version "5.54.1" resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.1.tgz" integrity sha512-8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg== @@ -2876,6 +2814,11 @@ acorn-walk@^7.0.0, acorn-walk@^7.1.1: resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== +"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8, acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: + version "8.8.2" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== + acorn@^7.0.0: version "7.4.1" resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" @@ -2886,11 +2829,6 @@ acorn@^7.1.1: resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: - version "8.8.2" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz" - integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== - address@^1.0.1, address@^1.1.2: version "1.2.2" resolved "https://registry.npmjs.org/address/-/address-1.2.2.tgz" @@ -2930,7 +2868,7 @@ ajv-keywords@^5.0.0: dependencies: fast-deep-equal "^3.1.3" -ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1: version "6.12.6" resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -2950,7 +2888,7 @@ ajv@^8.0.0: require-from-string "^2.0.2" uri-js "^4.2.2" -ajv@^8.6.0: +ajv@^8.6.0, ajv@>=8: version "8.12.0" resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -2960,7 +2898,7 @@ ajv@^8.6.0: require-from-string "^2.0.2" uri-js "^4.2.2" -ajv@^8.8.0: +ajv@^8.8.0, ajv@^8.8.2: version "8.12.0" resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -3036,12 +2974,12 @@ argparse@^2.0.1: resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -aria-query@^5.0.0, aria-query@^5.1.3: - version "5.1.3" - resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz" - integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ== +aria-query@^5.0.0, aria-query@^5.1.3, aria-query@5.3.0: + version "5.3.0" + resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz" + integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A== dependencies: - deep-equal "^2.0.5" + dequal "^2.0.3" array-flatten@^2.1.2: version "2.1.2" @@ -3463,7 +3401,7 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5: +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5, "browserslist@>= 4", "browserslist@>= 4.21.0", browserslist@>=4: version "4.21.5" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz" integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== @@ -3656,7 +3594,7 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" -clsx@^1.0.4, clsx@^1.2.1: +clsx@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== @@ -4091,11 +4029,6 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^2.5.2: - version "2.6.21" - resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz" - integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== - csstype@^3.0.2, csstype@^3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz" @@ -4815,7 +4748,7 @@ eslint-webpack-plugin@^3.1.1: normalize-path "^3.0.0" schema-utils "^4.0.0" -eslint@^8.3.0: +eslint@*, "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8", "eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0", "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^7.0.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", eslint@^8.0.0, eslint@^8.1.0, eslint@^8.3.0, "eslint@>= 6", eslint@>=5: version "8.35.0" resolved "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz" integrity sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw== @@ -6430,7 +6363,7 @@ jest-resolve-dependencies@^27.5.1: jest-regex-util "^27.5.1" jest-snapshot "^27.5.1" -jest-resolve@^27.4.2, jest-resolve@^27.5.1: +jest-resolve@*, jest-resolve@^27.4.2, jest-resolve@^27.5.1: version "27.5.1" resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz" integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw== @@ -6662,7 +6595,7 @@ jest-worker@^29.5.0: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^27.4.3, jest@^27.5.1: +"jest@^27.0.0 || ^28.0.0", jest@^27.4.3, jest@^27.5.1: version "27.5.1" resolved "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz" integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== @@ -6800,7 +6733,7 @@ jsonpointer@^5.0.0: resolved "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz" integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ== -jss-plugin-camel-case@^10.5.1, jss-plugin-camel-case@10.10.0: +jss-plugin-camel-case@10.10.0: version "10.10.0" resolved "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz" integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw== @@ -6818,7 +6751,7 @@ jss-plugin-compose@10.10.0: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-default-unit@^10.5.1, jss-plugin-default-unit@10.10.0: +jss-plugin-default-unit@10.10.0: version "10.10.0" resolved "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz" integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ== @@ -6843,7 +6776,7 @@ jss-plugin-extend@10.10.0: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-global@^10.5.1, jss-plugin-global@10.10.0: +jss-plugin-global@10.10.0: version "10.10.0" resolved "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz" integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A== @@ -6851,7 +6784,7 @@ jss-plugin-global@^10.5.1, jss-plugin-global@10.10.0: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-nested@^10.5.1, jss-plugin-nested@10.10.0: +jss-plugin-nested@10.10.0: version "10.10.0" resolved "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz" integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA== @@ -6860,7 +6793,7 @@ jss-plugin-nested@^10.5.1, jss-plugin-nested@10.10.0: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-props-sort@^10.5.1, jss-plugin-props-sort@10.10.0: +jss-plugin-props-sort@10.10.0: version "10.10.0" resolved "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz" integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg== @@ -6868,7 +6801,7 @@ jss-plugin-props-sort@^10.5.1, jss-plugin-props-sort@10.10.0: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-rule-value-function@^10.5.1, jss-plugin-rule-value-function@10.10.0: +jss-plugin-rule-value-function@10.10.0: version "10.10.0" resolved "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz" integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g== @@ -6895,7 +6828,7 @@ jss-plugin-template@10.10.0: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-vendor-prefixer@^10.5.1, jss-plugin-vendor-prefixer@10.10.0: +jss-plugin-vendor-prefixer@10.10.0: version "10.10.0" resolved "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz" integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg== @@ -6924,7 +6857,7 @@ jss-preset-default@^10.10.0, jss-preset-default@10.10.0: jss-plugin-template "10.10.0" jss-plugin-vendor-prefixer "10.10.0" -jss@^10.10.0, jss@^10.5.1, jss@10.10.0: +jss@^10.10.0, jss@10.10.0: version "10.10.0" resolved "https://registry.npmjs.org/jss/-/jss-10.10.0.tgz" integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw== @@ -7104,7 +7037,7 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lz-string@^1.4.4: +lz-string@^1.4.4, lz-string@^1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz" integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ== @@ -7655,10 +7588,10 @@ picocolors@^0.2.1: resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz" integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.0.0, picocolors@1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" @@ -7689,11 +7622,6 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -popper.js@1.16.1-lts: - version "1.16.1-lts" - resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz" - integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA== - postcss-attribute-case-insensitive@^5.0.2: version "5.0.2" resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz" @@ -8229,15 +8157,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^ resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^7.0.35: - version "7.0.39" - resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz" - integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== - dependencies: - picocolors "^0.2.1" - source-map "^0.6.1" - -postcss@^8.0.9, postcss@^8.3.5, postcss@^8.4.19, postcss@^8.4.4: +"postcss@^7.0.0 || ^8.0.1", postcss@^8, postcss@^8.0.0, postcss@^8.0.3, postcss@^8.0.9, postcss@^8.1.0, postcss@^8.1.4, postcss@^8.2, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.2.2, postcss@^8.3, postcss@^8.3.5, postcss@^8.4, postcss@^8.4.19, postcss@^8.4.21, postcss@^8.4.4, postcss@^8.4.6, "postcss@>= 8", postcss@>=8, postcss@>=8.0.9: version "8.4.21" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz" integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== @@ -8246,6 +8166,14 @@ postcss@^8.0.9, postcss@^8.3.5, postcss@^8.4.19, postcss@^8.4.4: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^7.0.35: + version "7.0.39" + resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz" + integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== + dependencies: + picocolors "^0.2.1" + source-map "^0.6.1" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" @@ -8334,7 +8262,7 @@ prop-types-extra@^1.1.0: react-is "^16.3.2" warning "^4.0.0" -prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -8536,7 +8464,7 @@ react-dnd@^16.0.1: fast-deep-equal "^3.1.3" hoist-non-react-statics "^3.3.2" -react-dom@^18.2.0: +"react-dom@^16.8.0 || ^17 || ^18", "react-dom@^16.8.0 || ^17.0.0 || ^18.0.0", "react-dom@^17.0.0 || ^18.0.0", react-dom@^18.0.0, react-dom@^18.2.0, react-dom@^18.x, react-dom@>=16.14.0, react-dom@>=16.6.0, react-dom@>=16.8, react-dom@>=16.8.0: version "18.2.0" resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz" integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== @@ -8579,11 +8507,6 @@ react-is@^16.7.0: resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -"react-is@^16.8.0 || ^17.0.0": - version "17.0.2" - resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== - react-is@^17.0.1: version "17.0.2" resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" @@ -8624,7 +8547,7 @@ react-popper@^2.2.4: react-fast-compare "^3.0.1" warning "^4.0.2" -react-refresh@^0.11.0: +react-refresh@^0.11.0, "react-refresh@>=0.10.0 <1.0.0": version "0.11.0" resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz" integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A== @@ -8721,7 +8644,7 @@ react-test-renderer@^18.2.0: react-shallow-renderer "^16.15.0" scheduler "^0.23.0" -react-transition-group@^4.4.0, react-transition-group@^4.4.2, react-transition-group@^4.4.5: +react-transition-group@^4.4.2, react-transition-group@^4.4.5: version "4.4.5" resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz" integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== @@ -8731,7 +8654,7 @@ react-transition-group@^4.4.0, react-transition-group@^4.4.2, react-transition-g loose-envify "^1.4.0" prop-types "^15.6.2" -react@^18.2.0: +"react@^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.8.0 || ^17 || ^18", "react@^16.8.0 || ^17.0.0 || ^18.0.0", "react@^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", "react@^17.0.0 || ^18.0.0", react@^18.0.0, react@^18.2.0, react@^18.x, "react@>= 16", "react@>= 16.14", "react@>= 16.8", react@>=0.14.0, react@>=15.0.0, react@>=15.4, react@>=16.14.0, react@>=16.3, react@>=16.6.0, react@>=16.8, react@>=16.8.0, react@>=16.8.6: version "18.2.0" resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz" integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== @@ -8979,7 +8902,7 @@ rollup-plugin-terser@^7.0.0: serialize-javascript "^4.0.0" terser "^5.0.0" -rollup@^2.43.1: +"rollup@^1.20.0 || ^2.0.0", rollup@^1.20.0||^2.0.0, rollup@^2.0.0, rollup@^2.43.1: version "2.79.1" resolved "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz" integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== @@ -9863,7 +9786,7 @@ type-fest@^0.20.2: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-fest@^0.21.3: +type-fest@^0.21.3, "type-fest@>=0.17.0 <4.0.0": version "0.21.3" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== @@ -9897,6 +9820,11 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +"typescript@^3.2.1 || ^4", "typescript@>= 2.7", "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta": + version "4.9.5" + resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz" + integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== + unbox-primitive@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz" @@ -10118,7 +10046,7 @@ webpack-dev-middleware@^5.3.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@^4.6.0: +webpack-dev-server@^4.6.0, "webpack-dev-server@3.x || 4.x": version "4.11.1" resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz" integrity sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw== @@ -10182,7 +10110,7 @@ webpack-sources@^3.2.3: resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.64.4: +"webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@^4.4.0 || ^5.9.0", "webpack@^4.44.2 || ^5.47.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.64.4, "webpack@>= 4", webpack@>=2, "webpack@>=4.43.0 <6.0.0": version "5.76.0" resolved "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz" integrity sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA== From deee323929b7be0fb8ce956b00d317b61ecb80db Mon Sep 17 00:00:00 2001 From: dominiquebissey Date: Mon, 1 Dec 2025 01:20:34 -0500 Subject: [PATCH 2/7] Rescaled images, added brown and white dog stills/gifs. --- .../src/images/brown_dog_happy_scaled_8x.gif | Bin 0 -> 16320 bytes .../src/images/brown_dog_sad_scaled_8x.gif | Bin 0 -> 13549 bytes .../src/images/brown_dog_sad_scaled_8x.png | Bin 0 -> 3190 bytes .../frontend/src/images/brown_dog_scaled_8x.png | Bin 0 -> 3258 bytes .../src/images/white_dog_happy_scaled_8x.gif | Bin 0 -> 13251 bytes .../src/images/white_dog_sad_scaled_8x.gif | Bin 0 -> 10818 bytes .../src/images/white_dog_sad_scaled_8x.png | Bin 0 -> 2931 bytes .../frontend/src/images/white_dog_scaled_8x.png | Bin 0 -> 2973 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 pocs-capstone/frontend/src/images/brown_dog_happy_scaled_8x.gif create mode 100644 pocs-capstone/frontend/src/images/brown_dog_sad_scaled_8x.gif create mode 100644 pocs-capstone/frontend/src/images/brown_dog_sad_scaled_8x.png create mode 100644 pocs-capstone/frontend/src/images/brown_dog_scaled_8x.png create mode 100644 pocs-capstone/frontend/src/images/white_dog_happy_scaled_8x.gif create mode 100644 pocs-capstone/frontend/src/images/white_dog_sad_scaled_8x.gif create mode 100644 pocs-capstone/frontend/src/images/white_dog_sad_scaled_8x.png create mode 100644 pocs-capstone/frontend/src/images/white_dog_scaled_8x.png diff --git a/pocs-capstone/frontend/src/images/brown_dog_happy_scaled_8x.gif b/pocs-capstone/frontend/src/images/brown_dog_happy_scaled_8x.gif new file mode 100644 index 0000000000000000000000000000000000000000..b44766507a7029be8619e31d0f49827a6cdb740c GIT binary patch literal 16320 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%0A+(G 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 literal 0 HcmV?d00001 diff --git a/pocs-capstone/frontend/src/images/brown_dog_scaled_8x.png b/pocs-capstone/frontend/src/images/brown_dog_scaled_8x.png new file mode 100644 index 0000000000000000000000000000000000000000..b166df699a46604441e6caa7620feef25df09f91 GIT binary patch literal 3258 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 literal 0 HcmV?d00001 diff --git a/pocs-capstone/frontend/src/images/white_dog_scaled_8x.png b/pocs-capstone/frontend/src/images/white_dog_scaled_8x.png new file mode 100644 index 0000000000000000000000000000000000000000..4c778fa578849f8f24626c5948803271e1cd02d9 GIT binary patch literal 2973 zcmeHJ{Zms{8b0@Ol>`kCsEVMHf(56z#E;JM5h1q@6?7G7s}clCsBA;KwSfx48b0nV z6zb3-cIwhr@Zuk5dniF;L8%H?ze8P2ll493)yT6IyKUvtA;C(4HObSDHJXfrZ-UyY zX_*^*!Gr6Y_BS^XATR0-2D2-Y1v)ZfKF2u-GWx-lz>xeb9Aw`9a4UHVO_?~J)sx~f z-+FF-$dyoBb_LeJ=Fim25b-a?LbP@jrg(&O#gXSxl;0v3`SZ53zPFNiQr zUQoP^Ad(XBK?=Wx0K7Ki6t;d%;e^MZPJHvQHG2h1mOB{gjfKk_>F4{9s#m-)+Zr0- z+&%sxnTiAVaHHhzyHvmHWS3akS`n^c@Ku+!gV;Dc$Fy65qC*&_*mXK8O!5{E#1y&C zmlwtY|M;nQCuxE`JJyN`#V*+5r&FKN#TzE3IYgU%MHMeJTfjAKXYisb;;L;V-u02e zn|pkE*Kh4nFG-A9@ow%(;fktMws+M1c9XPhMdc7I^-1KL%Ln&{3Bik>p`;T!fyp zR+#Gggc^_>`t1chyG_MFYEiY@e~~^&E4x!{?CgtRREM zsA4|0-4;GRedFtSr9e&3)oy5Lpyb`cDTOMr#3Nc%el(?dD+?SbO%BVyMF6)GlIQ9$ zSH+C5#XF3Wl~S?^wN9s7@M5#sN}J((J*S2--me_t-P15wS6*k0X5-*Fb;Fxpg`)0Z zzAo+upGWMn8i|cVs_Yu6{X(BJd!$}ax={Iq!6z;!H1`tVS$vLz89<{ENSz;PfZDTH znG*Rd7FZp90PBIA8T`kCNs<5onr+Nyk^Hl-Q2DbQQvV+~eV28qbK1}8G^%s@j>&Q; z_3mSvztfZofybto(8*O8ZlUYWDsUXE&HsW{2t8*qT+Bs15M+nq^^j5MFol%FNm~p5 zPLOy8FGfUSYgLUJ$+a&>=_|DnrDo=spd?xyl-I87&7m*8Bt!1}`DN@^*pxYRoJI0* z;2wUzFVXs{t))z(=MX+~m*!7ImL{HyQ!1^)7u5_M6`LUhZ~i^2Q85MGz-Z-dCfi`} za%ZjoLIis|rD&33}R<%ln$Upw~8sF$N95iw`5#gz@p}+3kz{>A{k}f`VG`Sht`VUo+xF!=p@(p@% zBc85VR3nF1Nz0z;IhA9U>^|pvuCb-|rGKrIUuWAz*x335T9L=L#h9-YDiqb|t?6;( z=LB#&A@@jn+A!}guq)EzddqLh=7-W<(x7LC4Aau;)OCgNWF=&EKq)Omk06NKi7l?p z_^p(t`A~sLZ}a4GZf}oU>YWMuxVDg@qKNO5(}&SkNXF0Mc@E4A(o1OFOYDL7hTeG7 z$K_Zy*cH88h14PJDmRy&IHYIrb&I@BWH(e*M`yeL#4#MaAGf78bO$8+zNx4P&42~3 z-#uP{J%y_3mUkrc{|4_PQ_1!^MJ5?u>RC@eYAL8uGjpS;to|HIH0LMiG*;`^#(6N{Q(SHGzt3XKr literal 0 HcmV?d00001 From 058529b812bfbdeeadd18796e2280b00b7831a0a Mon Sep 17 00:00:00 2001 From: dominiquebissey Date: Tue, 2 Dec 2025 20:15:15 -0500 Subject: [PATCH 3/7] Made changes to update landing page. --- .../frontend/src/components/LandingPage.css | 12 +++++++++++- .../frontend/src/components/LandingPage.js | 15 ++++++++------- .../src/images/brown_dog_centered_8x.png | Bin 0 -> 3292 bytes .../frontend/src/images/brown_dog_scaled_2x.png | Bin 0 -> 899 bytes .../frontend/src/images/brown_dog_scaled_4x.png | Bin 0 -> 1582 bytes 5 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 pocs-capstone/frontend/src/images/brown_dog_centered_8x.png create mode 100644 pocs-capstone/frontend/src/images/brown_dog_scaled_2x.png create mode 100644 pocs-capstone/frontend/src/images/brown_dog_scaled_4x.png diff --git a/pocs-capstone/frontend/src/components/LandingPage.css b/pocs-capstone/frontend/src/components/LandingPage.css index ad78be0fc..7279154f2 100644 --- a/pocs-capstone/frontend/src/components/LandingPage.css +++ b/pocs-capstone/frontend/src/components/LandingPage.css @@ -24,6 +24,8 @@ .card { background-color: rgb(255, 214, 214); + border: 6px rgb(172, 65, 100) solid; + border-radius: 30px; flex: 1 1 auto; width: 0; height: auto; @@ -98,7 +100,7 @@ background: rgb(172, 65, 100); color: #ffffff; border-radius: 10px; - font-size: 20px; + font-size: 30px; transition: all 0.1s ease-in; position: relative; } @@ -130,4 +132,12 @@ .landingbutton:hover { background: #3a0422; color: #ffffff; +} +.titlebox { + border: 8px rgb(172, 65, 100) solid; + padding: 20px; + display: inline-block; + border-radius: 35px; + font-size: 2.5rem; + background-color: rgb(255, 214, 214); } \ No newline at end of file diff --git a/pocs-capstone/frontend/src/components/LandingPage.js b/pocs-capstone/frontend/src/components/LandingPage.js index 2ada6c604..9af8ee7e5 100644 --- a/pocs-capstone/frontend/src/components/LandingPage.js +++ b/pocs-capstone/frontend/src/components/LandingPage.js @@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom'; import { useState } from 'react'; import { Card } from 'react-bootstrap'; import "./LandingPage.css" +import browndog from '../images/brown_dog_centered_8x.png'; import kittycat from '../images/orangecat.png'; import { useWindowWidth } from "@react-hook/window-size"; @@ -43,15 +44,15 @@ const LandingPage = () => { } return (
-

WELCOME TO STUDY BUDDY!

- cat -
+

WELCOME TO PRODUCTIVITY PET!

+ dog +
About - Study Buddy allows you to take care of a virtual pet to achieve your academic goals! Choose from a variety of pets and colors - of pets to find the buddy who suits you best. By completing tasks, you can receive candies of various sizes to feed your pet. Watch it grow and level up! - Integrate your Canvas account so your pet can help you keep track of your school assignments. With Study Buddy, you get a cute - way to make keeping up with your schoolwork and personal study goals fun! Click on the buttons below to register or log in to see your buddy. + Productivity Pet allows you to take care of a virtual pet to achieve your academic goals! Choose from a variety of pets + to find the one who suits you best. By completing tasks, you can receive candies of various sizes to feed your pet. Watch it grow and level up! + Integrate your Canvas account so your pet can help you keep track of your school assignments. With Productivity Pet, you get a cute + way to make keeping up with your schoolwork and personal study goals fun! Click on the buttons below to register or log in to see your pet.
diff --git a/pocs-capstone/frontend/src/images/brown_dog_centered_8x.png b/pocs-capstone/frontend/src/images/brown_dog_centered_8x.png new file mode 100644 index 0000000000000000000000000000000000000000..603db5c87c9351b2cfa448e0df3d06c8a5b1e8a6 GIT binary patch literal 3292 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 literal 0 HcmV?d00001 diff --git a/pocs-capstone/frontend/src/images/brown_dog_scaled_2x.png b/pocs-capstone/frontend/src/images/brown_dog_scaled_2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5af0c56abb944665b0c8d349bdfc3a7589012055 GIT binary patch literal 899 zcmeAS@N?(olHy`uVBq!ia0vp^4nQ2i!3HE<-+a_yU|{z0ba4!+V0=5nHc!M+ptW3( zai;2%4xS|C2W->k2ptr(U^r*NJkyfFy`kfZkU2w3@`(9!&zZ3pZoXmaL(WN$DmNFqTu~D&%IUEiH`y=Z2l(OBeP-gqJIZ9-cQv#xMa?Q zss0boyydV|I9jq~zxPj$dpfa#?k012iyT^cLQgGrc|9}0uwFy+;bi%Tp_Yjs`F2<) z>HMA%WOk@VY`OW#nmXGfPqLp!?qM$at+M;O?PU#y&*}Mg?Z>}XS+|}KejZ(5KKt#L z<^Jzy3w`m+L+}u2U+3PP~xrOJ~Z?F)L-~L~bY5Jd&i>=dQIHxDgVbJ@#wCp3_iF=dQ z-7q#kB(iwr-tJ9x{fi=2-M4P63{L0x85sTfc8Tzsq|75(Z!TJ}s4toF+~=diasIdW zjw{ZzwLO08X+vbho}kMXjIDb&eX+N*;Ou{|cmAbO?h(!6b*1Lh?=e|x{gQ8D4zO92 z@Si7|<$cSF&uu~R;&bai@@drZx@B&j>&Ce6bneM79D7duwm);)_tJTTJ+=|y*EowB z((|&;{GR_&!`}Rk8H)Oq=DFj}NH& z@6V5Hf3JVE$f0wg&%9u>J^k*>*Go1P{pmli;?7w4%JbrTSy#J7Hm?_{+}69t=$n(e z^3P-wbCYu{mo!zgUmxh)GP$l>Mj)|ho!;XX4vns>*IX5T?G}6AP{-9;uvhX2YwgTm V)eBC1(+6fQ22WQ%mvv4FO#qiSqH6#E literal 0 HcmV?d00001 diff --git a/pocs-capstone/frontend/src/images/brown_dog_scaled_4x.png b/pocs-capstone/frontend/src/images/brown_dog_scaled_4x.png new file mode 100644 index 0000000000000000000000000000000000000000..7f8765d960021cb0219530902683c5cbe17cb5a3 GIT binary patch literal 1582 zcmdUw`#+Nl9LJw$)(Is{DNf;)>FIJ7J8}zIxonb4okT1~Ng`qjWA&t^v`%!BmdhkB zi^EotTE!cahHepjVj{4#J59f#P<>$})^Z9-={e18`+Q!-d0O)uU-1aR_ zc(FK|zby7{U4_-l(7MN@(^#X-6^K~)W{&n%K1gUb8f^gW z5&NsIJq6A7x#BNm|J`!|vY2eGSIPQ~>Lu0cl1HNCT5Hi2r^jdn~27sD40HFs1 z$p7m~usE5`<$UC}T^820lmwHEzjN1lEYCpW5X+5JEm0^^IQA3EgO|`ZZD*NfsG(F# zMD8h-6D`H5^vw#Fe9P8InoVw3ZoE<-;vd*{Sd#!_Ki2knp-5X8SmYcFPqz`3jSX3S zQXvm?bX7;noDmQ%*3B{47m;Y#O-v%d#PIwIk-M&6^+=6jAZHBYLooxH^5G)7;D9gJgcU8^9hJ#E!#?8#5NNg`x_d* zO&Xq+o8Y1Yhn>pq*2fj(0e!9^LIB0wx-cF9fn^t&m7v^&|NBB$qf4}B4pBkJMDP?( z1k(BKHPd8qt7QJ4_wO)7sRKy-IvB749Ly?e(?Ibru&EJAx)b8Jic1YWFU1QF3@`pF~0zm4hXD8{whr3`JR@ge!re)K#)^w1ToSbLD4aCN;%{=LoRe>&9~ROwKqJ; z`$0(qMQVS#lFYV&f4p?$#NL zw9Pw%d1&y-JtJ366J?bW2pTpxJ~6mH5_|Q#x7E;~Wf(n53*x^Df32@&b)+9E^@KAU zv(0B5&n;nL1UNM>?VNPg`&}}xuk$XG0gI5XyiJ?Y8;cV>ryzU)da@(|#he0y<<|hi zqE2!2D7gOBtokha-JYtEGNMGFkdbG4)jTq_5SNOO=DRDD4nLKGKx18|Fb(xXLbb6o zJk%^-874EXkM~jc&8Y}=QU;sj0N#8}BBMwgxcoU9Mj6F~6feD`C#BZ!@Crz|Uz?s8 z!EUwNfVT-f)Lqa>xmq;)jO_C>A`rNJ*|ADTG;Zs|PC@KNwJAhSpkj#i9=gn~N5zWf$O5Y6dI6(+p*e1EiU(_!TVFOxDaY?s(-`d9#AU)o zZ~gEnim6`1bu#;D-k~V!CK@!ZpXf{VVNSkd5GgLzP*|NX_ap-Cc3)zF#&z|0PyC4_ zz;C9m^8|NynXOJur$w{6N@l#Q!koSAL4g5%b51tk&tXgMq4|{Xa~A&{V^SP)UL*DL WtSAn@+ivj>0G{qXZk4-8>Hh*$w!GH> literal 0 HcmV?d00001 From 182d8b3450073e829a809caf2b670e5f68135e02 Mon Sep 17 00:00:00 2001 From: dominiquebissey Date: Wed, 3 Dec 2025 02:07:40 -0500 Subject: [PATCH 4/7] Made changes to Login/Registration page, and added dog options to the pet choice page. --- .../frontend/src/components/AnimateChoice.css | 26 ++++++++---- .../frontend/src/components/AnimateChoice.js | 42 ++++++++++++++----- .../frontend/src/components/Header.css | 6 +-- .../frontend/src/components/Header.js | 7 ++-- .../frontend/src/components/LandingPage.css | 2 +- .../frontend/src/components/LandingPage.js | 4 +- .../src/components/LoginLogout/Login.js | 2 +- .../src/components/LoginLogout/Register.js | 2 +- 8 files changed, 61 insertions(+), 30 deletions(-) diff --git a/pocs-capstone/frontend/src/components/AnimateChoice.css b/pocs-capstone/frontend/src/components/AnimateChoice.css index 18d66a02e..35c03a204 100644 --- a/pocs-capstone/frontend/src/components/AnimateChoice.css +++ b/pocs-capstone/frontend/src/components/AnimateChoice.css @@ -8,9 +8,9 @@ src: url("../fonts/Minecraft.ttf"); } .pet-choice{ - background-color: #ffffff; + background-color: rgb(251, 216, 216); font-family: pixelFont; - background-color:bisque; + background-color: rgb(251, 216, 216); } .AnimateChoice{ display: grid; @@ -53,7 +53,7 @@ .button { cursor: pointer; - border: 1px solid #1a202c; + border: 2px solid rgb(172, 65, 100); padding: 8px; /* width: 5%;*/ margin: 5px; @@ -83,12 +83,12 @@ } .button:hover { - background: #1a202c; + background: rgb(172, 65, 100); color: #ffffff; } .input { - border: 1px solid #1a202c; + border: 2px solid rgb(172, 65, 100); padding: 8px; /* width: 25%; */ border-radius: 3px; @@ -102,7 +102,7 @@ .input:hover{ background-color: rgba(255, 255, 255, 0.45); - box-shadow: 0px 4px 20px 0px rgba(0, 0, 0, 0.05); + box-shadow: 0px 4px 20px 0px rgb(172, 65, 100); } .petsprite-body { @@ -119,10 +119,20 @@ } .pet-selection-carousel .carousel-inner { - width:400px; + width:450px; } .pet-selection-carousel .carousel-inner img { margin: auto; - margin-bottom: 50px; + margin-bottom: 65px; + } + + .choose-card { + border: 6px rgb(172, 65, 100) solid; + background-color: rgb(251, 216, 216); + border-radius: 30px; + display: flex; + justify-content: center; + margin: center; + align-items: center; } \ No newline at end of file diff --git a/pocs-capstone/frontend/src/components/AnimateChoice.js b/pocs-capstone/frontend/src/components/AnimateChoice.js index a383b655c..8aca0ce2d 100644 --- a/pocs-capstone/frontend/src/components/AnimateChoice.js +++ b/pocs-capstone/frontend/src/components/AnimateChoice.js @@ -10,6 +10,8 @@ import { useNavigate } from "react-router-dom"; import { useWindowWidth } from "@react-hook/window-size"; import { faColonSign } from "@fortawesome/free-solid-svg-icons"; import Carousel from "react-bootstrap/Carousel"; +import brown_dog from "../images/brown_dog_scaled_8x.png"; +import white_dog from "../images/white_dog_scaled_8x.png"; import gray_cat from "../images/gray_neutral_scaled_5x_pngcrushed.png"; import orange_cat from "../images/orange_neutral_scaled_5x_pngcrushed.png"; import white_cat from "../images/whitecat_scaled_5x_pngcrushed.png"; @@ -114,7 +116,7 @@ const AnimateChoice = () => { //contains sprite sheets return (
- +

CHOOSE YOUR PET

@@ -131,13 +133,31 @@ const AnimateChoice = () => { interval={null} className="pet-selection-carousel" > + + browndog + + + + whitedog + + orange {/*

*/} {/* */} @@ -151,8 +171,8 @@ const AnimateChoice = () => { src={gray_cat} alt="gray" className="sprite-container" - index={1} - ref={spriteRefs[1]} + index={3} + ref={spriteRefs[3]} > {/* */} {/*
handleSubmit(event, 1)}> @@ -165,8 +185,8 @@ const AnimateChoice = () => { src={white_cat} alt="white" className="sprite-container" - index={2} - ref={spriteRefs[2]} + index={4} + ref={spriteRefs[4]} > @@ -174,8 +194,8 @@ const AnimateChoice = () => { src={tux_cat} alt="tux" className="sprite-container" - index={3} - ref={spriteRefs[3]} + index={5} + ref={spriteRefs[5]} > @@ -183,8 +203,8 @@ const AnimateChoice = () => { src = {pet_rock} alt = "rock" className="sprite-container" - index={4} - ref={spriteRefs[4]}> + index={6} + ref={spriteRefs[6]}> diff --git a/pocs-capstone/frontend/src/components/Header.css b/pocs-capstone/frontend/src/components/Header.css index 40a0a2f70..87cd72bd8 100644 --- a/pocs-capstone/frontend/src/components/Header.css +++ b/pocs-capstone/frontend/src/components/Header.css @@ -23,7 +23,7 @@ } .header-whole { - background-color: rgb(33, 33, 33); + background-color: rgb(172, 65, 100); } @@ -42,7 +42,7 @@ display: flex; justify-content: center; align-items: center; - background-color: rgb(33, 33, 33); + background-color: rgb(172, 65, 100); } .header-text { @@ -63,7 +63,7 @@ .App-link:hover, .App-link { - color: #6e7172; + color: #ffffff; font-weight: bold; } diff --git a/pocs-capstone/frontend/src/components/Header.js b/pocs-capstone/frontend/src/components/Header.js index 537ff6815..6dab1245e 100644 --- a/pocs-capstone/frontend/src/components/Header.js +++ b/pocs-capstone/frontend/src/components/Header.js @@ -1,5 +1,6 @@ import "./Header.css"; -import logo from "../images/orangecat.png"; +//import logo from "../images/orangecat.png"; +import logo from "../images/brown_dog_centered_8x.png"; import usericon from "../images/user_icon.png"; import canvas_bug from "../images/canvas_bug.png"; import { useState, useEffect, useContext } from "react"; @@ -136,10 +137,10 @@ const Header = ({ }) => {
- study buddy logo + productivity pet logo - My Study Buddy + My Pet
diff --git a/pocs-capstone/frontend/src/components/LandingPage.css b/pocs-capstone/frontend/src/components/LandingPage.css index 7279154f2..795c5758e 100644 --- a/pocs-capstone/frontend/src/components/LandingPage.css +++ b/pocs-capstone/frontend/src/components/LandingPage.css @@ -22,7 +22,7 @@ } -.card { +.landing-card { background-color: rgb(255, 214, 214); border: 6px rgb(172, 65, 100) solid; border-radius: 30px; diff --git a/pocs-capstone/frontend/src/components/LandingPage.js b/pocs-capstone/frontend/src/components/LandingPage.js index 9af8ee7e5..20a812f14 100644 --- a/pocs-capstone/frontend/src/components/LandingPage.js +++ b/pocs-capstone/frontend/src/components/LandingPage.js @@ -46,8 +46,8 @@ const LandingPage = () => {

WELCOME TO PRODUCTIVITY PET!

dog -
- About +
+ About Productivity Pet allows you to take care of a virtual pet to achieve your academic goals! Choose from a variety of pets to find the one who suits you best. By completing tasks, you can receive candies of various sizes to feed your pet. Watch it grow and level up! diff --git a/pocs-capstone/frontend/src/components/LoginLogout/Login.js b/pocs-capstone/frontend/src/components/LoginLogout/Login.js index 7e657e489..96cddedd8 100644 --- a/pocs-capstone/frontend/src/components/LoginLogout/Login.js +++ b/pocs-capstone/frontend/src/components/LoginLogout/Login.js @@ -85,7 +85,7 @@ const Login = () => {

{errMsg}

-

Sign-in to visit your buddy!

+

Sign-in to visit your pet!

{ {height < 600 ? ( "" ) : ( -

Welcome to Study Buddy!

+

Welcome to Productivity Pet!

)} {/*

Welcome to Study Buddy!

*/} From 25f79c173cf57d3017c0e9d2c3ccdfabd7dfe2fe Mon Sep 17 00:00:00 2001 From: dominiquebissey Date: Wed, 3 Dec 2025 17:34:54 -0500 Subject: [PATCH 5/7] Changed name to Task Pet, and made chnages to the tutorial pages. --- .../frontend/src/components/LandingPage.js | 6 ++-- .../src/components/LoginLogout/Register.js | 2 +- .../src/components/Tutorial/Tutorial.css | 32 ++++++++++++++----- .../src/components/Tutorial/Tutorial.js | 11 ++++--- 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/pocs-capstone/frontend/src/components/LandingPage.js b/pocs-capstone/frontend/src/components/LandingPage.js index 20a812f14..486030cce 100644 --- a/pocs-capstone/frontend/src/components/LandingPage.js +++ b/pocs-capstone/frontend/src/components/LandingPage.js @@ -44,14 +44,14 @@ const LandingPage = () => { } return (
-

WELCOME TO PRODUCTIVITY PET!

+

WELCOME TO TASK PET!

dog
About - Productivity Pet allows you to take care of a virtual pet to achieve your academic goals! Choose from a variety of pets + Task Pet allows you to take care of a virtual pet to achieve your academic goals! Choose from a variety of pets to find the one who suits you best. By completing tasks, you can receive candies of various sizes to feed your pet. Watch it grow and level up! - Integrate your Canvas account so your pet can help you keep track of your school assignments. With Productivity Pet, you get a cute + Integrate your Canvas account so your pet can help you keep track of your school assignments. With Task Pet, you get a cute way to make keeping up with your schoolwork and personal study goals fun! Click on the buttons below to register or log in to see your pet. diff --git a/pocs-capstone/frontend/src/components/LoginLogout/Register.js b/pocs-capstone/frontend/src/components/LoginLogout/Register.js index 3f270dbd1..95f1438d4 100644 --- a/pocs-capstone/frontend/src/components/LoginLogout/Register.js +++ b/pocs-capstone/frontend/src/components/LoginLogout/Register.js @@ -153,7 +153,7 @@ const Register = () => { {height < 600 ? ( "" ) : ( -

Welcome to Productivity Pet!

+

Welcome to Task Pet!

)} {/*

Welcome to Study Buddy!

*/} diff --git a/pocs-capstone/frontend/src/components/Tutorial/Tutorial.css b/pocs-capstone/frontend/src/components/Tutorial/Tutorial.css index 0f80762c6..f2b69b4fb 100644 --- a/pocs-capstone/frontend/src/components/Tutorial/Tutorial.css +++ b/pocs-capstone/frontend/src/components/Tutorial/Tutorial.css @@ -49,7 +49,7 @@ .header-tut { top: 0; - background-color: bisque; + background-color: rgb(172, 65, 100); border: rgb(33, 33, 33); max-width: 95vw; margin-left: auto; @@ -98,9 +98,10 @@ border-style: double; /* padding-left: 10px; padding-right: 10px; */ - font-size: 14px; + font-size: 20px; background-color: antiquewhite; max-width: 95vw; + border-radius: 10px; } @media (min-height: 667px) { .alice-container { @@ -167,6 +168,8 @@ flex-direction: column; font-size: 14px; overflow-wrap: break-word; + border: 8px rgb(172, 65, 100) solid; + border-radius: 35px; } .tut-card-title-mobile { @@ -189,7 +192,8 @@ background: rgb(172, 65, 100); color: #ffffff; border-radius: 10px; - font-size: 20px; + border-color: rgb(172, 65, 100); + font-size: 26px; transition: all 0.1s ease-in; position: relative; } @@ -198,7 +202,8 @@ margin-left: auto; margin-right: auto; margin-top: -70px; - height: 300px; + margin-bottom: -20px; + height: 400px; width: 300px; justify-content: center; } @@ -224,6 +229,10 @@ .proceed-header{ font-size: 50px; font-family: pixelFont; + border: 8px rgb(172, 65, 100) solid; + padding: 10px; + border-radius: 35px; + background-color: rgb(251, 216, 216); } .tut-card-about{ @@ -273,9 +282,10 @@ max-width: 30vw; margin-left: auto; margin-right: auto; - + padding: 10px; border-width: 5px; border-style: double; + border-radius: 10px; /* padding-left: 10px; padding-right: 10px; */ @@ -287,7 +297,7 @@ align-items: center; font-family: pixelFont; font-weight: bold; - font-size: 18px; + font-size: 25px; } .alice-carousel { @@ -312,9 +322,14 @@ display: block; margin: auto; width: auto; + margin-top: 10px; + margin-bottom: 10px; max-height: 75vh; max-width: 100%; border-style: ridge; + border-color: rgb(172, 65, 100); + border-width: 5px; + border-radius: 10px; } .tut-imagebox { @@ -335,11 +350,12 @@ margin-left: auto; margin-right: auto; border-width: 5px; + padding: 12px; border-style: double; /* padding-left: 10px; padding-right: 10px; */ - background-color: antiquewhite; - max-width: 20vw; + background-color: bisque; + max-width: 40vw; } .tut-submit-button{ min-width: 20vw; diff --git a/pocs-capstone/frontend/src/components/Tutorial/Tutorial.js b/pocs-capstone/frontend/src/components/Tutorial/Tutorial.js index 50443d2e8..a836f61dc 100644 --- a/pocs-capstone/frontend/src/components/Tutorial/Tutorial.js +++ b/pocs-capstone/frontend/src/components/Tutorial/Tutorial.js @@ -15,6 +15,7 @@ import integrate_canvas from "./Tutorial-screenshots/circle-canvas-integration.p import canvas_button from "./Tutorial-screenshots/circle-canvas-button.png"; import kittycat from "../../images/orangecat.png"; +import browndog from "../../images/brown_dog_centered_8x.png"; //import Card from "react-bootstrap/Card"; import { useState, useRef, useEffect } from "react"; @@ -137,7 +138,7 @@ const Tutorial = () => {
{" "}
-
How To Use Study Buddy!
+
How To Use Task Pet!
active tasks
@@ -258,14 +259,14 @@ const Tutorial = () => {
-

-
WELCOME TO STUDY BUDDY!
+

+
WELCOME TO TASK PET!

- cat + browndog
- Thank you! + Thank you! {TUT_TEXT[10]}
From 77ad4107d4e441b00503c39f8ca03263ff71fad4 Mon Sep 17 00:00:00 2001 From: dominiquebissey Date: Thu, 4 Dec 2025 00:46:15 -0500 Subject: [PATCH 6/7] Added dogs into main page, and made changes to the main task page layout. --- .../frontend/src/components/Footer.css | 2 +- .../frontend/src/components/Main.css | 2 +- .../components/PageDisplay/PageDisplay.css | 13 ++-- .../components/PageDisplay/Task/TaskPage.css | 16 ++--- .../src/components/PetDisplay/PetDisplay.css | 7 ++- .../src/components/PetDisplay/PetDisplay.js | 59 +++++++++++++++---- 6 files changed, 69 insertions(+), 30 deletions(-) diff --git a/pocs-capstone/frontend/src/components/Footer.css b/pocs-capstone/frontend/src/components/Footer.css index b4388a2a0..10df1a09c 100644 --- a/pocs-capstone/frontend/src/components/Footer.css +++ b/pocs-capstone/frontend/src/components/Footer.css @@ -11,7 +11,7 @@ align-items: center; padding: 1em; - background-color: rgb(22, 22, 22); + background-color: rgb(172, 65, 100); color: #fff; } diff --git a/pocs-capstone/frontend/src/components/Main.css b/pocs-capstone/frontend/src/components/Main.css index e9cee0305..619d20d27 100644 --- a/pocs-capstone/frontend/src/components/Main.css +++ b/pocs-capstone/frontend/src/components/Main.css @@ -7,7 +7,7 @@ /* IMPORTANT:KEEP AS MIN HEIGHT NOT HEIGHT*/ /* https://www.freecodecamp.org/news/how-to-keep-your-footer-where-it-belongs-59c6aa05c59c/ */ min-height: 100vh; - background-color: rgb(255, 255, 255); + background-color: rgb(237, 169, 192); /* padding: 0px 5px; */ } diff --git a/pocs-capstone/frontend/src/components/PageDisplay/PageDisplay.css b/pocs-capstone/frontend/src/components/PageDisplay/PageDisplay.css index dbd160909..06fbad49c 100644 --- a/pocs-capstone/frontend/src/components/PageDisplay/PageDisplay.css +++ b/pocs-capstone/frontend/src/components/PageDisplay/PageDisplay.css @@ -7,7 +7,7 @@ align-items: stretch; justify-content: flex-start; flex-direction: column; - background-color: rgb(255, 198, 198); + background-color: rgb(237, 169, 192); padding: 10px; overflow-x: hidden; overflow-y: hidden; @@ -17,7 +17,7 @@ .pg-tabs.nav-tabs, .pg-tabs .nav-link { background-color: rgba(245, 190, 205, 0.486); - color: rgb(217, 91, 91); + color: rgb(172, 65, 100); font-size: calc(1.3vw + 1vh); font-weight: bold; margin: 0px; @@ -29,11 +29,11 @@ .pg-tabs .nav-link.active { - color: rgb(215, 60, 60); + color: rgb(172, 65, 100); } .pg-tabs .nav-link:hover { - color: rgb(215, 60, 60); + color: rgb(172, 65, 100); } .mini-page { @@ -50,7 +50,7 @@ /* make the tabs height the max of the parent */ .tab-content { height: 100%; - background-color: rgb(255, 255, 255); + background-color: rgb(237, 169, 192); } @@ -73,7 +73,8 @@ .to-do-header { font-weight: bold; - font-size: calc(2vw+.4vw); + font-size: calc(0.75vw + 1.1vh); + color: rgb(172, 65, 100) } .pet-profile-header { diff --git a/pocs-capstone/frontend/src/components/PageDisplay/Task/TaskPage.css b/pocs-capstone/frontend/src/components/PageDisplay/Task/TaskPage.css index 69877ba0e..35013eb46 100644 --- a/pocs-capstone/frontend/src/components/PageDisplay/Task/TaskPage.css +++ b/pocs-capstone/frontend/src/components/PageDisplay/Task/TaskPage.css @@ -2,7 +2,7 @@ .to-tabs, .to-tabs .nav-link { background-color: rgba(243, 193, 193, 0); - color: rgb(93, 93, 93); + color: rgb(172, 65, 100); font-size: calc(0.5vw + 1vh); margin: 0px; letter-spacing: 0.5px; @@ -12,14 +12,14 @@ .to-tabs .nav-link.active { background-color: rgba(255, 255, 255, 0); - color: rgb(43, 99, 158); - border-color: rgb(43, 99, 158); + color: rgb(249, 76, 134); + border-color: rgb(249, 76, 134); border-width: 0px 0px 3px 0px; } .to-tabs .nav-link:hover { - color: rgb(43, 99, 158); + color: rgb(249, 76, 134); } /* margin for ACTIVE / COMPLETE Tabs */ @@ -103,7 +103,7 @@ /* the list items in task page */ .task-item.list-group-item { /* border-bottom-width: 3px; */ - border-color: rgb(226, 226, 226); + border-color: rgb(237, 169, 192); border-radius: 0px; border-width: 0px; border-top-width: 0px !important; @@ -139,7 +139,7 @@ } .due-date { - color: rgb(43, 99, 158); + color: rgb(249, 76, 134); } .course-id { @@ -178,7 +178,7 @@ .completed-checkbox input[type="checkbox"]:checked { - background-color: rgba(180, 180, 180, 0.783); + background-color: rgb(249, 76, 134); border-color: rgba(179, 41, 75, 0); } @@ -222,7 +222,7 @@ .noncompleted-checkbox input[type="checkbox"]:hover { background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e"); - background-color: rgba(242, 160, 160, 0.827); + background-color: rgb(249, 76, 134); border-color: rgba(179, 41, 75, 0); } diff --git a/pocs-capstone/frontend/src/components/PetDisplay/PetDisplay.css b/pocs-capstone/frontend/src/components/PetDisplay/PetDisplay.css index 0c9c8ccc4..f9fa2bb12 100644 --- a/pocs-capstone/frontend/src/components/PetDisplay/PetDisplay.css +++ b/pocs-capstone/frontend/src/components/PetDisplay/PetDisplay.css @@ -105,7 +105,7 @@ .pbar-exp { display: flex; align-items: center; - background-color: rgb(255, 255, 255); + background-color: rgb(237, 169, 192); } .pet-desc { @@ -115,7 +115,7 @@ } .pet-desc-text { - font-size: calc(0.7vw + 1.4vh); + font-size: calc(0.5vw + 1.4vh); padding: 5px; margin: 5px; text-align: left; @@ -146,7 +146,7 @@ } .pd-bg { - background-color: rgb(237, 237, 237); + background-color: rgb(250, 217, 217); } .pet-display .card { @@ -154,6 +154,7 @@ /* border-color: black; */ border-radius: 0px; border-width: 1px; + background-color: rgb(250, 217, 217); /* background-color: black; */ } diff --git a/pocs-capstone/frontend/src/components/PetDisplay/PetDisplay.js b/pocs-capstone/frontend/src/components/PetDisplay/PetDisplay.js index 8d928f29a..f1febb794 100644 --- a/pocs-capstone/frontend/src/components/PetDisplay/PetDisplay.js +++ b/pocs-capstone/frontend/src/components/PetDisplay/PetDisplay.js @@ -18,11 +18,20 @@ import gray_N_prop from "../../images/propeller_hat.gif"; import gray_H_prop from "../../images/prop_happy.gif"; import gray_S_prop from "../../images/prop_sad.gif"; import dingSound from "../../audio/dingsound.mp3"; +import brown_dog from "../../images/brown_dog_scaled_8x.png"; +import browndog_H_gif from "../../images/brown_dog_happy_scaled_8x.gif"; +import browndog_S_gif from "../../images/brown_dog_sad_scaled_8x.gif"; +import white_dog from "../../images/white_dog_scaled_8x.png"; +import whitedog_H_gif from "../../images/white_dog_happy_scaled_8x.gif"; +import whitedog_S_gif from "../../images/white_dog_sad_scaled_8x.gif"; + import { useContext, useEffect, useRef, useState } from "react"; import bgimage from "../../images/bg.gif"; import ProgressBar from "react-bootstrap/ProgressBar"; +import browndog_click from "../../images/brown_dog_scaled_8x.png"; +import whitedog_click from "../../images/white_dog_scaled_8x.png"; import orange_click from "../../images/orange_cat_hi_scaled_5x_pngcrushed.png"; import gray_click from "../../images/gray_cat_hi_scaled_5x_pngcrushed.png"; import white_click from "../../images/white_cat_hi_scaled_5x_pngcrushed.png"; @@ -121,15 +130,21 @@ const PetDisplay = () => { // console.log(pet.palette); switch (contextHandler?.avatarInfo.palette) { case 0: - setAvatarImage(orange_click); + setAvatarImage(browndog_click); break; case 1: - setAvatarImage(gray_click); + setAvatarImage(whitedog_click); break; case 2: - setAvatarImage(white_click); + setAvatarImage(orange_click); break; case 3: + setAvatarImage(gray_click); + break; + case 4: + setAvatarImage(white_click); + break; + case 5: setAvatarImage(tux_click); break; } @@ -251,14 +266,14 @@ const PetDisplay = () => { switch (pet.palette) { case 0: if (mood === 'N') { - setAvatarImage(orange_cat); + setAvatarImage(brown_dog); //} else { // setAvatarImage(`orange_${mood}_gif`) // console.log(`orange_${mood}_gif`) } else if (mood === 'H') { - setAvatarImage(orange_H_gif); + setAvatarImage(browndog_H_gif); } else { - setAvatarImage(orange_S_gif); + setAvatarImage(browndog_S_gif); } return case 1: @@ -275,6 +290,28 @@ const PetDisplay = () => { return } if(mood==='N'){ + setAvatarImage(white_dog); + } else if (mood === 'H') { + setAvatarImage(whitedog_H_gif); + // setAvatarImage(`gray_${mood}_gif`) + // console.log(`gray_${mood}_gif`) + } else { + setAvatarImage(whitedog_S_gif); + } + return + case 2: + if (mood === 'N') { + setAvatarImage(orange_cat); + } else if (mood === 'H') { + setAvatarImage(orange_H_gif); + // setAvatarImage(`gray_${mood}_gif`) + // console.log(`gray_${mood}_gif`) + } else { + setAvatarImage(orange_S_gif); + } + return + case 3: + if (mood === 'N') { setAvatarImage(gray_cat); } else if (mood === 'H') { setAvatarImage(gray_H_gif); @@ -284,7 +321,7 @@ const PetDisplay = () => { setAvatarImage(gray_S_gif); } return - case 2: + case 4: if (mood === 'N') { setAvatarImage(white_cat); } else if (mood === 'H') { @@ -295,7 +332,7 @@ const PetDisplay = () => { setAvatarImage(white_S_gif); } return - case 3: + case 5: if (mood === 'N') { setAvatarImage(tux_cat); } else if (mood === 'H') { @@ -306,9 +343,9 @@ const PetDisplay = () => { setAvatarImage(tux_S_gif); } return - case 4: + case 6: setAvatarImage(pet_rock); - return; + return // case 2: // if(mood==='N'){ // setAvatarImage(orange_cat); @@ -407,7 +444,7 @@ const PetDisplay = () => { return (
- + Date: Fri, 5 Dec 2025 00:29:54 -0500 Subject: [PATCH 7/7] Added new background, images for click reaction, icon image, and made additional changes to the layout for the main page. --- pocs-capstone/backend/db/models.py | 2 +- .../public/android-chrome-dog-192x192.png | Bin 0 -> 7495 bytes .../public/android-chrome-dog-512x512.png | Bin 0 -> 13911 bytes .../frontend/public/apple-touch-icon-dog.png | Bin 0 -> 7752 bytes .../frontend/public/brown_dog_logo_8x.png | Bin 0 -> 3740 bytes .../frontend/public/favicon-dog-16x16.png | Bin 0 -> 561 bytes .../frontend/public/favicon-dog-32x32.png | Bin 0 -> 1299 bytes pocs-capstone/frontend/public/favicon_dog.ico | Bin 0 -> 15406 bytes pocs-capstone/frontend/public/index.html | 10 +++++----- .../frontend/src/components/AccountPage.css | 1 + .../CalendarMobile/CalendarPageMobile.css | 14 +++++++------- .../src/components/CanvasIntegrationPage.css | 3 +++ .../src/components/CanvasIntegrationPage.js | 8 +++++--- .../src/components/Inventory/Inventory.css | 3 ++- .../src/components/PageDisplay/PageDisplay.css | 5 +++-- .../src/components/PetDisplay/PetDisplay.css | 2 ++ .../src/components/PetDisplay/PetDisplay.js | 6 +++--- .../frontend/src/images/background.png | Bin 0 -> 467472 bytes .../frontend/src/images/background2.png | Bin 0 -> 630365 bytes .../frontend/src/images/background3.png | Bin 0 -> 352302 bytes .../src/images/brown_dog_hi_b_scaled_8x.png | Bin 0 -> 3754 bytes .../src/images/brown_dog_hi_scaled_8x.png | Bin 0 -> 3764 bytes .../src/images/white_dog_hi_b_scaled_8x.png | Bin 0 -> 3415 bytes .../src/images/white_dog_hi_scaled_8x.png | Bin 0 -> 3430 bytes 24 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 pocs-capstone/frontend/public/android-chrome-dog-192x192.png create mode 100644 pocs-capstone/frontend/public/android-chrome-dog-512x512.png create mode 100644 pocs-capstone/frontend/public/apple-touch-icon-dog.png create mode 100644 pocs-capstone/frontend/public/brown_dog_logo_8x.png create mode 100644 pocs-capstone/frontend/public/favicon-dog-16x16.png create mode 100644 pocs-capstone/frontend/public/favicon-dog-32x32.png create mode 100644 pocs-capstone/frontend/public/favicon_dog.ico create mode 100644 pocs-capstone/frontend/src/images/background.png create mode 100644 pocs-capstone/frontend/src/images/background2.png create mode 100644 pocs-capstone/frontend/src/images/background3.png create mode 100644 pocs-capstone/frontend/src/images/brown_dog_hi_b_scaled_8x.png create mode 100644 pocs-capstone/frontend/src/images/brown_dog_hi_scaled_8x.png create mode 100644 pocs-capstone/frontend/src/images/white_dog_hi_b_scaled_8x.png create mode 100644 pocs-capstone/frontend/src/images/white_dog_hi_scaled_8x.png diff --git a/pocs-capstone/backend/db/models.py b/pocs-capstone/backend/db/models.py index fa0ac1c2c..e1d31d900 100644 --- a/pocs-capstone/backend/db/models.py +++ b/pocs-capstone/backend/db/models.py @@ -136,7 +136,7 @@ class AvatarType(models.TextChoices): last_feed = models.DateField(default=None) pet_name = models.CharField(max_length=32, default='') flavour_text = models.TextField( - max_length=256, default='Welcome to Study Buddy!', blank=True, null=True) + max_length=256, default='Welcome to Task Pet!', blank=True, null=True) palette = models.IntegerField(default=0) def __str__(self): diff --git a/pocs-capstone/frontend/public/android-chrome-dog-192x192.png b/pocs-capstone/frontend/public/android-chrome-dog-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..7475b561a8ef3760405f1dd4c6d515997bb625a1 GIT binary patch literal 7495 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 literal 0 HcmV?d00001 diff --git a/pocs-capstone/frontend/public/android-chrome-dog-512x512.png b/pocs-capstone/frontend/public/android-chrome-dog-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..d499d80a754121607a4b420fb44cb8502ae18336 GIT binary patch literal 13911 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

G`AeBy0>N|qVp`+U}IGq;7 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 XK-31JHt<=p0X=s|f6*2ApI6{N%7WAr literal 0 HcmV?d00001 diff --git a/pocs-capstone/frontend/public/index.html b/pocs-capstone/frontend/public/index.html index bde92a407..e4aea7e9b 100644 --- a/pocs-capstone/frontend/public/index.html +++ b/pocs-capstone/frontend/public/index.html @@ -8,11 +8,11 @@ - + - - - + + + @@ -33,7 +33,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`. --> - Study Buddy + Task Pet diff --git a/pocs-capstone/frontend/src/components/AccountPage.css b/pocs-capstone/frontend/src/components/AccountPage.css index ae6b23811..e0e9c2583 100644 --- a/pocs-capstone/frontend/src/components/AccountPage.css +++ b/pocs-capstone/frontend/src/components/AccountPage.css @@ -21,6 +21,7 @@ display: flex; justify-content: center; align-items: center; + color: rgb(172, 65, 100); } .form-content { diff --git a/pocs-capstone/frontend/src/components/CalendarMobile/CalendarPageMobile.css b/pocs-capstone/frontend/src/components/CalendarMobile/CalendarPageMobile.css index f48b15c49..6e3b5ae26 100644 --- a/pocs-capstone/frontend/src/components/CalendarMobile/CalendarPageMobile.css +++ b/pocs-capstone/frontend/src/components/CalendarMobile/CalendarPageMobile.css @@ -62,7 +62,7 @@ .react-calendar__navigation button:enabled:hover, .react-calendar__navigation button:enabled:focus { /* background-color: #e6e6e6; */ - background-color: grey; + background-color: rgb(250, 217, 217); } .react-calendar__navigation button[disabled] { /* background-color: #f0f0f0; */ @@ -113,7 +113,7 @@ .react-calendar__tile:enabled:hover, .react-calendar__tile:enabled:focus { /* background-color: #e6e6e6; */ - background-color: grey; + background-color: rgb(250, 217, 217); } .react-calendar__tile--now { /* background: #ffff76; */ @@ -121,22 +121,22 @@ } .react-calendar__tile--now:enabled:hover, .react-calendar__tile--now:enabled:focus { - background: #ffffa9; + background: rgb(249, 76, 134); } .react-calendar__tile--hasActive { - background: #76baff; + background: palevioletred; } .react-calendar__tile--hasActive:enabled:hover, .react-calendar__tile--hasActive:enabled:focus { - background: #a9d4ff; + background: rgb(249, 76, 134); } .react-calendar__tile--active { - background: #6f48eb; + background: rgb(249, 76, 134); color: white; } .react-calendar__tile--active:enabled:hover, .react-calendar__tile--active:enabled:focus { - background: #1087ff; + background: rgb(249, 76, 134); } .react-calendar--selectRange .react-calendar__tile--hover { background-color: #e6e6e6; diff --git a/pocs-capstone/frontend/src/components/CanvasIntegrationPage.css b/pocs-capstone/frontend/src/components/CanvasIntegrationPage.css index 3e8484c85..224ccee59 100644 --- a/pocs-capstone/frontend/src/components/CanvasIntegrationPage.css +++ b/pocs-capstone/frontend/src/components/CanvasIntegrationPage.css @@ -58,6 +58,9 @@ align-items: stretch; justify-content: flex-start; flex-direction: column; + border: 8px rgb(172, 65, 100) solid; + border-radius: 35px; + padding: 10px; } @media (max-width: 1130px){ diff --git a/pocs-capstone/frontend/src/components/CanvasIntegrationPage.js b/pocs-capstone/frontend/src/components/CanvasIntegrationPage.js index bd302ffcf..0398478c7 100644 --- a/pocs-capstone/frontend/src/components/CanvasIntegrationPage.js +++ b/pocs-capstone/frontend/src/components/CanvasIntegrationPage.js @@ -149,13 +149,13 @@ const CanvasIntegrationPage = () => { {/* */} {/* */}
-

ADD YOUR CANVAS ACCOUNT!

+

ADD YOUR CANVAS ACCOUNT!

{/* {" "} */} {/* */}
- Follow these steps to link your Canvas account with Study Buddy! {" "} + Follow these steps to link your Canvas account with Task Pet! {" "}

@@ -170,7 +170,7 @@ const CanvasIntegrationPage = () => { bottom!

Select "New access token".

+ New access token -

4. Enter a purpose and expiration date (ex. study buddy, and +

4. Enter a purpose and expiration date (ex. task pet, and the end of your semester date).

Select "Generate token", and copy and paste it here!
@@ -190,6 +190,7 @@ const CanvasIntegrationPage = () => { {