diff --git a/package.json b/package.json index 9bccbfb..44f969b 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "fs-extra": "^11.2.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router-dom": "^6.22.3", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" }, diff --git a/src/App.js b/src/App.js deleted file mode 100644 index d01c55e..0000000 --- a/src/App.js +++ /dev/null @@ -1,14 +0,0 @@ -import "./App.css"; - -import Header from "./layouts/Header"; -import logo from "../src/assets/svg/logo.svg"; - -function App() { - return ( - <> -
- - ); -} - -export default App; diff --git a/src/components/Navbar/index.js b/src/components/Navbar/index.js index adee88a..14fe1d8 100644 --- a/src/components/Navbar/index.js +++ b/src/components/Navbar/index.js @@ -1,23 +1,25 @@ import "./styles.css"; +import { Link } from "react-router-dom"; + const Navbar = ({ className, onClick, handleClose }) => { return ( diff --git a/src/index.js b/src/index.js index cdca195..30ba593 100644 --- a/src/index.js +++ b/src/index.js @@ -1,18 +1,22 @@ import "./index.css"; +import "./app.css"; import React from "react"; import ReactDOM from "react-dom/client"; +import { BrowserRouter } from "react-router-dom"; -import App from "./App"; +import Root from "./pages/Root"; import reportWebVitals from "./reportWebVitals"; import { GlobalContextProvider } from "./contexts/GlobalContext"; const root = ReactDOM.createRoot(document.getElementById("root")); root.render( - - - + + + + + ); diff --git a/src/layouts/BasicLayout/index.js b/src/layouts/BasicLayout/index.js new file mode 100644 index 0000000..78bfeb1 --- /dev/null +++ b/src/layouts/BasicLayout/index.js @@ -0,0 +1,20 @@ +import "./styles.css"; + +import { Outlet } from "react-router-dom"; + +import Footer from "../Footer"; +import Header from "../Header"; + +const BasicLayout = () => { + return ( + <> +
+
+ +
+