Skip to content

Commit

Permalink
Back To Date
Browse files Browse the repository at this point in the history
  • Loading branch information
gabycasper007 committed Apr 3, 2019
1 parent b5940a1 commit da3c73a
Show file tree
Hide file tree
Showing 69 changed files with 1,472 additions and 849 deletions.
153 changes: 153 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-redux": "^6.0.1",
"react-router-dom": "^5.0.0",
"react-scripts": "2.1.5",
"redux": "^4.0.1"
},
Expand Down
24 changes: 17 additions & 7 deletions src/App.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
import React, { Component } from "react";
import Layout from "./components/Layout/Layout";
import BurgerBuilder from "./containers/BurgerBuilder/BurgerBuilder";
import React, { Component } from 'react';
import { Route, Switch } from 'react-router-dom';

import Layout from './hoc/Layout/Layout';
import BurgerBuilder from './containers/BurgerBuilder/BurgerBuilder';
import Checkout from './containers/Checkout/Checkout';
import Orders from './containers/Orders/Orders';

class App extends Component {
render() {
render () {
return (
<Layout>
<BurgerBuilder />
</Layout>
<div>
<Layout>
<Switch>
<Route path="/checkout" component={Checkout} />
<Route path="/orders" component={Orders} />
<Route path="/" exact component={BurgerBuilder} />
</Switch>
</Layout>
</div>
);
}
}
Expand Down
1 change: 0 additions & 1 deletion src/App.test.js
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ import App from './App';
it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App />, div);
ReactDOM.unmountComponentAtNode(div);
});
File renamed without changes.
18 changes: 18 additions & 0 deletions src/components/Burger/BuildControls/BuildControl/BuildControl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import classes from './BuildControl.module.css';


const buildControl = (props) => (
<div className={classes.BuildControl}>
<div className={classes.Label}>{props.label}</div>
<button
className={classes.Less}
onClick={props.removed}
disabled={props.disabled}>Less</button>
<button
className={classes.More}
onClick={props.added}>More</button>
</div>
);

export default buildControl;
22 changes: 0 additions & 22 deletions src/components/Burger/BuildControls/BuildControl/BuildControl.jsx

This file was deleted.

Loading

0 comments on commit da3c73a

Please sign in to comment.