Skip to content
Snippets Groups Projects
Commit 37c360d4 authored by xulirong2000's avatar xulirong2000
Browse files

finish

parent 1cfbe8ec
No related branches found
No related tags found
No related merge requests found
import React, { useState } from "react"; import React, { useState } from "react";
import "./App.css"; import "./App.css";
import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; import { BrowserRouter, Routes, Route} from "react-router-dom";
import { Navbar } from "./components/navbar"; import { Navbar } from "./components/navbar";
import { Shop } from "./pages/shop/shop"; import { Shop } from "./pages/shop/shop";
import { Contact } from "./pages/contact/contact"; import { Contact } from "./pages/contact/contact";
...@@ -15,7 +15,7 @@ function App() { ...@@ -15,7 +15,7 @@ function App() {
return ( return (
<div className="App"> <div className="App">
<ShopContextProvider> <ShopContextProvider>
<Router> <BrowserRouter basename={window.location.pathname}>
<Navbar user={user} setUser={setUser} /> <Navbar user={user} setUser={setUser} />
<Routes> <Routes>
<Route path="/" element={<Shop user={user} />} /> <Route path="/" element={<Shop user={user} />} />
...@@ -24,7 +24,7 @@ function App() { ...@@ -24,7 +24,7 @@ function App() {
<Route path="/cart" element={<Cart />} /> <Route path="/cart" element={<Cart />} />
<Route path="/login" element={<Login setUser={setUser} />} /> <Route path="/login" element={<Login setUser={setUser} />} />
</Routes> </Routes>
</Router> </BrowserRouter>
</ShopContextProvider> </ShopContextProvider>
</div> </div>
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment