Skip to content

Complete #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lycuong99 wants to merge 1 commit into
base: lesson-2
Choose a base branch
from
Open

Complete #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 57 additions & 28 deletions pizzajoint/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion pizzajoint/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"framer-motion": "^1.10.3",
"framer-motion": "^1.11.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.1.2",
Expand Down
42 changes: 24 additions & 18 deletions pizzajoint/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
import React, { useState } from 'react';
import { Route, Switch } from "react-router-dom";
import { Route, Switch, useLocation } from "react-router-dom";
import Header from './components/Header';
import Home from './components/Home';
import Base from './components/Base';
import Toppings from './components/Toppings';
import Order from './components/Order';
import { AnimatePresence } from 'framer-motion';
import Modal from './components/Modal';

function App() {
const [pizza, setPizza] = useState({ base: "", toppings: [] });

const [showModal, setShowModal] = useState(false);
const location = useLocation();
const addBase = (base) => {
setPizza({ ...pizza, base })
}

const addTopping = (topping) => {
let newToppings;
if(!pizza.toppings.includes(topping)){
if (!pizza.toppings.includes(topping)) {
newToppings = [...pizza.toppings, topping];
} else {
newToppings = pizza.toppings.filter(item => item !== topping);
Expand All @@ -25,21 +28,24 @@ function App() {

return (
<>
<Modal showModal={showModal} setShowModal={setShowModal} />
<Header />
<Switch>
<Route path="/base">
<Base addBase={addBase} pizza={pizza} />
</Route>
<Route path="/toppings">
<Toppings addTopping={addTopping} pizza={pizza} />
</Route>
<Route path="/order">
<Order pizza={pizza} />
</Route>
<Route path="/">
<Home />
</Route>
</Switch>
<AnimatePresence exitBeforeEnter onExitComplete={() => setShowModal(false)}>
<Switch location={location} key={location.key}>
<Route path="/base">
<Base addBase={addBase} pizza={pizza} />
</Route>
<Route path="/toppings">
<Toppings addTopping={addTopping} pizza={pizza} />
</Route>
<Route path="/order">
<Order pizza={pizza} setShowModal={setShowModal} />
</Route>
<Route path="/">
<Home />
</Route>
</Switch>
</AnimatePresence>
</>
);
}
Expand Down
Loading