Skip to content
Open
Changes from all commits
Commits
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
34 changes: 9 additions & 25 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useEffect } from "react";
import "./App.css";
import Header from "./Header";
import Home from "./Home";
import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
import Checkout from "./Checkout";
import Login from "./Login";
import Payment from "./Payment";
Expand Down Expand Up @@ -43,31 +43,15 @@ function App() {
}, []);

return (
<Router>
<Router>
<div className="app">
<Switch>
<Route path="/orders">
<Header />
<Orders />
</Route>
<Route path="/login">
<Login />
</Route>
<Route path="/checkout">
<Header />
<Checkout />
</Route>
<Route path="/payment">
<Header />
<Elements stripe={promise}>
<Payment />
</Elements>
</Route>
<Route path="/">
<Header />
<Home />
</Route>
</Switch>
<Routes>
<Route path='/login' element={<Login />} />
<Route path='/' element={[<Header />, <Home />]} />
<Route path='/checkout' element={[<Header />, <Checkout />]} />
<Route path='/payment' element={[<Header />, <Elements stripe={Promise} />],<Payment/>} />
<Route path='/' element={[<Header />, <Home/>} />
</Routes>
</div>
</Router>
);
Expand Down