From b18c6ae5570b12956e7f811cd0c897c900bf832f Mon Sep 17 00:00:00 2001
From: Tomas Havlicek <xhavlic@fi.muni.cz>
Date: Sun, 12 Jun 2022 22:37:55 +0200
Subject: [PATCH] feat: routing done so far, no linking yet
---
frontend/src/App.tsx | 16 +++++++++++++---
frontend/src/components/NavigationBar.tsx | 2 +-
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 10009f6..8a491df 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,16 +1,26 @@
import { useState } from "react";
-import logo from "./logo.svg";
+import 'antd/dist/antd.css'
import "./App.css";
import MainPage from "./components/MainPage";
import { Routes, Route, Outlet, Link, BrowserRouter } from "react-router-dom";
import { NavigationBar } from "./components/NavigationBar";
import { About } from "./components/About";
+import React from "react";
+import { Browse } from "./components/Browse";
+import { Search } from "./components/Search";
function App() {
return (
<div className="app">
- <NavigationBar />
- <MainPage />
+ <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>
+ </Routes>
+ </BrowserRouter>
</div>
);
}
diff --git a/frontend/src/components/NavigationBar.tsx b/frontend/src/components/NavigationBar.tsx
index aa9157c..34cc892 100644
--- a/frontend/src/components/NavigationBar.tsx
+++ b/frontend/src/components/NavigationBar.tsx
@@ -12,7 +12,7 @@ export const NavigationBar = () => {
<Menu theme="dark" mode="horizontal" defaultSelectedKeys={["2"]}>
<Image src={logo} width={50}></Image>
- <Menu.Item><Link to= "/">Home</Link></Menu.Item>
+ <Menu.Item>Home</Menu.Item>
<Menu.Item>Browse</Menu.Item>
<Menu.Item>Search</Menu.Item>
<Menu.Item>About</Menu.Item>
--
GitLab