From 69604a36b4d92dd0d233bf553e43bf16d88edcb0 Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Mon, 21 Aug 2023 20:45:16 +0200
Subject: [PATCH] feat(ui): simplify Header usage

---
 ui/app/app.jsx          | 2 ++
 ui/app/pages/entity.jsx | 8 --------
 ui/app/pages/home.jsx   | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ui/app/app.jsx b/ui/app/app.jsx
index b136891..ef29f00 100644
--- a/ui/app/app.jsx
+++ b/ui/app/app.jsx
@@ -2,12 +2,14 @@ import React from 'react';
 import { BrowserRouter as Router, Link, Route, Routes } from 'react-router-dom';
 
 import Entity from './pages/entity';
+import Header from './components/header';
 import Home from './pages/home';
 
 export default function App(){
     return (
 	<div className='App'>
 	    <Router>
+		<Header />
 		<Routes>
 		    <Route path='/' element={<Home/>}/>
 		    <Route path='/bike-ride' element={<Entity apiRoute='bike-ride/info' title='B+R Stations'/>}/>
diff --git a/ui/app/pages/entity.jsx b/ui/app/pages/entity.jsx
index 2ea1728..23f14bb 100644
--- a/ui/app/pages/entity.jsx
+++ b/ui/app/pages/entity.jsx
@@ -1,19 +1,11 @@
 import React from 'react'
 import PropTypes from 'prop-types';
-import { Link} from 'react-router-dom';
 
 import Fetch from '../components/fetch';
 
 export default function Entity({apiRoute, title}) {
     return(
 	<>
-	    <Link
-	    to='/'
-	    >
-		<button>
-		    Home
-		</button>
-	    </Link>
             <Fetch
 		route={apiRoute}
 		title={title}
diff --git a/ui/app/pages/home.jsx b/ui/app/pages/home.jsx
index c62ce04..472d809 100644
--- a/ui/app/pages/home.jsx
+++ b/ui/app/pages/home.jsx
@@ -3,7 +3,6 @@ import { Link} from 'react-router-dom';
 
 import '../style.css';
 import {getBusStopCount, getBikeRideCount, getParkRideCount, getTrainStationCount, getTaxiCount, getTicketMachineCount, getTicketOfficeCount} from '../utils/api';
-import Header from '../components/header';
 
 export default function Home(){
 
@@ -98,7 +97,6 @@ export default function Home(){
 
     return (
 	<>
-	    <Header />
 	    <h1>RVB Display</h1>
 	    <h2>Wellcome to the RVB Display!</h2>
 	    <h3>Number of bike and ride (B&R) stations in the RVB area: {bikeRideCount}</h3>