From bc07be71673ef3b3e80fab67b7f84e3171d96408 Mon Sep 17 00:00:00 2001 From: MBP Date: Mon, 22 Aug 2022 14:18:52 -0400 Subject: [PATCH 1/6] the correct one --- client/package-lock.json | 115 +++++++++++++++++++------- client/src/screens/SignUp/SignUp.jsx | 6 +- client/src/screens/SignUp/SignUp.scss | 6 +- 3 files changed, 90 insertions(+), 37 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 462572fed..2eb07c24f 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -15005,6 +15005,19 @@ "is-typedarray": "^1.0.0" } }, + "node_modules/typescript": { + "version": "4.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", + "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/unbox-primitive": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", @@ -18910,12 +18923,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", @@ -19010,7 +19025,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": {} }, "alphanum-sort": { "version": "1.0.2", @@ -19330,7 +19346,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.0", @@ -20060,7 +20077,8 @@ "css-prefers-color-scheme": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.2.tgz", - "integrity": "sha512-gv0KQBEM+q/XdoKyznovq3KW7ocO7k+FhPP+hQR1MenJdu0uPGS6IZa9PzlbqBeS6XcZJNAoqoFxlAUW461CrA==" + "integrity": "sha512-gv0KQBEM+q/XdoKyznovq3KW7ocO7k+FhPP+hQR1MenJdu0uPGS6IZa9PzlbqBeS6XcZJNAoqoFxlAUW461CrA==", + "requires": {} }, "css-select": { "version": "4.2.1", @@ -20164,7 +20182,8 @@ "cssnano-utils": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.0.tgz", - "integrity": "sha512-Pzs7/BZ6OgT+tXXuF12DKR8SmSbzUeVYCtMBbS8lI0uAm3mrYmkyqCXXPsQESI6kmLfEVBppbdVY/el3hg3nAA==" + "integrity": "sha512-Pzs7/BZ6OgT+tXXuF12DKR8SmSbzUeVYCtMBbS8lI0uAm3mrYmkyqCXXPsQESI6kmLfEVBppbdVY/el3hg3nAA==", + "requires": {} }, "csso": { "version": "4.2.0", @@ -21057,7 +21076,8 @@ "eslint-plugin-react-hooks": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz", - "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==" + "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==", + "requires": {} }, "eslint-plugin-testing-library": { "version": "5.0.3", @@ -22010,7 +22030,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": "6.1.5", @@ -23033,7 +23054,8 @@ "jest-pnp-resolver": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", - "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==" + "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", + "requires": {} }, "jest-regex-util": { "version": "27.4.0", @@ -24571,7 +24593,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.2", @@ -24628,7 +24651,8 @@ "postcss-custom-media": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz", - "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==" + "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==", + "requires": {} }, "postcss-custom-properties": { "version": "12.1.2", @@ -24657,22 +24681,26 @@ "postcss-discard-comments": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz", - "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==" + "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==", + "requires": {} }, "postcss-discard-duplicates": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", - "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==" + "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", + "requires": {} }, "postcss-discard-empty": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz", - "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==" + "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==", + "requires": {} }, "postcss-discard-overridden": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.2.tgz", - "integrity": "sha512-+56BLP6NSSUuWUXjRgAQuho1p5xs/hU5Sw7+xt9S3JSg+7R6+WMGnJW7Hre/6tTuZ2xiXMB42ObkiZJ2hy/Pew==" + "integrity": "sha512-+56BLP6NSSUuWUXjRgAQuho1p5xs/hU5Sw7+xt9S3JSg+7R6+WMGnJW7Hre/6tTuZ2xiXMB42ObkiZJ2hy/Pew==", + "requires": {} }, "postcss-double-position-gradients": { "version": "3.0.4", @@ -24693,7 +24721,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.3", @@ -24714,12 +24743,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.2", "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.2.tgz", - "integrity": "sha512-EaMy/pbxtQnKDsnbEjdqlkCkROTQZzolcLKgIE+3b7EuJfJydH55cZeHfm+MtIezXRqhR80VKgaztO/vHq94Fw==" + "integrity": "sha512-EaMy/pbxtQnKDsnbEjdqlkCkROTQZzolcLKgIE+3b7EuJfJydH55cZeHfm+MtIezXRqhR80VKgaztO/vHq94Fw==", + "requires": {} }, "postcss-image-set-function": { "version": "4.0.4", @@ -24732,7 +24763,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.0", @@ -24772,12 +24804,14 @@ "postcss-logical": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.3.tgz", - "integrity": "sha512-P5NcHWYrif0vK8rgOy/T87vg0WRIj3HSknrvp1wzDbiBeoDPVmiVRmkown2eSQdpPveat/MC1ess5uhzZFVnqQ==" + "integrity": "sha512-P5NcHWYrif0vK8rgOy/T87vg0WRIj3HSknrvp1wzDbiBeoDPVmiVRmkown2eSQdpPveat/MC1ess5uhzZFVnqQ==", + "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.0.4", @@ -24840,7 +24874,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", @@ -24897,7 +24932,8 @@ "postcss-normalize-charset": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz", - "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==" + "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==", + "requires": {} }, "postcss-normalize-display-values": { "version": "5.0.2", @@ -24977,12 +25013,14 @@ "postcss-overflow-shorthand": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.2.tgz", - "integrity": "sha512-odBMVt6PTX7jOE9UNvmnLrFzA9pXS44Jd5shFGGtSHY80QCuJF+14McSy0iavZggRZ9Oj//C9vOKQmexvyEJMg==" + "integrity": "sha512-odBMVt6PTX7jOE9UNvmnLrFzA9pXS44Jd5shFGGtSHY80QCuJF+14McSy0iavZggRZ9Oj//C9vOKQmexvyEJMg==", + "requires": {} }, "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.3", @@ -25060,7 +25098,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": "5.0.0", @@ -25447,7 +25486,8 @@ "react-icons": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.3.1.tgz", - "integrity": "sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==" + "integrity": "sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==", + "requires": {} }, "react-is": { "version": "17.0.2", @@ -25595,12 +25635,14 @@ "redux-persist": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-6.0.0.tgz", - "integrity": "sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==" + "integrity": "sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==", + "requires": {} }, "redux-thunk": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz", - "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==" + "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==", + "requires": {} }, "regenerate": { "version": "1.4.2", @@ -26360,7 +26402,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": {} }, "style-to-js": { "version": "1.1.0", @@ -26819,6 +26862,12 @@ "is-typedarray": "^1.0.0" } }, + "typescript": { + "version": "4.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", + "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "peer": true + }, "unbox-primitive": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", @@ -27182,7 +27231,8 @@ "ws": { "version": "8.4.2", "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz", - "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==" + "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==", + "requires": {} } } }, @@ -27618,7 +27668,8 @@ "ws": { "version": "7.5.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz", - "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==" + "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==", + "requires": {} }, "xml-name-validator": { "version": "3.0.0", diff --git a/client/src/screens/SignUp/SignUp.jsx b/client/src/screens/SignUp/SignUp.jsx index fd17ea2e3..3cad73dcd 100644 --- a/client/src/screens/SignUp/SignUp.jsx +++ b/client/src/screens/SignUp/SignUp.jsx @@ -86,10 +86,10 @@ export const SignUp = () => { {/* {showModal && ( )} */} -

