From 39550541697691f03efd0cf2e980c2077b09933d Mon Sep 17 00:00:00 2001
From: Aarushi <72608824+aarushi353@users.noreply.github.com>
Date: Sat, 1 Jul 2023 15:54:04 +0530
Subject: [PATCH 01/14] buttons
---
Client/package-lock.json | 4 ++--
Client/src/App.js | 5 ++++-
Client/src/assets/buttons.css | 14 ++++++++++++++
Client/src/components/onboarding/button-choice.js | 12 ++++++++++++
Client/src/components/onboarding/button-submit.js | 12 ++++++++++++
5 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 Client/src/components/onboarding/button-choice.js
create mode 100644 Client/src/components/onboarding/button-submit.js
diff --git a/Client/package-lock.json b/Client/package-lock.json
index e08c70f..b593492 100644
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
@@ -1,11 +1,11 @@
{
- "name": "indrivepal",
+ "name": "Client",
"version": "0.1.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
- "name": "indrivepal",
+ "name": "Client",
"version": "0.1.0",
"dependencies": {
"@testing-library/jest-dom": "^5.16.5",
diff --git a/Client/src/App.js b/Client/src/App.js
index f405c01..f0d904b 100644
--- a/Client/src/App.js
+++ b/Client/src/App.js
@@ -1,11 +1,14 @@
-import logo from './logo.svg';
import Login from './components/auth/login.js'
import './App.css';
+import Button from './components/onboarding/button-choice'
+import ButtonSubmit from './components/onboarding/button-submit'
function App() {
return (
+
+
);
}
diff --git a/Client/src/assets/buttons.css b/Client/src/assets/buttons.css
index e69de29..047447b 100644
--- a/Client/src/assets/buttons.css
+++ b/Client/src/assets/buttons.css
@@ -0,0 +1,14 @@
+.btn-choice{
+ border-radius: 3%;
+ border: 1.015px solid rgba(167, 233, 47, 0.70);
+ background: rgba(167, 233, 47, 0.20);
+ width: 80vw;
+
+}
+.btn-submit{
+ margin-top: 2px;
+ border-radius: 3%;
+ border: 1.015px solid rgba(167, 233, 47, 0.70);
+ background-color: #A7E92F;
+ width: 80vw;
+}
diff --git a/Client/src/components/onboarding/button-choice.js b/Client/src/components/onboarding/button-choice.js
new file mode 100644
index 0000000..2a2632f
--- /dev/null
+++ b/Client/src/components/onboarding/button-choice.js
@@ -0,0 +1,12 @@
+import "../../assets/buttons.css";
+const Button = (props) => {
+ return (
+
+
+
+ );
+};
+
+export default Button;
diff --git a/Client/src/components/onboarding/button-submit.js b/Client/src/components/onboarding/button-submit.js
new file mode 100644
index 0000000..4508589
--- /dev/null
+++ b/Client/src/components/onboarding/button-submit.js
@@ -0,0 +1,12 @@
+import "../../assets/buttons.css";
+const ButtonSubmit = (props) => {
+ return (
+
+
+
+ );
+};
+
+export default ButtonSubmit;
From fcffd810ef5fb94e51e92d599de035529555c6ae Mon Sep 17 00:00:00 2001
From: Aarushi <72608824+aarushi353@users.noreply.github.com>
Date: Sat, 1 Jul 2023 17:12:02 +0530
Subject: [PATCH 02/14] onboarding1, onboarding2 added
---
Client/package-lock.json | 558 +++++++++++++++++-
Client/package.json | 3 +
Client/src/App.js | 9 +-
Client/src/assets/buttons.css | 10 +-
Client/src/assets/onboarding.css | 13 +
.../components/onboarding/button-choice.js | 11 +-
.../src/components/onboarding/onboarding1.js | 44 ++
.../src/components/onboarding/onboarding2.js | 25 +
8 files changed, 658 insertions(+), 15 deletions(-)
create mode 100644 Client/src/assets/onboarding.css
create mode 100644 Client/src/components/onboarding/onboarding1.js
create mode 100644 Client/src/components/onboarding/onboarding2.js
diff --git a/Client/package-lock.json b/Client/package-lock.json
index b593492..3ffc2eb 100644
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
@@ -1,18 +1,22 @@
{
- "name": "Client",
+ "name": "client",
"version": "0.1.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
- "name": "Client",
+ "name": "client",
"version": "0.1.0",
"dependencies": {
+ "@emotion/react": "^11.11.1",
+ "@emotion/styled": "^11.11.0",
+ "@mui/material": "^5.13.6",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
+ "react-router-dom": "^5.2.0",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
}
@@ -2295,6 +2299,158 @@
"postcss-selector-parser": "^6.0.10"
}
},
+ "node_modules/@emotion/babel-plugin": {
+ "version": "11.11.0",
+ "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
+ "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
+ "dependencies": {
+ "@babel/helper-module-imports": "^7.16.7",
+ "@babel/runtime": "^7.18.3",
+ "@emotion/hash": "^0.9.1",
+ "@emotion/memoize": "^0.8.1",
+ "@emotion/serialize": "^1.1.2",
+ "babel-plugin-macros": "^3.1.0",
+ "convert-source-map": "^1.5.0",
+ "escape-string-regexp": "^4.0.0",
+ "find-root": "^1.1.0",
+ "source-map": "^0.5.7",
+ "stylis": "4.2.0"
+ }
+ },
+ "node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@emotion/babel-plugin/node_modules/source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/@emotion/cache": {
+ "version": "11.11.0",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
+ "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==",
+ "dependencies": {
+ "@emotion/memoize": "^0.8.1",
+ "@emotion/sheet": "^1.2.2",
+ "@emotion/utils": "^1.2.1",
+ "@emotion/weak-memoize": "^0.3.1",
+ "stylis": "4.2.0"
+ }
+ },
+ "node_modules/@emotion/hash": {
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
+ "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
+ },
+ "node_modules/@emotion/is-prop-valid": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
+ "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
+ "dependencies": {
+ "@emotion/memoize": "^0.8.1"
+ }
+ },
+ "node_modules/@emotion/memoize": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+ "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+ },
+ "node_modules/@emotion/react": {
+ "version": "11.11.1",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.1.tgz",
+ "integrity": "sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA==",
+ "dependencies": {
+ "@babel/runtime": "^7.18.3",
+ "@emotion/babel-plugin": "^11.11.0",
+ "@emotion/cache": "^11.11.0",
+ "@emotion/serialize": "^1.1.2",
+ "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
+ "@emotion/utils": "^1.2.1",
+ "@emotion/weak-memoize": "^0.3.1",
+ "hoist-non-react-statics": "^3.3.1"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@emotion/serialize": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.2.tgz",
+ "integrity": "sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==",
+ "dependencies": {
+ "@emotion/hash": "^0.9.1",
+ "@emotion/memoize": "^0.8.1",
+ "@emotion/unitless": "^0.8.1",
+ "@emotion/utils": "^1.2.1",
+ "csstype": "^3.0.2"
+ }
+ },
+ "node_modules/@emotion/sheet": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz",
+ "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA=="
+ },
+ "node_modules/@emotion/styled": {
+ "version": "11.11.0",
+ "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.11.0.tgz",
+ "integrity": "sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==",
+ "dependencies": {
+ "@babel/runtime": "^7.18.3",
+ "@emotion/babel-plugin": "^11.11.0",
+ "@emotion/is-prop-valid": "^1.2.1",
+ "@emotion/serialize": "^1.1.2",
+ "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
+ "@emotion/utils": "^1.2.1"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.0.0-rc.0",
+ "react": ">=16.8.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@emotion/unitless": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
+ "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
+ },
+ "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
+ "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",
+ "peerDependencies": {
+ "react": ">=16.8.0"
+ }
+ },
+ "node_modules/@emotion/utils": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz",
+ "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg=="
+ },
+ "node_modules/@emotion/weak-memoize": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz",
+ "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
+ },
"node_modules/@eslint-community/eslint-utils": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -3158,6 +3314,237 @@
"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
},
+ "node_modules/@mui/base": {
+ "version": "5.0.0-beta.5",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.5.tgz",
+ "integrity": "sha512-vy3TWLQYdGNecTaufR4wDNQFV2WEg6wRPi6BVbx6q1vP3K1mbxIn1+XOqOzfYBXjFHvMx0gZAo2TgWbaqfgvAA==",
+ "dependencies": {
+ "@babel/runtime": "^7.22.5",
+ "@emotion/is-prop-valid": "^1.2.1",
+ "@mui/types": "^7.2.4",
+ "@mui/utils": "^5.13.6",
+ "@popperjs/core": "^2.11.8",
+ "clsx": "^1.2.1",
+ "prop-types": "^15.8.1",
+ "react-is": "^18.2.0"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui"
+ },
+ "peerDependencies": {
+ "@types/react": "^17.0.0 || ^18.0.0",
+ "react": "^17.0.0 || ^18.0.0",
+ "react-dom": "^17.0.0 || ^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@mui/base/node_modules/react-is": {
+ "version": "18.2.0",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+ },
+ "node_modules/@mui/core-downloads-tracker": {
+ "version": "5.13.4",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.13.4.tgz",
+ "integrity": "sha512-yFrMWcrlI0TqRN5jpb6Ma9iI7sGTHpytdzzL33oskFHNQ8UgrtPas33Y1K7sWAMwCrr1qbWDrOHLAQG4tAzuSw==",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui"
+ }
+ },
+ "node_modules/@mui/material": {
+ "version": "5.13.6",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.13.6.tgz",
+ "integrity": "sha512-/c2ZApeQm2sTYdQXjqEnldaBMBcUEiyu2VRS6bS39ZeNaAcCLBQbYocLR46R+f0S5dgpBzB0T4AsOABPOFYZ5Q==",
+ "dependencies": {
+ "@babel/runtime": "^7.22.5",
+ "@mui/base": "5.0.0-beta.5",
+ "@mui/core-downloads-tracker": "^5.13.4",
+ "@mui/system": "^5.13.6",
+ "@mui/types": "^7.2.4",
+ "@mui/utils": "^5.13.6",
+ "@types/react-transition-group": "^4.4.6",
+ "clsx": "^1.2.1",
+ "csstype": "^3.1.2",
+ "prop-types": "^15.8.1",
+ "react-is": "^18.2.0",
+ "react-transition-group": "^4.4.5"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.5.0",
+ "@emotion/styled": "^11.3.0",
+ "@types/react": "^17.0.0 || ^18.0.0",
+ "react": "^17.0.0 || ^18.0.0",
+ "react-dom": "^17.0.0 || ^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@emotion/react": {
+ "optional": true
+ },
+ "@emotion/styled": {
+ "optional": true
+ },
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@mui/material/node_modules/react-is": {
+ "version": "18.2.0",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+ },
+ "node_modules/@mui/private-theming": {
+ "version": "5.13.1",
+ "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.13.1.tgz",
+ "integrity": "sha512-HW4npLUD9BAkVppOUZHeO1FOKUJWAwbpy0VQoGe3McUYTlck1HezGHQCfBQ5S/Nszi7EViqiimECVl9xi+/WjQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.21.0",
+ "@mui/utils": "^5.13.1",
+ "prop-types": "^15.8.1"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui"
+ },
+ "peerDependencies": {
+ "@types/react": "^17.0.0 || ^18.0.0",
+ "react": "^17.0.0 || ^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@mui/styled-engine": {
+ "version": "5.13.2",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.13.2.tgz",
+ "integrity": "sha512-VCYCU6xVtXOrIN8lcbuPmoG+u7FYuOERG++fpY74hPpEWkyFQG97F+/XfTQVYzlR2m7nPjnwVUgATcTCMEaMvw==",
+ "dependencies": {
+ "@babel/runtime": "^7.21.0",
+ "@emotion/cache": "^11.11.0",
+ "csstype": "^3.1.2",
+ "prop-types": "^15.8.1"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.4.1",
+ "@emotion/styled": "^11.3.0",
+ "react": "^17.0.0 || ^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@emotion/react": {
+ "optional": true
+ },
+ "@emotion/styled": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@mui/system": {
+ "version": "5.13.6",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.13.6.tgz",
+ "integrity": "sha512-G3Xr28uLqU3DyF6r2LQkHGw/ku4P0AHzlKVe7FGXOPl7X1u+hoe2xxj8Vdiq/69II/mh9OP21i38yBWgWb7WgQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.22.5",
+ "@mui/private-theming": "^5.13.1",
+ "@mui/styled-engine": "^5.13.2",
+ "@mui/types": "^7.2.4",
+ "@mui/utils": "^5.13.6",
+ "clsx": "^1.2.1",
+ "csstype": "^3.1.2",
+ "prop-types": "^15.8.1"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.5.0",
+ "@emotion/styled": "^11.3.0",
+ "@types/react": "^17.0.0 || ^18.0.0",
+ "react": "^17.0.0 || ^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@emotion/react": {
+ "optional": true
+ },
+ "@emotion/styled": {
+ "optional": true
+ },
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@mui/types": {
+ "version": "7.2.4",
+ "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.4.tgz",
+ "integrity": "sha512-LBcwa8rN84bKF+f5sDyku42w1NTxaPgPyYKODsh01U1fVstTClbUoSA96oyRBnSNyEiAVjKm6Gwx9vjR+xyqHA==",
+ "peerDependencies": {
+ "@types/react": "*"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@mui/utils": {
+ "version": "5.13.6",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.13.6.tgz",
+ "integrity": "sha512-ggNlxl5NPSbp+kNcQLmSig6WVB0Id+4gOxhx644987v4fsji+CSXc+MFYLocFB/x4oHtzCUlSzbVHlJfP/fXoQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.22.5",
+ "@types/prop-types": "^15.7.5",
+ "@types/react-is": "^18.2.0",
+ "prop-types": "^15.8.1",
+ "react-is": "^18.2.0"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui"
+ },
+ "peerDependencies": {
+ "react": "^17.0.0 || ^18.0.0"
+ }
+ },
+ "node_modules/@mui/utils/node_modules/react-is": {
+ "version": "18.2.0",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+ },
"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
"version": "5.1.1-v1",
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -3267,6 +3654,15 @@
}
}
},
+ "node_modules/@popperjs/core": {
+ "version": "2.11.8",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+ "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/popperjs"
+ }
+ },
"node_modules/@rollup/plugin-babel": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -4375,6 +4771,22 @@
"@types/react": "*"
}
},
+ "node_modules/@types/react-is": {
+ "version": "18.2.1",
+ "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-18.2.1.tgz",
+ "integrity": "sha512-wyUkmaaSZEzFZivD8F2ftSyAfk6L+DfFliVj/mYdOXbVjRcS87fQJLTnhk6dRZPuJjI+9g6RZJO4PNCngUrmyw==",
+ "dependencies": {
+ "@types/react": "*"
+ }
+ },
+ "node_modules/@types/react-transition-group": {
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz",
+ "integrity": "sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==",
+ "dependencies": {
+ "@types/react": "*"
+ }
+ },
"node_modules/@types/resolve": {
"version": "1.17.1",
"resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
@@ -5958,6 +6370,14 @@
"wrap-ansi": "^7.0.0"
}
},
+ "node_modules/clsx": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
+ "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -6877,6 +7297,15 @@
"utila": "~0.4"
}
},
+ "node_modules/dom-helpers": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+ "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+ "dependencies": {
+ "@babel/runtime": "^7.8.7",
+ "csstype": "^3.0.2"
+ }
+ },
"node_modules/dom-serializer": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
@@ -8208,6 +8637,11 @@
"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
}
},
+ "node_modules/find-root": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+ "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+ },
"node_modules/find-up": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -8842,6 +9276,32 @@
"he": "bin/he"
}
},
+ "node_modules/history": {
+ "version": "4.10.1",
+ "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+ "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+ "dependencies": {
+ "@babel/runtime": "^7.1.2",
+ "loose-envify": "^1.2.0",
+ "resolve-pathname": "^3.0.0",
+ "tiny-invariant": "^1.0.2",
+ "tiny-warning": "^1.0.0",
+ "value-equal": "^1.0.1"
+ }
+ },
+ "node_modules/hoist-non-react-statics": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+ "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+ "dependencies": {
+ "react-is": "^16.7.0"
+ }
+ },
+ "node_modules/hoist-non-react-statics/node_modules/react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+ },
"node_modules/hoopy": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
@@ -14512,6 +14972,60 @@
"node": ">=0.10.0"
}
},
+ "node_modules/react-router": {
+ "version": "5.3.4",
+ "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
+ "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
+ "dependencies": {
+ "@babel/runtime": "^7.12.13",
+ "history": "^4.9.0",
+ "hoist-non-react-statics": "^3.1.0",
+ "loose-envify": "^1.3.1",
+ "path-to-regexp": "^1.7.0",
+ "prop-types": "^15.6.2",
+ "react-is": "^16.6.0",
+ "tiny-invariant": "^1.0.2",
+ "tiny-warning": "^1.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=15"
+ }
+ },
+ "node_modules/react-router-dom": {
+ "version": "5.3.4",
+ "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz",
+ "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.12.13",
+ "history": "^4.9.0",
+ "loose-envify": "^1.3.1",
+ "prop-types": "^15.6.2",
+ "react-router": "5.3.4",
+ "tiny-invariant": "^1.0.2",
+ "tiny-warning": "^1.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=15"
+ }
+ },
+ "node_modules/react-router/node_modules/isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+ },
+ "node_modules/react-router/node_modules/path-to-regexp": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+ "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+ "dependencies": {
+ "isarray": "0.0.1"
+ }
+ },
+ "node_modules/react-router/node_modules/react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+ },
"node_modules/react-scripts": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
@@ -14584,6 +15098,21 @@
}
}
},
+ "node_modules/react-transition-group": {
+ "version": "4.4.5",
+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+ "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+ "dependencies": {
+ "@babel/runtime": "^7.5.5",
+ "dom-helpers": "^5.0.1",
+ "loose-envify": "^1.4.0",
+ "prop-types": "^15.6.2"
+ },
+ "peerDependencies": {
+ "react": ">=16.6.0",
+ "react-dom": ">=16.6.0"
+ }
+ },
"node_modules/read-cache": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -14800,6 +15329,11 @@
"node": ">=8"
}
},
+ "node_modules/resolve-pathname": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
+ "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
+ },
"node_modules/resolve-url-loader": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
@@ -15724,6 +16258,11 @@
"postcss": "^8.2.15"
}
},
+ "node_modules/stylis": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
+ "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
+ },
"node_modules/sucrase": {
"version": "3.32.0",
"resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
@@ -16113,6 +16652,16 @@
"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
},
+ "node_modules/tiny-invariant": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
+ "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw=="
+ },
+ "node_modules/tiny-warning": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+ "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+ },
"node_modules/tmpl": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -16508,6 +17057,11 @@
"node": ">=10.12.0"
}
},
+ "node_modules/value-equal": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
+ "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
+ },
"node_modules/vary": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
diff --git a/Client/package.json b/Client/package.json
index 741218f..2998feb 100644
--- a/Client/package.json
+++ b/Client/package.json
@@ -3,6 +3,9 @@
"version": "0.1.0",
"private": true,
"dependencies": {
+ "@emotion/react": "^11.11.1",
+ "@emotion/styled": "^11.11.0",
+ "@mui/material": "^5.13.6",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
diff --git a/Client/src/App.js b/Client/src/App.js
index f0d904b..77f3e41 100644
--- a/Client/src/App.js
+++ b/Client/src/App.js
@@ -1,14 +1,9 @@
-import Login from './components/auth/login.js'
-import './App.css';
-import Button from './components/onboarding/button-choice'
-import ButtonSubmit from './components/onboarding/button-submit'
+import Onboarding1 from './components/onboarding/onboarding1.js';
function App() {
return (
-
-
-
+
);
}
diff --git a/Client/src/assets/buttons.css b/Client/src/assets/buttons.css
index 047447b..334a9bb 100644
--- a/Client/src/assets/buttons.css
+++ b/Client/src/assets/buttons.css
@@ -1,13 +1,17 @@
.btn-choice{
- border-radius: 3%;
+ margin-top: 1vh;
+ border-radius: 1em;
border: 1.015px solid rgba(167, 233, 47, 0.70);
background: rgba(167, 233, 47, 0.20);
width: 80vw;
-
+ padding-left: 5%;
+ text-align: left;
+ display: flex;
+ flex-direction: row;
}
.btn-submit{
margin-top: 2px;
- border-radius: 3%;
+ border-radius: 1em;
border: 1.015px solid rgba(167, 233, 47, 0.70);
background-color: #A7E92F;
width: 80vw;
diff --git a/Client/src/assets/onboarding.css b/Client/src/assets/onboarding.css
new file mode 100644
index 0000000..5e19d52
--- /dev/null
+++ b/Client/src/assets/onboarding.css
@@ -0,0 +1,13 @@
+@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@500&display=swap");
+
+p {
+ color: #323844;
+ font-family: 'Poppins', sans-serif;
+ font-style: normal;
+ font-weight: 700;
+ line-height: 36.54px;
+}
+.onboarding {
+ display: flex;
+ flex-direction: column;
+}
diff --git a/Client/src/components/onboarding/button-choice.js b/Client/src/components/onboarding/button-choice.js
index 2a2632f..80eb4db 100644
--- a/Client/src/components/onboarding/button-choice.js
+++ b/Client/src/components/onboarding/button-choice.js
@@ -1,12 +1,17 @@
import "../../assets/buttons.css";
-const Button = (props) => {
+import Checkbox from "@mui/material/Checkbox";
+
+const label = { inputProps: { "aria-label": "Checkbox demo" } };
+
+const ButtonChoice = (props) => {
return (
-
{props.label}
+
+
{props.label}
);
};
-export default Button;
+export default ButtonChoice;
diff --git a/Client/src/components/onboarding/onboarding1.js b/Client/src/components/onboarding/onboarding1.js
new file mode 100644
index 0000000..b79c7c0
--- /dev/null
+++ b/Client/src/components/onboarding/onboarding1.js
@@ -0,0 +1,44 @@
+import "../../assets/onboarding.css";
+import React, { useState } from "react";
+import ButtonSubmit from "./button-submit";
+import Radio from '@mui/material/Radio';
+const Onboarding1 = (props) => {
+
+ const [selectedValue, setSelectedValue] = useState('a');
+
+ const handleChange = (event) => {
+ setSelectedValue(event.target.value);
+ };
+
+ const controlProps = (item) => ({
+ checked: selectedValue === item,
+ onChange: handleChange,
+ value: item,
+ name: 'color-radio-button-demo',
+ inputProps: { 'aria-label': item },
+ });
+
+ return (
+
+
+ Do you need specially abled features?
+
+
+
+
+
+
+
+ );
+};
+
+export default Onboarding1;
diff --git a/Client/src/components/onboarding/onboarding2.js b/Client/src/components/onboarding/onboarding2.js
new file mode 100644
index 0000000..95ea262
--- /dev/null
+++ b/Client/src/components/onboarding/onboarding2.js
@@ -0,0 +1,25 @@
+import "../../assets/onboarding.css";
+import ButtonChoice from "./button-choice";
+import ButtonSubmit from "./button-submit";
+
+const Onboarding2 = (props) => {
+ return (
+
+
+ Select your special need(s)?
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default Onboarding2;
From 0b2745a7d841bff6bff15c98f3624a8341f82074 Mon Sep 17 00:00:00 2001
From: Aarushi <72608824+aarushi353@users.noreply.github.com>
Date: Sat, 1 Jul 2023 17:49:57 +0530
Subject: [PATCH 03/14] icons added
---
Client/package-lock.json | 26 +++++++++
Client/package.json | 1 +
Client/src/assets/onboarding.css | 18 ++++++
.../src/components/onboarding/onboarding1.js | 32 +++++++++++
.../src/components/onboarding/onboarding2.js | 56 +++++++++++++++----
5 files changed, 121 insertions(+), 12 deletions(-)
diff --git a/Client/package-lock.json b/Client/package-lock.json
index 3ffc2eb..2184e21 100644
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
@@ -10,6 +10,7 @@
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
+ "@mui/icons-material": "^5.11.16",
"@mui/material": "^5.13.6",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
@@ -3360,6 +3361,31 @@
"url": "https://opencollective.com/mui"
}
},
+ "node_modules/@mui/icons-material": {
+ "version": "5.11.16",
+ "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.16.tgz",
+ "integrity": "sha512-oKkx9z9Kwg40NtcIajF9uOXhxiyTZrrm9nmIJ4UjkU2IdHpd4QVLbCc/5hZN/y0C6qzi2Zlxyr9TGddQx2vx2A==",
+ "dependencies": {
+ "@babel/runtime": "^7.21.0"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui"
+ },
+ "peerDependencies": {
+ "@mui/material": "^5.0.0",
+ "@types/react": "^17.0.0 || ^18.0.0",
+ "react": "^17.0.0 || ^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@mui/material": {
"version": "5.13.6",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.13.6.tgz",
diff --git a/Client/package.json b/Client/package.json
index 2998feb..5d292d8 100644
--- a/Client/package.json
+++ b/Client/package.json
@@ -5,6 +5,7 @@
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
+ "@mui/icons-material": "^5.11.16",
"@mui/material": "^5.13.6",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
diff --git a/Client/src/assets/onboarding.css b/Client/src/assets/onboarding.css
index 5e19d52..5d97aa8 100644
--- a/Client/src/assets/onboarding.css
+++ b/Client/src/assets/onboarding.css
@@ -7,7 +7,25 @@ p {
font-weight: 700;
line-height: 36.54px;
}
+
.onboarding {
display: flex;
flex-direction: column;
}
+
+.icons{
+ display: flex;
+ flex-direction: row;
+ margin-top: 2vh;
+ justify-content: space-between;
+}
+
+.arrow-back {
+ margin-left: 1vw;
+ align-self: flex-start;
+}
+
+.volume-icon {
+ margin-right: 1vw;
+ align-self: flex-end;
+}
\ No newline at end of file
diff --git a/Client/src/components/onboarding/onboarding1.js b/Client/src/components/onboarding/onboarding1.js
index b79c7c0..19977df 100644
--- a/Client/src/components/onboarding/onboarding1.js
+++ b/Client/src/components/onboarding/onboarding1.js
@@ -1,10 +1,26 @@
import "../../assets/onboarding.css";
import React, { useState } from "react";
import ButtonSubmit from "./button-submit";
+import ArrowBackIcon from '@mui/icons-material/ArrowBack';
+import VolumeMuteIcon from '@mui/icons-material/VolumeMute';
+import VolumeOffIcon from '@mui/icons-material/VolumeOff';
import Radio from '@mui/material/Radio';
+
const Onboarding1 = (props) => {
const [selectedValue, setSelectedValue] = useState('a');
+ const [showSoundOn, setShowSoundOn] = useState(true);
+ const [showSoundOff, setShowSoundOff] = useState(false);
+
+ const handleSoundOn = () => {
+ setShowSoundOn(false);
+ setShowSoundOff(true);
+ };
+
+ const handleSoundOff = () => {
+ setShowSoundOn(true);
+ setShowSoundOff(false);
+ };
const handleChange = (event) => {
setSelectedValue(event.target.value);
@@ -20,6 +36,22 @@ const Onboarding1 = (props) => {
return (
+
+
+
+ {showSoundOn && (
+
+
+
+ )}
+ {showSoundOff && (
+
+
+
+ )}
+
Do you need specially abled features?
diff --git a/Client/src/components/onboarding/onboarding2.js b/Client/src/components/onboarding/onboarding2.js
index 95ea262..515865d 100644
--- a/Client/src/components/onboarding/onboarding2.js
+++ b/Client/src/components/onboarding/onboarding2.js
@@ -1,22 +1,54 @@
-import "../../assets/onboarding.css";
-import ButtonChoice from "./button-choice";
-import ButtonSubmit from "./button-submit";
+import React, { useState } from 'react';
+import ArrowBackIcon from '@mui/icons-material/ArrowBack';
+import VolumeMuteIcon from '@mui/icons-material/VolumeMute';
+import VolumeOffIcon from '@mui/icons-material/VolumeOff';
+import ButtonChoice from './button-choice';
+import ButtonSubmit from './button-submit';
+import '../../assets/onboarding.css';
const Onboarding2 = (props) => {
+ const [showSoundOn, setShowSoundOn] = useState(true);
+ const [showSoundOff, setShowSoundOff] = useState(false);
+
+ const handleSoundOn = () => {
+ setShowSoundOn(false);
+ setShowSoundOff(true);
+ };
+
+ const handleSoundOff = () => {
+ setShowSoundOn(true);
+ setShowSoundOff(false);
+ };
+
return (
+
+
+
+ {showSoundOn && (
+
+
+
+ )}
+ {showSoundOff && (
+
+
+
+ )}
+
- Select your special need(s)?
+ Select your special need(s)?
-
-
-
-
-
-
+
+
+
+
+
-
);
From c167ffb06bc6707c292e255a9aa58d90fad97e5e Mon Sep 17 00:00:00 2001
From: Aarushi <72608824+aarushi353@users.noreply.github.com>
Date: Sat, 1 Jul 2023 21:15:45 +0530
Subject: [PATCH 04/14] onboarding3
---
Client/src/App.js | 4 +-
Client/src/assets/images/onboarding3.png | Bin 0 -> 7159 bytes
Client/src/assets/onboarding.css | 7 ++-
.../src/components/onboarding/onboarding3.js | 56 ++++++++++++++++++
4 files changed, 64 insertions(+), 3 deletions(-)
create mode 100644 Client/src/assets/images/onboarding3.png
create mode 100644 Client/src/components/onboarding/onboarding3.js
diff --git a/Client/src/App.js b/Client/src/App.js
index 77f3e41..3365bce 100644
--- a/Client/src/App.js
+++ b/Client/src/App.js
@@ -1,9 +1,9 @@
-import Onboarding1 from './components/onboarding/onboarding1.js';
+import Onboarding3 from './components/onboarding/onboarding3.js';
function App() {
return (
-
+
);
}
diff --git a/Client/src/assets/images/onboarding3.png b/Client/src/assets/images/onboarding3.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a23744672b99bea728aea6ace799cba1862b175
GIT binary patch
literal 7159
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 {
+ const [showSoundOn, setShowSoundOn] = useState(true);
+ const [showSoundOff, setShowSoundOff] = useState(false);
+
+ const handleSoundOn = () => {
+ setShowSoundOn(false);
+ setShowSoundOff(true);
+ };
+
+ const handleSoundOff = () => {
+ setShowSoundOn(true);
+ setShowSoundOff(false);
+ };
+
+ return (
+
+
+
+
+ {showSoundOn && (
+
+
+
+ )}
+ {showSoundOff && (
+
+
+
+ )}
+
+

+
+ We store your personal data securely
+
+
+ To use the app, please allow us to collect info about other installed apps on your device and share it with our service providers.
+ This information will be used for fraud prevention and data analysis.
+
+
+
+
+
+ );
+};
+
+export default Onboarding3;
From c81fff308a53d6e3c84fd53ad7e0e687cea7780f Mon Sep 17 00:00:00 2001
From: Aarushi <72608824+aarushi353@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:47:30 +0530
Subject: [PATCH 05/14] locationcheck
---
Client/src/App.js | 4 ++--
Client/src/assets/buttons.css | 1 -
Client/src/assets/images/loc-check.png | Bin 0 -> 8093 bytes
Client/src/assets/onboarding.css | 13 ++++++++---
.../components/onboarding/locationCheck.js | 21 ++++++++++++++++++
.../src/components/onboarding/onboarding1.js | 8 +++----
.../src/components/onboarding/onboarding2.js | 4 ++--
.../src/components/onboarding/onboarding3.js | 6 ++---
8 files changed, 42 insertions(+), 15 deletions(-)
create mode 100644 Client/src/assets/images/loc-check.png
create mode 100644 Client/src/components/onboarding/locationCheck.js
diff --git a/Client/src/App.js b/Client/src/App.js
index 3365bce..77f3e41 100644
--- a/Client/src/App.js
+++ b/Client/src/App.js
@@ -1,9 +1,9 @@
-import Onboarding3 from './components/onboarding/onboarding3.js';
+import Onboarding1 from './components/onboarding/onboarding1.js';
function App() {
return (
-
+
);
}
diff --git a/Client/src/assets/buttons.css b/Client/src/assets/buttons.css
index 334a9bb..a55bf4d 100644
--- a/Client/src/assets/buttons.css
+++ b/Client/src/assets/buttons.css
@@ -10,7 +10,6 @@
flex-direction: row;
}
.btn-submit{
- margin-top: 2px;
border-radius: 1em;
border: 1.015px solid rgba(167, 233, 47, 0.70);
background-color: #A7E92F;
diff --git a/Client/src/assets/images/loc-check.png b/Client/src/assets/images/loc-check.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b79ae61f0b1fbc4c8dd0b34d1f1b69625cb1a04
GIT binary patch
literal 8093
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
Q$lY{+lAJnn@>s(E4^DYPkN^Mx
literal 0
HcmV?d00001
diff --git a/Client/src/assets/onboarding.css b/Client/src/assets/onboarding.css
index 626e2ab..5a641a7 100644
--- a/Client/src/assets/onboarding.css
+++ b/Client/src/assets/onboarding.css
@@ -15,17 +15,17 @@ p {
.icons{
display: flex;
flex-direction: row;
- margin-top: 2vh;
+ margin-top: 4vh;
justify-content: space-between;
}
.arrow-back {
- margin-left: 1vw;
+ margin-left: 2vw;
align-self: flex-start;
}
.volume-icon {
- margin-right: 1vw;
+ margin-right: 2vw;
align-self: flex-end;
}
@@ -33,4 +33,11 @@ p {
margin-left: 5vw;
margin-right: 5vw;
text-justify: inter-word;
+}
+
+.btn{
+ bottom: 0;
+ position: absolute;
+ align-self: center;
+ margin-bottom: 10px;
}
\ No newline at end of file
diff --git a/Client/src/components/onboarding/locationCheck.js b/Client/src/components/onboarding/locationCheck.js
new file mode 100644
index 0000000..55b4f5a
--- /dev/null
+++ b/Client/src/components/onboarding/locationCheck.js
@@ -0,0 +1,21 @@
+import React from "react";
+import ButtonSubmit from "./button-submit";
+import locationicon from '../../assets/images/loc-check.png';
+import "../../assets/onboarding.css";
+
+const LocationCheck = () => {
+ return (
+
+
+ Are you in this city?
+
+

+
Edit
+
+
+
+
+ );
+};
+
+export default LocationCheck;
diff --git a/Client/src/components/onboarding/onboarding1.js b/Client/src/components/onboarding/onboarding1.js
index 19977df..1595a0c 100644
--- a/Client/src/components/onboarding/onboarding1.js
+++ b/Client/src/components/onboarding/onboarding1.js
@@ -57,17 +57,17 @@ const Onboarding1 = (props) => {
-
);
diff --git a/Client/src/components/onboarding/onboarding2.js b/Client/src/components/onboarding/onboarding2.js
index 515865d..f9c1da5 100644
--- a/Client/src/components/onboarding/onboarding2.js
+++ b/Client/src/components/onboarding/onboarding2.js
@@ -47,8 +47,8 @@ const Onboarding2 = (props) => {
-
);
diff --git a/Client/src/components/onboarding/onboarding3.js b/Client/src/components/onboarding/onboarding3.js
index 4480bc0..070a504 100644
--- a/Client/src/components/onboarding/onboarding3.js
+++ b/Client/src/components/onboarding/onboarding3.js
@@ -38,7 +38,7 @@ const Onboarding3 = () => {
)}
-
+
We store your personal data securely
@@ -46,8 +46,8 @@ const Onboarding3 = () => {
To use the app, please allow us to collect info about other installed apps on your device and share it with our service providers.
This information will be used for fraud prevention and data analysis.
-
);
From eaa075c30d27e2d4a98fd5e031badd85878213f1 Mon Sep 17 00:00:00 2001
From: Aarushi <72608824+aarushi353@users.noreply.github.com>
Date: Sat, 1 Jul 2023 23:08:03 +0530
Subject: [PATCH 06/14] minor css refinement
---
Client/src/App.js | 4 +-
Client/src/assets/buttons.css | 1 +
.../components/onboarding/button-choice.js | 13 ++-
.../src/components/onboarding/onboarding1.js | 81 ++++++++++++-------
.../src/components/onboarding/onboarding2.js | 4 +-
5 files changed, 67 insertions(+), 36 deletions(-)
diff --git a/Client/src/App.js b/Client/src/App.js
index 77f3e41..d99c295 100644
--- a/Client/src/App.js
+++ b/Client/src/App.js
@@ -1,9 +1,9 @@
-import Onboarding1 from './components/onboarding/onboarding1.js';
+import Onboarding2 from './components/onboarding/onboarding2.js';
function App() {
return (
-
+
);
}
diff --git a/Client/src/assets/buttons.css b/Client/src/assets/buttons.css
index a55bf4d..4949eca 100644
--- a/Client/src/assets/buttons.css
+++ b/Client/src/assets/buttons.css
@@ -7,6 +7,7 @@
padding-left: 5%;
text-align: left;
display: flex;
+ font-weight: 200;
flex-direction: row;
}
.btn-submit{
diff --git a/Client/src/components/onboarding/button-choice.js b/Client/src/components/onboarding/button-choice.js
index 80eb4db..aa91204 100644
--- a/Client/src/components/onboarding/button-choice.js
+++ b/Client/src/components/onboarding/button-choice.js
@@ -7,8 +7,17 @@ const ButtonChoice = (props) => {
return (
-
-
{props.label}
+
+
{props.label}
);
diff --git a/Client/src/components/onboarding/onboarding1.js b/Client/src/components/onboarding/onboarding1.js
index 1595a0c..b17459f 100644
--- a/Client/src/components/onboarding/onboarding1.js
+++ b/Client/src/components/onboarding/onboarding1.js
@@ -1,14 +1,13 @@
import "../../assets/onboarding.css";
import React, { useState } from "react";
import ButtonSubmit from "./button-submit";
-import ArrowBackIcon from '@mui/icons-material/ArrowBack';
-import VolumeMuteIcon from '@mui/icons-material/VolumeMute';
-import VolumeOffIcon from '@mui/icons-material/VolumeOff';
-import Radio from '@mui/material/Radio';
+import ArrowBackIcon from "@mui/icons-material/ArrowBack";
+import VolumeMuteIcon from "@mui/icons-material/VolumeMute";
+import VolumeOffIcon from "@mui/icons-material/VolumeOff";
+import Radio from "@mui/material/Radio";
const Onboarding1 = (props) => {
-
- const [selectedValue, setSelectedValue] = useState('a');
+ const [selectedValue, setSelectedValue] = useState("a");
const [showSoundOn, setShowSoundOn] = useState(true);
const [showSoundOff, setShowSoundOff] = useState(false);
@@ -30,8 +29,8 @@ const Onboarding1 = (props) => {
checked: selectedValue === item,
onChange: handleChange,
value: item,
- name: 'color-radio-button-demo',
- inputProps: { 'aria-label': item },
+ name: "color-radio-button-demo",
+ inputProps: { "aria-label": item },
});
return (
@@ -41,33 +40,55 @@ const Onboarding1 = (props) => {
- {showSoundOn && (
-
-
-
- )}
- {showSoundOff && (
-
-
-
- )}
+ {showSoundOn && (
+
+
+
+ )}
+ {showSoundOff && (
+
+
+
+ )}
+
- Do you need specially abled features?
+
+ Do you need specially abled features?
+
-
+
+
-
+
+
+
);
diff --git a/Client/src/components/onboarding/onboarding2.js b/Client/src/components/onboarding/onboarding2.js
index f9c1da5..3643394 100644
--- a/Client/src/components/onboarding/onboarding2.js
+++ b/Client/src/components/onboarding/onboarding2.js
@@ -6,7 +6,7 @@ import ButtonChoice from './button-choice';
import ButtonSubmit from './button-submit';
import '../../assets/onboarding.css';
-const Onboarding2 = (props) => {
+const Onboarding2 = () => {
const [showSoundOn, setShowSoundOn] = useState(true);
const [showSoundOff, setShowSoundOff] = useState(false);
@@ -42,7 +42,7 @@ const Onboarding2 = (props) => {
Select your special need(s)?
-
+
From 3329ea2ae1e0b54b91052e57121806f12a97b4e9 Mon Sep 17 00:00:00 2001
From: Aarushi <72608824+aarushi353@users.noreply.github.com>
Date: Sat, 1 Jul 2023 23:32:24 +0530
Subject: [PATCH 07/14] passenger-driver
---
Client/src/App.js | 5 ++--
Client/src/assets/buttons.css | 2 +-
Client/src/assets/images/passenger.png | Bin 0 -> 51060 bytes
Client/src/assets/onboarding.css | 28 ++++++++++++++----
.../components/onboarding/passenger-driver.js | 23 ++++++++++++++
5 files changed, 49 insertions(+), 9 deletions(-)
create mode 100644 Client/src/assets/images/passenger.png
create mode 100644 Client/src/components/onboarding/passenger-driver.js
diff --git a/Client/src/App.js b/Client/src/App.js
index d99c295..1c3cc43 100644
--- a/Client/src/App.js
+++ b/Client/src/App.js
@@ -1,11 +1,12 @@
-import Onboarding2 from './components/onboarding/onboarding2.js';
+import PassengerDriver from './components/onboarding/passenger-driver.js';
function App() {
return (
);
}
+
export default App;
diff --git a/Client/src/assets/buttons.css b/Client/src/assets/buttons.css
index 4949eca..f6a9b09 100644
--- a/Client/src/assets/buttons.css
+++ b/Client/src/assets/buttons.css
@@ -12,7 +12,7 @@
}
.btn-submit{
border-radius: 1em;
- border: 1.015px solid rgba(167, 233, 47, 0.70);
background-color: #A7E92F;
width: 80vw;
+ padding: 1%;
}
diff --git a/Client/src/assets/images/passenger.png b/Client/src/assets/images/passenger.png
new file mode 100644
index 0000000000000000000000000000000000000000..26cbb5a25bbc6c5d18a983e250cf2e076ebb4d98
GIT binary patch
literal 51060
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