diff --git a/.firebaserc b/.firebaserc index 9a07404..1bb4c87 100644 --- a/.firebaserc +++ b/.firebaserc @@ -2,4 +2,4 @@ "projects": { "default": "burger-builder-84921" } -} +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index d30f40e..a75d301 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,4 @@ npm-debug.log* yarn-debug.log* -yarn-error.log* +yarn-error.log* \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 45b280a..6baa35b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,34 @@ { - "eslint.options": { "configFile": "C:/Or/Web/ReactLearning/21/burger-builder/.eslintrc.json" } + "eslint.options": { + "configFile": "C:/Or/Web/ReactLearning/21/burger-builder/.eslintrc.json" + }, + "cSpell.words": [ + "APZZY", + "CNAME", + "Cond", + "INGREDIENCIES", + "Intelli", + "Netlify", + "Netlify’s", + "React's", + "SIGNUP", + "Serializers", + "Signin", + "Unmount", + "doesnt", + "dont", + "firebaserc", + "hrefs", + "ings", + "momentjs", + "mydirectory", + "mypublicdevhost", + "orassayag", + "overriden", + "recompiles", + "s", + "sockjs", + "todos", + "unregister" + ] } \ No newline at end of file diff --git a/README.md b/README.md index 479d632..ed7e0f7 100644 --- a/README.md +++ b/README.md @@ -300,7 +300,7 @@ In the WebStorm menu `Run` select `Edit Configurations...`. Then click `+` and s Start your app by running `npm start`, then press `^D` on macOS or `F9` on Windows and Linux or click the green debug icon to start debugging in WebStorm. -The same way you can debug your application in IntelliJ IDEA Ultimate, PhpStorm, PyCharm Pro, and RubyMine. +The same way you can debug your application in IntelliJ IDEA Ultimate, PhpStorm, PyCharm Pro, and RubyMine. ## Formatting Code Automatically @@ -1675,7 +1675,7 @@ Use the following [`launch.json`](https://code.visualstudio.com/docs/editor/debu "name": "Debug CRA Tests", "type": "node", "request": "launch", - "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts", + "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts", "args": [ "test", "--runInBand", @@ -1989,7 +1989,7 @@ If you’re using [Apache HTTP Server](https://httpd.apache.org/), you need to c RewriteRule ^ index.html [QSA,L] ``` -It will get copied to the `build` folder when you run `npm run build`. +It will get copied to the `build` folder when you run `npm run build`. If you’re using [Apache Tomcat](http://tomcat.apache.org/), you need to follow [this Stack Overflow answer](https://stackoverflow.com/a/41249464/4878474). @@ -2429,7 +2429,7 @@ To resolve this: 1. Open an issue on the dependency's issue tracker and ask that the package be published pre-compiled. * Note: Create React App can consume both CommonJS and ES modules. For Node.js compatibility, it is recommended that the main entry point is CommonJS. However, they can optionally provide an ES module entry point with the `module` field in `package.json`. Note that **even if a library provides an ES Modules version, it should still precompile other ES6 features to ES5 if it intends to support older browsers**. -2. Fork the package and publish a corrected version yourself. +2. Fork the package and publish a corrected version yourself. 3. If the dependency is small enough, copy it to your `src/` folder and treat it as application code. @@ -2442,3 +2442,15 @@ In the future, we might start automatically compiling incompatible third-party m ## Something Missing? If you have ideas for more “How To” recipes that should be on this page, [let us know](https://github.com/facebookincubator/create-react-app/issues) or [contribute some!](https://github.com/facebookincubator/create-react-app/edit/master/packages/react-scripts/template/README.md) + +## Author + +* **Or Assayag** - *Initial work* - [orassayag](https://github.com/orassayag) +* Or Assayag +* GitHub: https://github.com/orassayag +* StackOverFlow: https://stackoverflow.com/users/4442606/or-assayag?tab=profile +* LinkedIn: https://il.linkedin.com/in/orassayag + +## License + +This application has UNLICENSED License. \ No newline at end of file diff --git a/config/env.js b/config/env.js index 30a6c7f..7eda6cb 100644 --- a/config/env.js +++ b/config/env.js @@ -90,4 +90,4 @@ function getClientEnvironment(publicUrl) { return { raw, stringified }; } -module.exports = getClientEnvironment; +module.exports = getClientEnvironment; \ No newline at end of file diff --git a/config/jest/cssTransform.js b/config/jest/cssTransform.js index 8f65114..db1d09d 100644 --- a/config/jest/cssTransform.js +++ b/config/jest/cssTransform.js @@ -11,4 +11,4 @@ module.exports = { // The output is always the same. return 'cssTransform'; }, -}; +}; \ No newline at end of file diff --git a/config/jest/fileTransform.js b/config/jest/fileTransform.js index 9e4047d..519e78a 100644 --- a/config/jest/fileTransform.js +++ b/config/jest/fileTransform.js @@ -9,4 +9,4 @@ module.exports = { process(src, filename) { return `module.exports = ${JSON.stringify(path.basename(filename))};`; }, -}; +}; \ No newline at end of file diff --git a/config/paths.js b/config/paths.js index 6d16efc..6a3d4fb 100644 --- a/config/paths.js +++ b/config/paths.js @@ -52,4 +52,4 @@ module.exports = { appNodeModules: resolveApp('node_modules'), publicUrl: getPublicUrl(resolveApp('package.json')), servedPath: getServedPath(resolveApp('package.json')), -}; +}; \ No newline at end of file diff --git a/config/polyfills.js b/config/polyfills.js index 66dff0a..faaf61b 100644 --- a/config/polyfills.js +++ b/config/polyfills.js @@ -19,4 +19,4 @@ Object.assign = require('object-assign'); // We don't polyfill it in the browser--this is user's responsibility. if (process.env.NODE_ENV === 'test') { require('raf').polyfill(global); -} +} \ No newline at end of file diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js index 46d1f55..6dd8107 100644 --- a/config/webpack.config.dev.js +++ b/config/webpack.config.dev.js @@ -261,4 +261,4 @@ module.exports = { performance: { hints: false, }, -}; +}; \ No newline at end of file diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js index 0ab25b9..45cc498 100644 --- a/config/webpack.config.prod.js +++ b/config/webpack.config.prod.js @@ -341,4 +341,4 @@ module.exports = { tls: 'empty', child_process: 'empty', }, -}; +}; \ No newline at end of file diff --git a/config/webpackDevServer.config.js b/config/webpackDevServer.config.js index f12d315..5907f02 100644 --- a/config/webpackDevServer.config.js +++ b/config/webpackDevServer.config.js @@ -92,4 +92,4 @@ module.exports = function(proxy, allowedHost) { app.use(noopServiceWorkerMiddleware()); }, }; -}; +}; \ No newline at end of file diff --git a/firebase.json b/firebase.json index 340ed5b..cd83b60 100644 --- a/firebase.json +++ b/firebase.json @@ -13,4 +13,4 @@ } ] } -} +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a4d0004..6b6ceb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11742,4 +11742,4 @@ } } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index adadb55..29eb1d7 100644 --- a/package.json +++ b/package.json @@ -102,4 +102,4 @@ "eslint": "^5.2.0", "eslint-plugin-react": "^7.10.0" } -} +} \ No newline at end of file diff --git a/public/index.html b/public/index.html index 3eedf7d..daede4e 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,7 @@ - + + @@ -21,10 +22,11 @@ --> BurgerBuilder - - + + +
- - + + + \ No newline at end of file diff --git a/public/manifest.json b/public/manifest.json index ef19ec2..822ac25 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -12,4 +12,4 @@ "display": "standalone", "theme_color": "#000000", "background_color": "#ffffff" -} +} \ No newline at end of file diff --git a/scripts/build.js b/scripts/build.js index 5709f48..4dc8693 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -59,13 +59,13 @@ measureFileSizesBeforeBuild(paths.appBuild) console.log(warnings.join('\n\n')); console.log( '\nSearch for the ' + - chalk.underline(chalk.yellow('keywords')) + - ' to learn more about each warning.' + chalk.underline(chalk.yellow('keywords')) + + ' to learn more about each warning.' ); console.log( 'To ignore, add ' + - chalk.cyan('// eslint-disable-next-line') + - ' to the line before.\n' + chalk.cyan('// eslint-disable-next-line') + + ' to the line before.\n' ); } else { console.log(chalk.green('Compiled successfully.\n')); @@ -128,7 +128,7 @@ function build(previousFileSizes) { console.log( chalk.yellow( '\nTreating warnings as errors because process.env.CI = true.\n' + - 'Most CI servers set it automatically.\n' + 'Most CI servers set it automatically.\n' ) ); return reject(new Error(messages.warnings.join('\n\n'))); @@ -147,4 +147,4 @@ function copyPublicFolder() { dereference: true, filter: file => file !== paths.appHtml, }); -} +} \ No newline at end of file diff --git a/scripts/start.js b/scripts/start.js index c5acbe5..0138561 100644 --- a/scripts/start.js +++ b/scripts/start.js @@ -92,8 +92,8 @@ choosePort(HOST, DEFAULT_PORT) openBrowser(urls.localUrlForBrowser); }); - ['SIGINT', 'SIGTERM'].forEach(function(sig) { - process.on(sig, function() { + ['SIGINT', 'SIGTERM'].forEach(function (sig) { + process.on(sig, function () { devServer.close(); process.exit(); }); @@ -104,4 +104,4 @@ choosePort(HOST, DEFAULT_PORT) console.log(err.message); } process.exit(1); - }); + }); \ No newline at end of file diff --git a/scripts/test.js b/scripts/test.js index 45a643a..a08b7d0 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -23,5 +23,4 @@ if (!process.env.CI && argv.indexOf('--coverage') < 0) { argv.push('--watch'); } - -jest.run(argv); +jest.run(argv); \ No newline at end of file diff --git a/src/api/api.js b/src/api/api.js index b8c1228..58e27c0 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -4,4 +4,4 @@ const api = axios.create({ baseURL: 'https://burger-builder-84921.firebaseio.com/' }); -export default api; +export default api; \ No newline at end of file diff --git a/src/components/Burger/BuildControls/BuildControl/BuildControl.css b/src/components/Burger/BuildControls/BuildControl/BuildControl.css index 823fd5c..8ef11e3 100644 --- a/src/components/Burger/BuildControls/BuildControl/BuildControl.css +++ b/src/components/Burger/BuildControls/BuildControl/BuildControl.css @@ -35,7 +35,7 @@ width: 80px; } -.build-control .less { +.build-control .less { background-color: #d39952; color: #ffffff; } @@ -45,12 +45,14 @@ color: #ffffff; } -.build-control .less:hover, .build-control .less:active { +.build-control .less:hover, +.build-control .less:active { background-color: #daa972; color: #ffffff; } -.build-control .more:hover,.build-control .more:active { +.build-control .more:hover, +.build-control .more:active { background-color: #99703f; color: #ffffff; } \ No newline at end of file diff --git a/src/components/Burger/BuildControls/BuildControls/BuildControls.css b/src/components/Burger/BuildControls/BuildControls/BuildControls.css index 3fc1fca..a256378 100644 --- a/src/components/Burger/BuildControls/BuildControls/BuildControls.css +++ b/src/components/Burger/BuildControls/BuildControls/BuildControls.css @@ -43,9 +43,11 @@ 0% { transform: scale(1); } + 60% { transform: scale(1.1); } + 100% { transform: scale(1); } diff --git a/src/components/Burger/BuildControls/BuildControls/BuildControls.jsx b/src/components/Burger/BuildControls/BuildControls/BuildControls.jsx index 90830a6..e55fbc3 100644 --- a/src/components/Burger/BuildControls/BuildControls/BuildControls.jsx +++ b/src/components/Burger/BuildControls/BuildControls/BuildControls.jsx @@ -24,7 +24,7 @@ const BuildControls = (props) => { + onClick={props.ordered}>{props.isAuthenticated ? 'ORDER NOW' : 'SIGN UP TO ORDER'} ); }; diff --git a/src/components/Navigation/NavigationItems/NavigationItem/NavigationItem.css b/src/components/Navigation/NavigationItems/NavigationItem/NavigationItem.css index d9b7815..2b187db 100644 --- a/src/components/Navigation/NavigationItems/NavigationItem/NavigationItem.css +++ b/src/components/Navigation/NavigationItems/NavigationItem/NavigationItem.css @@ -27,12 +27,14 @@ width: auto; align-items: center; } + .navigation-item a { color: #ffffff; height: 100%; padding: 16px 10px; border-bottom: 4px solid transparent; } + .navigation-item a:hover, .navigation-item a:active, .navigation-item a.active { diff --git a/src/components/Navigation/NavigationItems/NavigationItem/NavigationItem.jsx b/src/components/Navigation/NavigationItems/NavigationItem/NavigationItem.jsx index 446b45d..09a21d8 100644 --- a/src/components/Navigation/NavigationItems/NavigationItem/NavigationItem.jsx +++ b/src/components/Navigation/NavigationItems/NavigationItem/NavigationItem.jsx @@ -5,11 +5,11 @@ import classes from './NavigationItem.css'; const NavigationItem = (props) => { return (
  • - - {props.children} + + {props.children}
    • ); }; diff --git a/src/components/Navigation/Toolbar/Toolbar.css b/src/components/Navigation/Toolbar/Toolbar.css index 8ba0203..a11e157 100644 --- a/src/components/Navigation/Toolbar/Toolbar.css +++ b/src/components/Navigation/Toolbar/Toolbar.css @@ -21,10 +21,8 @@ height: 80%; } -@media(max-width: 499px) -{ - .desktop-only - { +@media(max-width: 499px) { + .desktop-only { display: none; } } \ No newline at end of file diff --git a/src/components/Order/CheckoutSummary/CheckoutSummary.jsx b/src/components/Order/CheckoutSummary/CheckoutSummary.jsx index 9a8cc22..0bc917f 100644 --- a/src/components/Order/CheckoutSummary/CheckoutSummary.jsx +++ b/src/components/Order/CheckoutSummary/CheckoutSummary.jsx @@ -10,12 +10,12 @@ const CheckoutSummary = (props) => {
    - - + + ); }; diff --git a/src/components/UI/Spinner/Spinner.css b/src/components/UI/Spinner/Spinner.css index 3227e2c..f3698ec 100644 --- a/src/components/UI/Spinner/Spinner.css +++ b/src/components/UI/Spinner/Spinner.css @@ -18,56 +18,72 @@ } @-webkit-keyframes load5 { + 0%, 100% { box-shadow: 0em -2.6em 0em 0em #521751, 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.5), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.7); } + 12.5% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.7), 1.8em -1.8em 0 0em #521751, 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.5); } + 25% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.5), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.7), 2.5em 0em 0 0em #521751, 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 37.5% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.5), 2.5em 0em 0 0em rgba(82, 23, 81, 0.7), 1.75em 1.75em 0 0em #521751, 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 50% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.5), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.7), 0em 2.5em 0 0em #521751, -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 62.5% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.5), 0em 2.5em 0 0em rgba(82, 23, 81, 0.7), -1.8em 1.8em 0 0em #521751, -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 75% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.5), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.7), -2.6em 0em 0 0em #521751, -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 87.5% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.5), -2.6em 0em 0 0em rgba(82, 23, 81, 0.7), -1.8em -1.8em 0 0em #521751; } } @keyframes load5 { + 0%, 100% { box-shadow: 0em -2.6em 0em 0em #521751, 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.5), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.7); } + 12.5% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.7), 1.8em -1.8em 0 0em #521751, 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.5); } + 25% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.5), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.7), 2.5em 0em 0 0em #521751, 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 37.5% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.5), 2.5em 0em 0 0em rgba(82, 23, 81, 0.7), 1.75em 1.75em 0 0em #521751, 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 50% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.5), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.7), 0em 2.5em 0 0em #521751, -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.2), -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 62.5% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.5), 0em 2.5em 0 0em rgba(82, 23, 81, 0.7), -1.8em 1.8em 0 0em #521751, -2.6em 0em 0 0em rgba(82, 23, 81, 0.2), -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 75% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.5), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.7), -2.6em 0em 0 0em #521751, -1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2); } + 87.5% { box-shadow: 0em -2.6em 0em 0em rgba(82, 23, 81, 0.2), 1.8em -1.8em 0 0em rgba(82, 23, 81, 0.2), 2.5em 0em 0 0em rgba(82, 23, 81, 0.2), 1.75em 1.75em 0 0em rgba(82, 23, 81, 0.2), 0em 2.5em 0 0em rgba(82, 23, 81, 0.2), -1.8em 1.8em 0 0em rgba(82, 23, 81, 0.5), -2.6em 0em 0 0em rgba(82, 23, 81, 0.7), -1.8em -1.8em 0 0em #521751; } diff --git a/src/containers/Auth/Auth/Auth.jsx b/src/containers/Auth/Auth/Auth.jsx index 4755752..394c3a8 100644 --- a/src/containers/Auth/Auth/Auth.jsx +++ b/src/containers/Auth/Auth/Auth.jsx @@ -85,7 +85,7 @@ class Auth extends Component { this.props.onAuth(this.state.controls.email.value, this.state.controls.password.value, this.state.isSignUp); } - swithAuthModeHandler = () => { + switchAuthModeHandler = () => { this.setState(prevState => { return { isSignUp: !prevState.isSignUp @@ -147,7 +147,7 @@ class Auth extends Component { {form} - + {errorMessage} ); diff --git a/src/containers/BurgerBuilder/BurgerBuilder.test.jsx b/src/containers/BurgerBuilder/BurgerBuilder.test.jsx index 89e0cd7..909d1fa 100644 --- a/src/containers/BurgerBuilder/BurgerBuilder.test.jsx +++ b/src/containers/BurgerBuilder/BurgerBuilder.test.jsx @@ -15,15 +15,15 @@ describe('', () => { wrapper = shallow( { }} />); }); - it('it should render when reciving ingrediencies', () => { + it('it should render when receiving ingrediencies', () => { wrapper.setProps({ ings: { salad: 0, meat: 0, bacon: 0, cheese: 0 - } + } }); expect(wrapper.find(BuildControls)).toHaveLength(1); - }); -}); \ No newline at end of file + }); +}); \ No newline at end of file diff --git a/src/hoc/Layout/Layout.jsx b/src/hoc/Layout/Layout.jsx index 6c38d11..be5f836 100644 --- a/src/hoc/Layout/Layout.jsx +++ b/src/hoc/Layout/Layout.jsx @@ -23,13 +23,13 @@ class Layout extends Component { render() { return ( - - + +
    {this.props.children}
    diff --git a/src/index.css b/src/index.css index d14c472..4eac40e 100644 --- a/src/index.css +++ b/src/index.css @@ -2,4 +2,4 @@ body { margin: 0; padding: 0; font-family: "Open Sans", sans-serif; -} +} \ No newline at end of file diff --git a/src/store/actions/index.js b/src/store/actions/index.js index 8c65da3..fc7d0c1 100644 --- a/src/store/actions/index.js +++ b/src/store/actions/index.js @@ -3,13 +3,13 @@ export { removeIngredient, initIngrediencies } -from './burgerBuilder'; + from './burgerBuilder'; export { purchaseBurger, purchaseInit, fetchOrders } -from './order'; + from './order'; export { auth, logout,