Create an account

+

Sign Up

- + { />
- + Date: Mon, 22 Aug 2022 14:50:04 -0400 Subject: [PATCH 2/6] finished with signup screen migration --- client/src/screens/SignUp/SignUp.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/screens/SignUp/SignUp.scss b/client/src/screens/SignUp/SignUp.scss index be1ce5493..63500827c 100644 --- a/client/src/screens/SignUp/SignUp.scss +++ b/client/src/screens/SignUp/SignUp.scss @@ -5,7 +5,7 @@ justify-content: center; padding-top: 80px; h3 { - margin-bottom: -4vh; + margin-bottom: -5vh; margin-top: -2vh; align-self: center; font-weight: 900; From 107dd6bfa4da5b01aff073b59f102a2922a0c562 Mon Sep 17 00:00:00 2001 From: MBP Date: Mon, 22 Aug 2022 20:00:49 -0400 Subject: [PATCH 3/6] added shadows --- client/src/screens/SignUp/SignUp.scss | 41 +++++++++++-------- .../src/screens/UserProfile/UserProfile.jsx | 7 ++-- .../src/screens/UserProfile/UserProfile.scss | 8 ++-- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/client/src/screens/SignUp/SignUp.scss b/client/src/screens/SignUp/SignUp.scss index 63500827c..09d0fe35c 100644 --- a/client/src/screens/SignUp/SignUp.scss +++ b/client/src/screens/SignUp/SignUp.scss @@ -4,36 +4,41 @@ font-family: 'Nunito', sans-serif; justify-content: center; padding-top: 80px; + .input-wrapper { + margin-top: 7px; + width: 100%; + } + a { + align-self: center; + color: black; + font-size: 12px; + font-style: italic; + } + h6 { + align-self: center; + } h3 { - margin-bottom: -5vh; - margin-top: -2vh; align-self: center; - font-weight: 900; + font-weight: 700; + font-size: 24px; + margin-bottom: -6vh; + margin-top: -2vh; text-align: center; width: max-content; } - label { - font-size: 14px; - font-weight: 300; - } input { border: solid black 1px; + box-shadow: 0.3px 1px darkgrey; height: 28px; padding-left: 7px; width: 100%; } - .input-wrapper { - margin-top: 7px; - width: 100%; - } - h6 { - align-self: center; + label { + font-size: 14px; + font-weight: 300; } - a { - align-self: center; - color: black; - font-size: 12px; - font-style: italic; + .SingleActionButton { + background-color: red; } } diff --git a/client/src/screens/UserProfile/UserProfile.jsx b/client/src/screens/UserProfile/UserProfile.jsx index da291c732..43fa0e82f 100644 --- a/client/src/screens/UserProfile/UserProfile.jsx +++ b/client/src/screens/UserProfile/UserProfile.jsx @@ -51,6 +51,8 @@ export const UserProfile = () => { const { about, email, fun_fact, first_name, last_name, role, _id: currUserId } = currUser; return (
+

Profile

+
im an image
{currUserId === reduxUser._id && }

@@ -58,8 +60,7 @@ export const UserProfile = () => {

{role}

-
im an image
- + {/* - + */}

About

diff --git a/client/src/screens/UserProfile/UserProfile.scss b/client/src/screens/UserProfile/UserProfile.scss index 189b5e78e..268d3a05d 100644 --- a/client/src/screens/UserProfile/UserProfile.scss +++ b/client/src/screens/UserProfile/UserProfile.scss @@ -1,13 +1,15 @@ .user-profile { + font-family: 'Nunito', sans-serif; .title-wrapper { margin-top: 1rem; text-align: center; .title-name { - font-size: 2rem; - text-decoration: underline; + font-weight: 600; + font-size: 24px; } .title-role { - font-weight: 400; + font-weight: normal; + font-size: 18px; } } From 2318efbeb967f9e7b32b04ff428fce9f712a13eb Mon Sep 17 00:00:00 2001 From: MBP Date: Mon, 12 Sep 2022 21:41:13 -0400 Subject: [PATCH 4/6] final touches --- src/screens/SignUp/SignUp.jsx | 10 ++-- src/screens/SignUp/SignUp.scss | 94 +++++++++++++--------------------- 2 files changed, 40 insertions(+), 64 deletions(-) diff --git a/src/screens/SignUp/SignUp.jsx b/src/screens/SignUp/SignUp.jsx index 4ede143d1..212311649 100644 --- a/src/screens/SignUp/SignUp.jsx +++ b/src/screens/SignUp/SignUp.jsx @@ -10,7 +10,7 @@ import { checkEmailAuth, verify } from '../../services/api/users.js'; import { handleChange } from '../../services/utils/formHandlers'; import { SingleActionButton } from '../../components/Button/SingleActionButton.jsx'; import { DoubleActionModal } from '../../components/Modal/DoubleActionModal.jsx'; -import { Header } from '../../components/Header/Header'; +//import { Header } from '../../components/Header/Header'; export const SignUp = () => { const navigate = useNavigate(); @@ -92,11 +92,9 @@ export const SignUp = () => { {/* {showModal && ( )} */} -<<<<<<< HEAD:client/src/screens/SignUp/SignUp.jsx -

Sign Up

-======= -
->>>>>>> daeeb7d0384a73c8086eccf564aa112be575e28a:src/screens/SignUp/SignUp.jsx +
+

Sign Up

+
diff --git a/src/screens/SignUp/SignUp.scss b/src/screens/SignUp/SignUp.scss index c77cd5b19..236c3ba42 100644 --- a/src/screens/SignUp/SignUp.scss +++ b/src/screens/SignUp/SignUp.scss @@ -2,77 +2,55 @@ display: flex; flex-direction: column; font-family: 'Nunito', sans-serif; + font-weight: 700; justify-content: center; -<<<<<<< HEAD:client/src/screens/SignUp/SignUp.scss padding-top: 80px; -======= - h4 { - align-self: center; - font-weight: 500; - text-align: center; - width: max-content; - } - - label { - font-size: 14px; - font-weight: 300; - } - - input { - border: solid black 1px; - height: 28px; - padding-left: 7px; - width: 100%; - } - ->>>>>>> daeeb7d0384a73c8086eccf564aa112be575e28a:src/screens/SignUp/SignUp.scss - .input-wrapper { - margin-top: 7px; - width: 100%; - } -<<<<<<< HEAD:client/src/screens/SignUp/SignUp.scss -======= - - h6 { - align-self: center; - } - ->>>>>>> daeeb7d0384a73c8086eccf564aa112be575e28a:src/screens/SignUp/SignUp.scss - a { - align-self: center; - color: black; - font-size: 12px; - font-style: italic; - } - h6 { - align-self: center; - } - h3 { + .header { align-self: center; font-weight: 700; font-size: 24px; - margin-bottom: -6vh; - margin-top: -2vh; + margin-top: -4rem; text-align: center; width: max-content; } - input { - border: solid black 1px; - box-shadow: 0.3px 1px darkgrey; - height: 28px; - padding-left: 7px; + + .input-wrapper { + margin-top: 7px; width: 100%; } - label { - font-size: 14px; - font-weight: 300; - } - .SingleActionButton { - background-color: red; + + form { + a { + align-self: center; + color: black; + font-size: 12px; + font-style: italic; + } + + h6 { + align-self: center; + } + + input { + border: solid black 1px; + box-shadow: 0.3px 1px darkgrey; + height: 28px; + padding-left: 7px; + width: 100%; + } + + label { + font-size: 14px; + font-weight: 400; + } + + .SingleActionButton { + background-color: red; + } } } .form-error { margin-top: 5px; -} +} \ No newline at end of file From 5e9b8b45117a185723eee409abc2bdf573d98b76 Mon Sep 17 00:00:00 2001 From: MBP Date: Mon, 12 Sep 2022 21:58:18 -0400 Subject: [PATCH 5/6] final final touches for real --- src/screens/SignUp/SignUp.jsx | 8 ++++--- src/screens/SignUp/SignUp.scss | 42 +++++++++++++++------------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/screens/SignUp/SignUp.jsx b/src/screens/SignUp/SignUp.jsx index 212311649..13b655b27 100644 --- a/src/screens/SignUp/SignUp.jsx +++ b/src/screens/SignUp/SignUp.jsx @@ -167,9 +167,11 @@ export const SignUp = () => {
-
- Already have an account? Sign in. -
+
+
+ Already have an account? Sign in. +
+
); }; diff --git a/src/screens/SignUp/SignUp.scss b/src/screens/SignUp/SignUp.scss index 236c3ba42..8fc6224b3 100644 --- a/src/screens/SignUp/SignUp.scss +++ b/src/screens/SignUp/SignUp.scss @@ -1,3 +1,9 @@ +.form-error { + margin-top: 5px; +} +.single-button { + margin-top: 2rem; +} .sign-up-screen { display: flex; flex-direction: column; @@ -6,18 +12,8 @@ justify-content: center; padding-top: 80px; - .header { + .footer { align-self: center; - font-weight: 700; - font-size: 24px; - margin-top: -4rem; - text-align: center; - width: max-content; - } - - .input-wrapper { - margin-top: 7px; - width: 100%; } form { @@ -27,11 +23,10 @@ font-size: 12px; font-style: italic; } - - h6 { - align-self: center; + .input-wrapper { + margin-top: 7px; + width: 100%; } - input { border: solid black 1px; box-shadow: 0.3px 1px darkgrey; @@ -39,18 +34,19 @@ padding-left: 7px; width: 100%; } - label { font-size: 14px; - font-weight: 400; + font-weight: 500; } + } - .SingleActionButton { - background-color: red; - } + .header { + align-self: center; + font-weight: 700; + font-size: 24px; + margin-top: -4rem; + text-align: center; + width: max-content; } } -.form-error { - margin-top: 5px; -} \ No newline at end of file From bfdd66eba70e8adfb19530e9c4ebb3ce97926763 Mon Sep 17 00:00:00 2001 From: MBP Date: Mon, 12 Sep 2022 22:43:59 -0400 Subject: [PATCH 6/6] changed button css for dimensions to match figma --- src/screens/SignUp/SignUp.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/screens/SignUp/SignUp.scss b/src/screens/SignUp/SignUp.scss index 8fc6224b3..fd34b7499 100644 --- a/src/screens/SignUp/SignUp.scss +++ b/src/screens/SignUp/SignUp.scss @@ -2,7 +2,11 @@ margin-top: 5px; } .single-button { + background-color: grey; + height: 50px; margin-top: 2rem; + padding: 14px 20px; + width: 102px; } .sign-up-screen { display: flex; @@ -31,6 +35,7 @@ border: solid black 1px; box-shadow: 0.3px 1px darkgrey; height: 28px; + margin-top: -.5rem; padding-left: 7px; width: 100%; }