Skip to content

Commit

Permalink
general fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
orassayag committed Feb 19, 2021
1 parent 26b78c3 commit 83f90c5
Show file tree
Hide file tree
Showing 34 changed files with 137 additions and 72 deletions.
2 changes: 1 addition & 1 deletion .firebaserc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"projects": {
"default": "burger-builder-84921"
}
}
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

npm-debug.log*
yarn-debug.log*
yarn-error.log*
yarn-error.log*
33 changes: 32 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
20 changes: 16 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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).
Expand Down Expand Up @@ -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.

Expand All @@ -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 <orassayag@gmail.com>
* 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.
2 changes: 1 addition & 1 deletion config/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ function getClientEnvironment(publicUrl) {
return { raw, stringified };
}

module.exports = getClientEnvironment;
module.exports = getClientEnvironment;
2 changes: 1 addition & 1 deletion config/jest/cssTransform.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ module.exports = {
// The output is always the same.
return 'cssTransform';
},
};
};
2 changes: 1 addition & 1 deletion config/jest/fileTransform.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ module.exports = {
process(src, filename) {
return `module.exports = ${JSON.stringify(path.basename(filename))};`;
},
};
};
2 changes: 1 addition & 1 deletion config/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ module.exports = {
appNodeModules: resolveApp('node_modules'),
publicUrl: getPublicUrl(resolveApp('package.json')),
servedPath: getServedPath(resolveApp('package.json')),
};
};
2 changes: 1 addition & 1 deletion config/polyfills.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion config/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,4 @@ module.exports = {
performance: {
hints: false,
},
};
};
2 changes: 1 addition & 1 deletion config/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -341,4 +341,4 @@ module.exports = {
tls: 'empty',
child_process: 'empty',
},
};
};
2 changes: 1 addition & 1 deletion config/webpackDevServer.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ module.exports = function(proxy, allowedHost) {
app.use(noopServiceWorkerMiddleware());
},
};
};
};
2 changes: 1 addition & 1 deletion firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
}
]
}
}
}
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@
"eslint": "^5.2.0",
"eslint-plugin-react": "^7.10.0"
}
}
}
15 changes: 9 additions & 6 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
Expand All @@ -21,10 +22,11 @@
-->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet">
<title>BurgerBuilder</title>
</head>
<body>
</head>

<body>
<noscript>
You need to enable JavaScript to run this app.
You need to enable JavaScript to run this app.
</noscript>
<div id="root"></div>
<!--
Expand All @@ -37,5 +39,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
</body>

</html>
2 changes: 1 addition & 1 deletion public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
}
12 changes: 6 additions & 6 deletions scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down Expand Up @@ -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')));
Expand All @@ -147,4 +147,4 @@ function copyPublicFolder() {
dereference: true,
filter: file => file !== paths.appHtml,
});
}
}
6 changes: 3 additions & 3 deletions scripts/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand All @@ -104,4 +104,4 @@ choosePort(HOST, DEFAULT_PORT)
console.log(err.message);
}
process.exit(1);
});
});
3 changes: 1 addition & 2 deletions scripts/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ if (!process.env.CI && argv.indexOf('--coverage') < 0) {
argv.push('--watch');
}


jest.run(argv);
jest.run(argv);
2 changes: 1 addition & 1 deletion src/api/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ const api = axios.create({
baseURL: 'https://burger-builder-84921.firebaseio.com/'
});

export default api;
export default api;
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
width: 80px;
}

.build-control .less {
.build-control .less {
background-color: #d39952;
color: #ffffff;
}
Expand All @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@
0% {
transform: scale(1);
}

60% {
transform: scale(1.1);
}

100% {
transform: scale(1);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const BuildControls = (props) => {
<button
className={classes['order-button']}
disabled={!props.purchasable}
onClick={props.ordered}>{props.isAuthenticated? 'ORDER NOW' : 'SIGN UP TO ORDER'}</button>
onClick={props.ordered}>{props.isAuthenticated ? 'ORDER NOW' : 'SIGN UP TO ORDER'}</button>
</div>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import classes from './NavigationItem.css';
const NavigationItem = (props) => {
return (
<li className={classes['navigation-item']}>
<NavLink
to={props.link}
activeClassName={classes.active}
exact={props.exact}>
{props.children}</NavLink>
<NavLink
to={props.link}
activeClassName={classes.active}
exact={props.exact}>
{props.children}</NavLink>
</li>
);
};
Expand Down
6 changes: 2 additions & 4 deletions src/components/Navigation/Toolbar/Toolbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
height: 80%;
}

@media(max-width: 499px)
{
.desktop-only
{
@media(max-width: 499px) {
.desktop-only {
display: none;
}
}
Loading

0 comments on commit 83f90c5

Please sign in to comment.