From 24b5b78ef3977a3af9475ba3a22f11fb6ea5662b Mon Sep 17 00:00:00 2001 From: Adewumi Emmanuel Femi Date: Sun, 10 May 2020 05:05:49 +0100 Subject: [PATCH 01/14] check that route worked --- src/components/Navigations/NavBar/index.js | 44 ++- src/components/Screens/Auth/SignIn.js | 16 +- src/components/Screens/Auth/SignUp.js | 28 ++ src/containers/LandingPage/index.js | 19 +- src/routes.js | 21 +- src/utils/theme.js | 3 + yarn.lock | 327 ++++++++++++++++++++- 7 files changed, 420 insertions(+), 38 deletions(-) diff --git a/src/components/Navigations/NavBar/index.js b/src/components/Navigations/NavBar/index.js index e8c8722..278b149 100644 --- a/src/components/Navigations/NavBar/index.js +++ b/src/components/Navigations/NavBar/index.js @@ -2,13 +2,43 @@ /* eslint-disable no-unused-vars */ import React from 'react'; -import NavigationItem from '../NavigationItem'; +// MUI Stuff +import AppBar from '@material-ui/core/AppBar'; +import Grid from '@material-ui/core/Grid'; +import Toolbar from '@material-ui/core/Toolbar'; +import Typography from '@material-ui/core/Typography'; +import IconButton from '@material-ui/core/IconButton'; +import MenuIcon from '@material-ui/icons/Menu'; +import withStyles from '@material-ui/core/styles/withStyles'; + +// import NavigationItem from '../NavigationItem'; import classes from './style.css'; -export default (props) => ( - +const styles = (theme) => ({ + ...theme.spreadthis, + root: { + color: 'green', + margin: '0 0 300px 0' + } +}); + +const Index = (props) => ( + + + + + + Cleaner City + + + + + + + + + + ); + +export default withStyles(styles)(Index); diff --git a/src/components/Screens/Auth/SignIn.js b/src/components/Screens/Auth/SignIn.js index 6280d68..cc8efc3 100644 --- a/src/components/Screens/Auth/SignIn.js +++ b/src/components/Screens/Auth/SignIn.js @@ -3,18 +3,28 @@ /* eslint-disable class-methods-use-this */ import React, { Component, Fragment } from 'react'; import withStyles from '@material-ui/core/styles/withStyles'; +import Grid from '@material-ui/core/Grid'; +import TextField from '@material-ui/core'; +import Button from '@material-ui/core/Button'; import history from '../../../history'; const styles = (theme) => ({ ...theme.spreadthis }); -export class login extends Component { +class login extends Component { render() { return ( -
This is the sign in page
- + + + + + + + ); } diff --git a/src/components/Screens/Auth/SignUp.js b/src/components/Screens/Auth/SignUp.js index e69de29..5117805 100644 --- a/src/components/Screens/Auth/SignUp.js +++ b/src/components/Screens/Auth/SignUp.js @@ -0,0 +1,28 @@ +/* eslint-disable class-methods-use-this */ +/* eslint-disable no-unused-vars */ +import React, { Component } from 'react'; +import Grid from '@material-ui/core/Grid'; +import TextField from '@material-ui/core/TextField'; +import Button from '@material-ui/core/Button'; +import withStyles from '@material-ui/core/styles/withStyles'; + +const styles = (theme) => ({ + ...theme.spreadthis +}); +class SignUp extends Component { + render() { + return ( + + + + + + + + ); + } +} + +export default withStyles(styles)(SignUp); diff --git a/src/containers/LandingPage/index.js b/src/containers/LandingPage/index.js index e4c1a83..ab4b946 100644 --- a/src/containers/LandingPage/index.js +++ b/src/containers/LandingPage/index.js @@ -3,6 +3,7 @@ /* eslint-disable class-methods-use-this */ import React, { Component, Fragment } from 'react'; import withStyles from '@material-ui/core/styles/withStyles'; +import Grid from '@material-ui/core/Grid'; import history from '../../history'; const styles = (theme) => ({ @@ -13,8 +14,22 @@ export class LandingPage extends Component { render() { return ( -
This is Landing Page
- + + + Lorem ipsum, dolor sit amet consectetur adipisicing elit. Deserunt eveniet, magni earum dicta eius fugiat, + veritatis dolorem eligendi neque debitis repellat ullam. Eum, quos ipsum. Aperiam dicta minima vitae ut! + + + Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos, minus. Tempora, quod quis! Excepturi totam, + aliquid expedita sint, mollitia nulla corrupti minima, ea harum quasi numquam dignissimos optio voluptas + sequi! + + + Lorem, ipsum dolor sit amet consectetur adipisicing elit. Consequuntur qui ipsum cupiditate vitae enim earum + exercitationem, ex totam quibusdam cum sed aspernatur voluptas beatae atque inventore aliquam, explicabo + porro provident. + + ); } diff --git a/src/routes.js b/src/routes.js index 6fbca42..d77a0ab 100644 --- a/src/routes.js +++ b/src/routes.js @@ -3,12 +3,12 @@ /* eslint-disable import/no-named-as-default */ /* eslint-disable no-unused-vars */ import React from 'react'; -import { - Router, Route as DefaultRoute, Switch, Redirect -} from 'react-router-dom'; +import { Router, Route as DefaultRoute, Switch, Redirect } from 'react-router-dom'; import history from './history'; import SignInPage from './components/Screens/Auth/SignIn'; import LandingPage from './containers/LandingPage'; +import SignUp from './components/Screens/Auth/SignUp'; +import NavBar from './components/Navigations/NavBar/index'; // @desc A function to check if user is authenticated. Check if token exists // @ex const isAuth = isAuthenticated() @@ -22,16 +22,7 @@ const isAuthenticated = () => true; const PrivateRoute = ({ component: Component, ...rest }) => ( (isAuthenticated() ? ( - - ) : ( - - )) - } + render={(props) => (isAuthenticated() ? : )} /> ); @@ -47,8 +38,10 @@ const Route = ({ component: Component, ensureNonAuth, ...rest }) => ( export default () => ( + - + +

404 !

} /> diff --git a/src/utils/theme.js b/src/utils/theme.js index a51dbbb..ed23320 100644 --- a/src/utils/theme.js +++ b/src/utils/theme.js @@ -19,6 +19,9 @@ export default { spreadthis: { typography: { useNextVarients: true + }, + menuButton: { + diplay: 'hidden' } } }; diff --git a/yarn.lock b/yarn.lock index 95a677a..862e1b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -50,6 +50,16 @@ lodash "^4.17.13" source-map "^0.5.0" +"@babel/generator@^7.9.6": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43" + integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ== + dependencies: + "@babel/types" "^7.9.6" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + "@babel/helper-annotate-as-pure@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee" @@ -262,6 +272,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8" integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA== +"@babel/parser@^7.7.0", "@babel/parser@^7.9.6": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7" + integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q== + "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f" @@ -773,6 +788,14 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" +"@babel/runtime-corejs3@^7.8.3": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz#67aded13fffbbc2cb93247388cf84d77a4be9a71" + integrity sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA== + dependencies: + core-js-pure "^3.0.0" + regenerator-runtime "^0.13.4" + "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7": version "7.9.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" @@ -811,6 +834,21 @@ globals "^11.1.0" lodash "^4.17.13" +"@babel/traverse@^7.7.0": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442" + integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.9.6" + "@babel/helper-function-name" "^7.9.5" + "@babel/helper-split-export-declaration" "^7.8.3" + "@babel/parser" "^7.9.6" + "@babel/types" "^7.9.6" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + "@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5": version "7.9.5" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444" @@ -820,6 +858,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.7.0", "@babel/types@^7.9.6": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7" + integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA== + dependencies: + "@babel/helper-validator-identifier" "^7.9.5" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -1300,7 +1347,12 @@ acorn@^7.1.0, acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: +ajv-keywords@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" + integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== + +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5: version "6.12.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== @@ -1412,7 +1464,7 @@ array-equal@^1.0.0: resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= -array-includes@^3.0.3: +array-includes@^3.0.3, array-includes@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== @@ -1512,6 +1564,18 @@ babel-code-frame@^6.26.0: esutils "^2.0.2" js-tokens "^3.0.2" +babel-eslint@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" + integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/parser" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" + eslint-visitor-keys "^1.0.0" + resolve "^1.12.0" + babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" @@ -1639,6 +1703,17 @@ babel-jest@^25.4.0: chalk "^3.0.0" slash "^3.0.0" +babel-loader@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" + integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== + dependencies: + find-cache-dir "^2.1.0" + loader-utils "^1.4.0" + mkdirp "^0.5.3" + pify "^4.0.1" + schema-utils "^2.6.5" + babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" @@ -2133,6 +2208,11 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + binary-extensions@^1.0.0: version "1.13.1" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" @@ -2623,6 +2703,11 @@ commander@^2.11.0, commander@^2.19.0, commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -2683,6 +2768,11 @@ core-js-compat@^3.6.2: browserslist "^4.8.5" semver "7.0.0" +core-js-pure@^3.0.0: + version "3.6.5" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813" + integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA== + core-js@^2.4.0, core-js@^2.6.5: version "2.6.11" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" @@ -2771,6 +2861,11 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" +crypto-js@^3.1.6: + version "3.3.0" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b" + integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q== + css-color-names@0.0.4, css-color-names@^0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" @@ -3102,6 +3197,13 @@ doctrine@1.5.0: esutils "^2.0.2" isarray "^1.0.0" +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -3232,6 +3334,11 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -3343,6 +3450,17 @@ eslint-import-resolver-node@^0.3.2: debug "^2.6.9" resolve "^1.13.1" +eslint-loader@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-4.0.2.tgz#386a1e21bcb613b3cf2d252a3b708023ccfb41ec" + integrity sha512-EDpXor6lsjtTzZpLUn7KmXs02+nIjGcgees9BYjNkWra3jVq5vVa8IoCKgzT2M7dNNeoMBtaSG83Bd40N3poLw== + dependencies: + find-cache-dir "^3.3.1" + fs-extra "^8.1.0" + loader-utils "^2.0.0" + object-hash "^2.0.3" + schema-utils "^2.6.5" + eslint-module-utils@^2.4.1: version "2.6.0" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" @@ -3369,6 +3487,24 @@ eslint-plugin-import@^2.20.2: read-pkg-up "^2.0.0" resolve "^1.12.0" +eslint-plugin-react@^7.19.0: + version "7.19.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666" + integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ== + dependencies: + array-includes "^3.1.1" + doctrine "^2.1.0" + has "^1.0.3" + jsx-ast-utils "^2.2.3" + object.entries "^1.1.1" + object.fromentries "^2.0.2" + object.values "^1.1.1" + prop-types "^15.7.2" + resolve "^1.15.1" + semver "^6.3.0" + string.prototype.matchall "^4.0.2" + xregexp "^4.3.0" + eslint-scope@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" @@ -3384,7 +3520,7 @@ eslint-utils@^1.4.3: dependencies: eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.1.0: +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== @@ -3705,6 +3841,24 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +find-cache-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== + dependencies: + commondir "^1.0.1" + make-dir "^2.0.0" + pkg-dir "^3.0.0" + +find-cache-dir@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" + integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.0" + find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -3777,6 +3931,15 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -3900,6 +4063,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.2.3: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + grapheme-breaker@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/grapheme-breaker/-/grapheme-breaker-0.3.2.tgz#5b9e6b78c3832452d2ba2bb1cb830f96276410ac" @@ -4017,7 +4185,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -history@^4.9.0: +history@^4.10.1, history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== @@ -4241,6 +4409,15 @@ inquirer@^7.0.0: strip-ansi "^6.0.0" through "^2.3.6" +internal-slot@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" + integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g== + dependencies: + es-abstract "^1.17.0-next.1" + has "^1.0.3" + side-channel "^1.0.2" + invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" @@ -5084,6 +5261,13 @@ json5@^2.1.2: dependencies: minimist "^1.2.5" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -5163,6 +5347,14 @@ jss@10.1.1, jss@^10.0.3: is-in-browser "^1.1.3" tiny-warning "^1.0.2" +jsx-ast-utils@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f" + integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA== + dependencies: + array-includes "^3.0.3" + object.assign "^4.1.0" + kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -5227,6 +5419,24 @@ load-json-file@^2.0.0: pify "^2.0.0" strip-bom "^3.0.0" +loader-utils@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -5296,6 +5506,11 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3 dependencies: js-tokens "^3.0.0 || ^4.0.0" +lz-string@^1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" + integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= + magic-string@^0.22.4: version "0.22.5" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e" @@ -5303,7 +5518,15 @@ magic-string@^0.22.4: dependencies: vlq "^0.2.2" -make-dir@^3.0.0: +make-dir@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + +make-dir@^3.0.0, make-dir@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -5466,7 +5689,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.1, mkdirp@~0.5.1: +mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -5667,6 +5890,11 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" +object-hash@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea" + integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg== + object-inspect@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" @@ -5709,6 +5937,16 @@ object.entries@^1.1.1: function-bind "^1.1.1" has "^1.0.3" +object.fromentries@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" + integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + object.getownpropertydescriptors@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" @@ -5724,7 +5962,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0: +object.values@^1.1.0, object.values@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== @@ -6082,6 +6320,11 @@ pify@^2.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + pirates@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" @@ -6096,7 +6339,14 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" -pkg-dir@^4.2.0: +pkg-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" + integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== + dependencies: + find-up "^3.0.0" + +pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== @@ -6783,14 +7033,11 @@ realpath-native@^2.0.0: resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866" integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q== -<<<<<<< HEAD -======= redux-devtools-extension@^2.13.8: version "2.13.8" resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.8.tgz#37b982688626e5e4993ff87220c9bbb7cd2d96e1" integrity sha512-8qlpooP2QqPtZHQZRhx3x3OP5skEV1py/zUdMY28WNAocbafxdG2tRD1MWE7sp8obGMNYuLWanhhQ7EQvT1FBg== ->>>>>>> a54a6da238a40b5eed1815eb741c0f14cea667fd redux-thunk@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" @@ -6851,6 +7098,14 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" +regexp.prototype.flags@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -7146,7 +7401,23 @@ scheduler@^0.19.1: loose-envify "^1.1.0" object-assign "^4.1.1" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0: +schema-utils@^2.6.5: + version "2.6.6" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c" + integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA== + dependencies: + ajv "^6.12.0" + ajv-keywords "^3.4.1" + +secure-ls@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/secure-ls/-/secure-ls-1.2.6.tgz#0c54a4c7fa8317c3c101accbf6bb38d8d2072e46" + integrity sha512-g8vUSKl6elSfyAUHodybnNkuZW+mUYEOWj4SZIDg+xoQ1dq5ddktBoOFrtxQBUl88ZyAJOtGWQ1PRaOxkTAuZQ== + dependencies: + crypto-js "^3.1.6" + lz-string "^1.4.4" + +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7262,6 +7533,14 @@ shellwords@^0.1.1: resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== +side-channel@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" + integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== + dependencies: + es-abstract "^1.17.0-next.1" + object-inspect "^1.7.0" + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" @@ -7515,6 +7794,18 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string.prototype.matchall@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" + integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0" + has-symbols "^1.0.1" + internal-slot "^1.0.2" + regexp.prototype.flags "^1.3.0" + side-channel "^1.0.2" + string.prototype.trimend@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" @@ -8005,6 +8296,11 @@ uniqs@^2.0.0: resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + unquote@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" @@ -8282,6 +8578,13 @@ xmlchars@^2.1.1: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== +xregexp@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50" + integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g== + dependencies: + "@babel/runtime-corejs3" "^7.8.3" + xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" From 08564a45ef6b8b50c4ad771d617915eb6e6f7060 Mon Sep 17 00:00:00 2001 From: Festus Omole Date: Mon, 11 May 2020 11:46:24 +0100 Subject: [PATCH 02/14] fix: adjusted the routes issues --- src/components/Screens/Auth/SignIn.js | 32 ++++++++++++--------------- src/components/Screens/Auth/SignUp.js | 1 + src/containers/LandingPage/index.js | 22 +++++++++++++----- src/routes.js | 10 +++++---- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/components/Screens/Auth/SignIn.js b/src/components/Screens/Auth/SignIn.js index cc8efc3..e8f97c8 100644 --- a/src/components/Screens/Auth/SignIn.js +++ b/src/components/Screens/Auth/SignIn.js @@ -1,33 +1,29 @@ /* eslint-disable linebreak-style */ -/* eslint-disable no-unused-vars */ /* eslint-disable class-methods-use-this */ -import React, { Component, Fragment } from 'react'; -import withStyles from '@material-ui/core/styles/withStyles'; +/* eslint-disable no-unused-vars */ +import React, { Component } from 'react'; import Grid from '@material-ui/core/Grid'; -import TextField from '@material-ui/core'; +import TextField from '@material-ui/core/TextField'; import Button from '@material-ui/core/Button'; -import history from '../../../history'; +import withStyles from '@material-ui/core/styles/withStyles'; const styles = (theme) => ({ ...theme.spreadthis }); - -class login extends Component { +class SignIn extends Component { render() { return ( - - - - - - - + + + + + - + ); } } -export default withStyles(styles)(login); +export default withStyles(styles)(SignIn); diff --git a/src/components/Screens/Auth/SignUp.js b/src/components/Screens/Auth/SignUp.js index 5117805..691d6f3 100644 --- a/src/components/Screens/Auth/SignUp.js +++ b/src/components/Screens/Auth/SignUp.js @@ -1,3 +1,4 @@ +/* eslint-disable linebreak-style */ /* eslint-disable class-methods-use-this */ /* eslint-disable no-unused-vars */ import React, { Component } from 'react'; diff --git a/src/containers/LandingPage/index.js b/src/containers/LandingPage/index.js index ab4b946..0c47af7 100644 --- a/src/containers/LandingPage/index.js +++ b/src/containers/LandingPage/index.js @@ -16,19 +16,29 @@ export class LandingPage extends Component { - Lorem ipsum, dolor sit amet consectetur adipisicing elit. Deserunt eveniet, magni earum dicta eius fugiat, - veritatis dolorem eligendi neque debitis repellat ullam. Eum, quos ipsum. Aperiam dicta minima vitae ut! + Lorem ipsum, dolor sit amet consectetur adipisicing elit. + Deserunt eveniet, magni earum dicta eius fugiat, + veritatis dolorem eligendi neque debitis repellat ullam. Eum, + quos ipsum. Aperiam dicta minima vitae ut! - Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos, minus. Tempora, quod quis! Excepturi totam, - aliquid expedita sint, mollitia nulla corrupti minima, ea harum quasi numquam dignissimos optio voluptas + Lorem ipsum dolor sit amet consectetur adipisicing elit. + Quos, minus. Tempora, quod quis! Excepturi totam, + aliquid expedita sint, mollitia nulla corrupti minima, + ea harum quasi numquam dignissimos optio voluptas sequi! - Lorem, ipsum dolor sit amet consectetur adipisicing elit. Consequuntur qui ipsum cupiditate vitae enim earum - exercitationem, ex totam quibusdam cum sed aspernatur voluptas beatae atque inventore aliquam, explicabo + Lorem, ipsum dolor sit amet consectetur adipisicing elit. + Consequuntur qui ipsum cupiditate vitae enim earum + exercitationem, ex totam quibusdam cum sed aspernatur voluptas beatae + atque inventore aliquam, explicabo porro provident. + + + + ); diff --git a/src/routes.js b/src/routes.js index d77a0ab..8ef3fa7 100644 --- a/src/routes.js +++ b/src/routes.js @@ -3,7 +3,9 @@ /* eslint-disable import/no-named-as-default */ /* eslint-disable no-unused-vars */ import React from 'react'; -import { Router, Route as DefaultRoute, Switch, Redirect } from 'react-router-dom'; +import { + Router, Route as DefaultRoute, Switch, Redirect +} from 'react-router-dom'; import history from './history'; import SignInPage from './components/Screens/Auth/SignIn'; import LandingPage from './containers/LandingPage'; @@ -37,11 +39,11 @@ const Route = ({ component: Component, ensureNonAuth, ...rest }) => ( export default () => ( + - - - + +

404 !

} /> From dc89dfae5eaa662ddbd83cd627d84048fc691b55 Mon Sep 17 00:00:00 2001 From: Adewumi Emmanuel Femi Date: Sat, 16 May 2020 06:07:50 +0100 Subject: [PATCH 03/14] need check done --- src/App.css | 10 ++-- src/components/Navigations/NavBar/index.js | 8 ++- .../Screens/Auth/{SignUp.js => AdminLogin.js} | 16 +++--- src/components/Screens/Auth/AgentDashboard.js | 47 ++++++++++++++++ src/components/Screens/Auth/AgentSignUp.js | 42 +++++++++++++++ .../Screens/Auth/CustomerDashboard.js | 48 +++++++++++++++++ src/components/Screens/Auth/SignIn.js | 11 +++- src/containers/LandingPage/index.js | 53 +++++++++++-------- src/containers/LandingPage/styles.css | 14 +++++ src/routes.js | 12 ++--- src/utils/theme.js | 5 ++ 11 files changed, 218 insertions(+), 48 deletions(-) rename src/components/Screens/Auth/{SignUp.js => AdminLogin.js} (67%) create mode 100644 src/components/Screens/Auth/AgentDashboard.js create mode 100644 src/components/Screens/Auth/AgentSignUp.js create mode 100644 src/components/Screens/Auth/CustomerDashboard.js diff --git a/src/App.css b/src/App.css index 58328e3..2f536ca 100644 --- a/src/App.css +++ b/src/App.css @@ -1,6 +1,6 @@ -.App { - position: relative; - width: 100%; - height: 100%; +html, +body { + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', + 'Droid Sans', 'Helvetica Neue', sans-serif; + background-color: rgb(245, 245, 245); } - diff --git a/src/components/Navigations/NavBar/index.js b/src/components/Navigations/NavBar/index.js index 278b149..cd7af90 100644 --- a/src/components/Navigations/NavBar/index.js +++ b/src/components/Navigations/NavBar/index.js @@ -23,16 +23,14 @@ const styles = (theme) => ({ }); const Index = (props) => ( - + - - Cleaner City - + Cleaner City - + diff --git a/src/components/Screens/Auth/SignUp.js b/src/components/Screens/Auth/AdminLogin.js similarity index 67% rename from src/components/Screens/Auth/SignUp.js rename to src/components/Screens/Auth/AdminLogin.js index 691d6f3..dfd7bdf 100644 --- a/src/components/Screens/Auth/SignUp.js +++ b/src/components/Screens/Auth/AdminLogin.js @@ -1,8 +1,7 @@ -/* eslint-disable linebreak-style */ -/* eslint-disable class-methods-use-this */ /* eslint-disable no-unused-vars */ +/* eslint-disable class-methods-use-this */ import React, { Component } from 'react'; -import Grid from '@material-ui/core/Grid'; +import Grid, { Typography, Link } from '@material-ui/core'; import TextField from '@material-ui/core/TextField'; import Button from '@material-ui/core/Button'; import withStyles from '@material-ui/core/styles/withStyles'; @@ -10,20 +9,23 @@ import withStyles from '@material-ui/core/styles/withStyles'; const styles = (theme) => ({ ...theme.spreadthis }); -class SignUp extends Component { +class AdminLogin extends Component { render() { return ( - + + + forgot password? click here + ); } } -export default withStyles(styles)(SignUp); +export default withStyles(styles)(AdminLogin); diff --git a/src/components/Screens/Auth/AgentDashboard.js b/src/components/Screens/Auth/AgentDashboard.js new file mode 100644 index 0000000..eb2e77b --- /dev/null +++ b/src/components/Screens/Auth/AgentDashboard.js @@ -0,0 +1,47 @@ +/* eslint-disable no-unused-vars */ +/* eslint-disable class-methods-use-this */ +import React, { Component } from 'react'; + +class AgentDashboard extends Component { + render() { + return ( + + + + + Link + + + + + Link + + + + + Link + + + + + Link + + + + + Link + + + + + Link + + + + + + ); + } +} + +export default AgentDashboard; diff --git a/src/components/Screens/Auth/AgentSignUp.js b/src/components/Screens/Auth/AgentSignUp.js new file mode 100644 index 0000000..b1d3d26 --- /dev/null +++ b/src/components/Screens/Auth/AgentSignUp.js @@ -0,0 +1,42 @@ +/* eslint-disable no-undef */ +/* eslint-disable linebreak-style */ +/* eslint-disable class-methods-use-this */ +/* eslint-disable no-unused-vars */ +import React, { Component } from 'react'; +import Grid from '@material-ui/core/Grid'; +import TextField from '@material-ui/core/TextField'; +import Button from '@material-ui/core/Button'; +import CircularProgress from '@material-ui/core/CircularProgress'; +import withStyles from '@material-ui/core/styles/withStyles'; + +const styles = (theme) => ({ + ...theme.spreadthis +}); +class SignUp extends Component { + render() { + return ( + + + + + + + + + + + forgot password? click here + + + Not a member sign uphere + + + + ); + } +} + +export default withStyles(styles)(SignUp); diff --git a/src/components/Screens/Auth/CustomerDashboard.js b/src/components/Screens/Auth/CustomerDashboard.js new file mode 100644 index 0000000..a3fc3f1 --- /dev/null +++ b/src/components/Screens/Auth/CustomerDashboard.js @@ -0,0 +1,48 @@ +/* eslint-disable no-unused-vars */ +/* eslint-disable class-methods-use-this */ +import React, { Component } from 'react'; +import Grid from '@material-ui/core'; + +class CustomerDashboard extends Component { + render() { + return ( + + + + + Link + + + + + Link + + + + + Link + + + + + Link + + + + + Link + + + + + Link + + + + + + ); + } +} + +export default CustomerDashboard; diff --git a/src/components/Screens/Auth/SignIn.js b/src/components/Screens/Auth/SignIn.js index e8f97c8..cedfee8 100644 --- a/src/components/Screens/Auth/SignIn.js +++ b/src/components/Screens/Auth/SignIn.js @@ -1,3 +1,4 @@ +/* eslint-disable no-undef */ /* eslint-disable linebreak-style */ /* eslint-disable class-methods-use-this */ /* eslint-disable no-unused-vars */ @@ -5,10 +6,15 @@ import React, { Component } from 'react'; import Grid from '@material-ui/core/Grid'; import TextField from '@material-ui/core/TextField'; import Button from '@material-ui/core/Button'; +import CircularProgress from '@material-ui/core/CircularProgress'; import withStyles from '@material-ui/core/styles/withStyles'; const styles = (theme) => ({ - ...theme.spreadthis + ...theme.spreadthis, + wrapper: { + width: '1200px', + margin: '0 auto' + } }); class SignIn extends Component { render() { @@ -16,9 +22,10 @@ class SignIn extends Component { - + diff --git a/src/containers/LandingPage/index.js b/src/containers/LandingPage/index.js index 0c47af7..3c9826d 100644 --- a/src/containers/LandingPage/index.js +++ b/src/containers/LandingPage/index.js @@ -1,43 +1,50 @@ +/* eslint-disable no-undef */ +/* eslint-disable max-len */ /* eslint-disable linebreak-style */ /* eslint-disable no-unused-vars */ /* eslint-disable class-methods-use-this */ import React, { Component, Fragment } from 'react'; +// MUI STUFF import withStyles from '@material-ui/core/styles/withStyles'; import Grid from '@material-ui/core/Grid'; +import TextField from '@material-ui/core/TextField'; +import Button from '@material-ui/core/Button'; +import Typography from '@material-ui/core/Typography'; import history from '../../history'; +import classes from './styles.css'; const styles = (theme) => ({ ...theme.spreadthis }); -export class LandingPage extends Component { +class LandingPage extends Component { render() { return ( - - - Lorem ipsum, dolor sit amet consectetur adipisicing elit. - Deserunt eveniet, magni earum dicta eius fugiat, - veritatis dolorem eligendi neque debitis repellat ullam. Eum, - quos ipsum. Aperiam dicta minima vitae ut! - - - Lorem ipsum dolor sit amet consectetur adipisicing elit. - Quos, minus. Tempora, quod quis! Excepturi totam, - aliquid expedita sint, mollitia nulla corrupti minima, - ea harum quasi numquam dignissimos optio voluptas - sequi! - - - Lorem, ipsum dolor sit amet consectetur adipisicing elit. - Consequuntur qui ipsum cupiditate vitae enim earum - exercitationem, ex totam quibusdam cum sed aspernatur voluptas beatae - atque inventore aliquam, explicabo - porro provident. + + + + support the cleaning of a community{' '} + + - - + + customer | Agent + + + + diff --git a/src/containers/LandingPage/styles.css b/src/containers/LandingPage/styles.css index e69de29..aadc247 100644 --- a/src/containers/LandingPage/styles.css +++ b/src/containers/LandingPage/styles.css @@ -0,0 +1,14 @@ +.wrapper { + width: '1200'; + margin: '100px auto 0 auto'; + display: flex; + justify-content: center; + flex-direction: row; +} +.columnWrapper { + flex-grow: 1; + flex-basis: 600; +} +.input { + display: block; +} diff --git a/src/routes.js b/src/routes.js index 8ef3fa7..c093283 100644 --- a/src/routes.js +++ b/src/routes.js @@ -3,14 +3,13 @@ /* eslint-disable import/no-named-as-default */ /* eslint-disable no-unused-vars */ import React from 'react'; -import { - Router, Route as DefaultRoute, Switch, Redirect -} from 'react-router-dom'; +import { Router, Route as DefaultRoute, Switch, Redirect } from 'react-router-dom'; import history from './history'; import SignInPage from './components/Screens/Auth/SignIn'; import LandingPage from './containers/LandingPage'; -import SignUp from './components/Screens/Auth/SignUp'; +import AgentSignUp from './components/Screens/Auth/AgentSignUp'; import NavBar from './components/Navigations/NavBar/index'; +import AdminLogin from './components/Screens/Auth/AdminLogin'; // @desc A function to check if user is authenticated. Check if token exists // @ex const isAuth = isAuthenticated() @@ -39,11 +38,12 @@ const Route = ({ component: Component, ensureNonAuth, ...rest }) => ( export default () => ( - + - + +

404 !

} /> diff --git a/src/utils/theme.js b/src/utils/theme.js index ed23320..e26525e 100644 --- a/src/utils/theme.js +++ b/src/utils/theme.js @@ -20,6 +20,11 @@ export default { typography: { useNextVarients: true }, + wrapper: { + height: '600px', + width: '1200', + margin: '0 auto' + }, menuButton: { diplay: 'hidden' } From e86cf77784ade5054d67c47c062cd71b3331d75b Mon Sep 17 00:00:00 2001 From: Adewumi Emmanuel Femi Date: Wed, 27 May 2020 12:11:30 +0100 Subject: [PATCH 04/14] customer login page --- src/containers/LandingPage/index.js | 135 ++++++++++++++++++++-------- 1 file changed, 96 insertions(+), 39 deletions(-) diff --git a/src/containers/LandingPage/index.js b/src/containers/LandingPage/index.js index 3c9826d..546c350 100644 --- a/src/containers/LandingPage/index.js +++ b/src/containers/LandingPage/index.js @@ -1,55 +1,112 @@ +/* eslint-disable class-methods-use-this */ /* eslint-disable no-undef */ /* eslint-disable max-len */ /* eslint-disable linebreak-style */ /* eslint-disable no-unused-vars */ -/* eslint-disable class-methods-use-this */ + import React, { Component, Fragment } from 'react'; -// MUI STUFF -import withStyles from '@material-ui/core/styles/withStyles'; -import Grid from '@material-ui/core/Grid'; -import TextField from '@material-ui/core/TextField'; -import Button from '@material-ui/core/Button'; -import Typography from '@material-ui/core/Typography'; -import history from '../../history'; -import classes from './styles.css'; +import { Link } from 'react-router-dom'; -const styles = (theme) => ({ - ...theme.spreadthis -}); +// Bootstrap +import Container from 'react-bootstrap/Container'; +import Row from 'react-bootstrap/Row'; +import Col from 'react-bootstrap/Col'; +import Form from 'react-bootstrap/Form'; +import Button from 'react-bootstrap/Button'; +import Jumbotron from 'react-bootstrap/Jumbotron'; +import './styles.css'; class LandingPage extends Component { render() { + const customer = ( + +
+ + Email address + + We'll never share your email with anyone else. + + + + Password + + + + + +
+ +
+
+ + ); + const admin = ( + +
+ + Email address + + We'll never share your email with anyone else. + + + + Password + + + + + +
+ +
+ Loading... +
+
+
+ + ); return ( - - - - support the cleaning of a community{' '} - - - - - - customer | Agent - - - - - - + + + + +

Cleaner city initiative!

+

support Broomy in the cleaning of a community.

+

+ +

+ + + +
+

+ customer | admin +

+
+
{customer}
+
+
+ forgot password + click here + or + signup +
+
+ + + ); } } -export default withStyles(styles)(LandingPage); +export default LandingPage; From f82f3d7f21cce6217d31bce75310fc7acefcf4e6 Mon Sep 17 00:00:00 2001 From: Adewumi Emmanuel Femi Date: Wed, 27 May 2020 12:23:31 +0100 Subject: [PATCH 05/14] customer signup page --- src/components/Screens/Auth/Signup.js | 64 +++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 src/components/Screens/Auth/Signup.js diff --git a/src/components/Screens/Auth/Signup.js b/src/components/Screens/Auth/Signup.js new file mode 100644 index 0000000..73f3210 --- /dev/null +++ b/src/components/Screens/Auth/Signup.js @@ -0,0 +1,64 @@ +/* eslint-disable no-undef */ +/* eslint-disable linebreak-style */ +/* eslint-disable class-methods-use-this */ +/* eslint-disable no-unused-vars */ +import React, { Component } from 'react'; +import Container from 'react-bootstrap/Container'; +import Row from 'react-bootstrap/Row'; +import Col from 'react-bootstrap/Col'; +import Form from 'react-bootstrap/Form'; +import Button from 'react-bootstrap/Button'; + +class Signup extends Component { + render() { + return ( + + + +

signup

+ + + + +
+ + First Name + + + + Last Name + + + + Email address + + + + Country + + + + Phone Number + + + + Password + + +
+ +
+ Loading... +
+
+
+ + + + ); + } +} + +export default Signup; From fac72691bd70807eb4c10f029745fbe7f1efa252 Mon Sep 17 00:00:00 2001 From: Adewumi Emmanuel Femi Date: Wed, 27 May 2020 12:49:44 +0100 Subject: [PATCH 06/14] made changes spotted by codacy --- src/components/Navigations/NavBar/index.js | 68 ++++++++++------------ src/containers/LandingPage/styles.css | 2 + src/index.html | 2 + src/routes.js | 11 +++- 4 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/components/Navigations/NavBar/index.js b/src/components/Navigations/NavBar/index.js index cd7af90..f453fc2 100644 --- a/src/components/Navigations/NavBar/index.js +++ b/src/components/Navigations/NavBar/index.js @@ -1,42 +1,34 @@ -/* eslint-disable linebreak-style */ /* eslint-disable no-unused-vars */ -import React from 'react'; +/* eslint-disable class-methods-use-this */ +import React, { Component, Fragment } from 'react'; +import Navbar from 'react-bootstrap/Navbar'; -// MUI Stuff -import AppBar from '@material-ui/core/AppBar'; -import Grid from '@material-ui/core/Grid'; -import Toolbar from '@material-ui/core/Toolbar'; -import Typography from '@material-ui/core/Typography'; -import IconButton from '@material-ui/core/IconButton'; -import MenuIcon from '@material-ui/icons/Menu'; -import withStyles from '@material-ui/core/styles/withStyles'; - -// import NavigationItem from '../NavigationItem'; -import classes from './style.css'; - -const styles = (theme) => ({ - ...theme.spreadthis, - root: { - color: 'green', - margin: '0 0 300px 0' +class Index extends Component { + render() { + return ( + + + + Broomy + + + {/* authenticated = ( + + + Broomy + + + ) : ( + + + Broomy + + + ) + */} + + ); } -}); - -const Index = (props) => ( - - - - - Cleaner City - - - - - - - - - -); +} -export default withStyles(styles)(Index); +export default Index; diff --git a/src/containers/LandingPage/styles.css b/src/containers/LandingPage/styles.css index aadc247..34a9e3e 100644 --- a/src/containers/LandingPage/styles.css +++ b/src/containers/LandingPage/styles.css @@ -5,10 +5,12 @@ justify-content: center; flex-direction: row; } + .columnWrapper { flex-grow: 1; flex-basis: 600; } + .input { display: block; } diff --git a/src/index.html b/src/index.html index 744d096..09cadee 100644 --- a/src/index.html +++ b/src/index.html @@ -7,6 +7,8 @@ + +