From 65d97d59e6577491e219ca305211f48c368c8f01 Mon Sep 17 00:00:00 2001
From: Tomas Havlicek <xhavlic@fi.muni.cz>
Date: Sun, 12 Jun 2022 22:48:18 +0200
Subject: [PATCH] feat: routing finished
---
frontend/src/App.tsx | 7 +++++--
frontend/src/components/NavigationBar.tsx | 8 ++++----
frontend/src/main.tsx | 3 +++
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 8a491df..bbfd9b1 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -8,19 +8,22 @@ import { About } from "./components/About";
import React from "react";
import { Browse } from "./components/Browse";
import { Search } from "./components/Search";
+import { ErrorPage } from "./components/ErrorPage";
function App() {
return (
<div className="app">
+
<NavigationBar/>
- <BrowserRouter>
+
<Routes>
<Route path="/" element={<MainPage/>}></Route>
<Route path="/browse" element={<Browse/>}></Route>
<Route path="/search" element={<Search/>}></Route>
<Route path="/about" element={<About/>}></Route>
+ <Route path="*" element={<ErrorPage/>}></Route>
</Routes>
- </BrowserRouter>
+
</div>
);
}
diff --git a/frontend/src/components/NavigationBar.tsx b/frontend/src/components/NavigationBar.tsx
index 34cc892..1f2746b 100644
--- a/frontend/src/components/NavigationBar.tsx
+++ b/frontend/src/components/NavigationBar.tsx
@@ -12,10 +12,10 @@ export const NavigationBar = () => {
<Menu theme="dark" mode="horizontal" defaultSelectedKeys={["2"]}>
<Image src={logo} width={50}></Image>
- <Menu.Item>Home</Menu.Item>
- <Menu.Item>Browse</Menu.Item>
- <Menu.Item>Search</Menu.Item>
- <Menu.Item>About</Menu.Item>
+ <Link to="/"><Menu.Item>Home</Menu.Item></Link>
+ <Link to="/browse"><Menu.Item>Browse</Menu.Item></Link>
+ <Link to="/search"><Menu.Item>Search</Menu.Item></Link>
+ <Link to="/about"><Menu.Item>About</Menu.Item></Link>
</Menu>
</Header>
</div>)
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 4a1b150..ad04a8d 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -1,10 +1,13 @@
import React from 'react'
import ReactDOM from 'react-dom/client'
+import { BrowserRouter } from 'react-router-dom'
import App from './App'
import './index.css'
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
+ <BrowserRouter>
<App />
+ </BrowserRouter>
</React.StrictMode>
)
--
GitLab