From 094228a78d645a90d4d63ac9d5deb59f5f8255f6 Mon Sep 17 00:00:00 2001
From: PA4KEV <kevin.vd.vleuten@gmail.com>
Date: Wed, 4 Jan 2023 21:16:36 +0100
Subject: [PATCH] Moved Router and Routes from Navigation component to App.js

---
 src/App.js           | 20 ++++++++++++++++++--
 src/UI/Navigation.js | 19 +------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/App.js b/src/App.js
index 41b8361..558c959 100644
--- a/src/App.js
+++ b/src/App.js
@@ -4,14 +4,30 @@ import "bootstrap/dist/js/bootstrap.bundle.min";
 import './App.css';
 import Navigation from './UI/Navigation';
 
+import {BrowserRouter as Router, Routes, Route} from 'react-router-dom';
+
+import Home from './Pages/Home';
+import Linux from './Pages/Linux/Linux';
+import Radio from './Pages/Radio/Radio';
+import Software from './Pages/Software/Software';
+import DXPDevelopment from './Pages/Software/Projects/DXPDevelopment';
+import ConfigAutomation from './Pages/Software/Projects/ConfigAutomation';
 
 function App() {
     return (
-    <div>
+    <Router>
       <div className='row '>
         <Navigation />
       </div>
-    </div>
+      <Routes>
+            <Route exact path='/' element={<Home />}></Route>
+            <Route exact path='/pages/software' element={<Software />}></Route>
+            <Route exact path='/pages/software/dxp-development' element={<DXPDevelopment />}></Route>
+            <Route exact path='/pages/software/configuration-automation' element={<ConfigAutomation />}></Route>
+            <Route exact path='/pages/radio' element={<Radio />}></Route>
+            <Route exact path='/pages/linux' element={<Linux />}></Route>
+        </Routes>
+    </Router>
     );
 }
 
diff --git a/src/UI/Navigation.js b/src/UI/Navigation.js
index a2ae4ad..6e7e90d 100644
--- a/src/UI/Navigation.js
+++ b/src/UI/Navigation.js
@@ -1,19 +1,11 @@
 import React from 'react';
-import {BrowserRouter as Router, Routes, Route, Link} from 'react-router-dom';
-
-import Home from '../Pages/Home';
-import Linux from '../Pages/Linux/Linux';
-import Radio from '../Pages/Radio/Radio';
-import Software from '../Pages/Software/Software';
-import DXPDevelopment from '../Pages/Software/Projects/DXPDevelopment';
-import ConfigAutomation from '../Pages/Software/Projects/ConfigAutomation';
+import {Link} from 'react-router-dom';
 
 import './Navigation.css';
 
 
 const Navigation = (props) => {
     return (
-        <Router>
         <nav className="navbar navbar-expand-lg fixed-top text-light navbar-dark bg-primary">
             <div className="container-fluid">
                 <a className="navbar-brand" href="/">Kevin Matsubara<br/><span className='logo-sub'>Software Developer</span></a>
@@ -48,15 +40,6 @@ const Navigation = (props) => {
                 </div>
             </div>
         </nav>
-        <Routes>
-            <Route exact path='/' element={<Home />}></Route>
-            <Route exact path='/pages/software' element={<Software />}></Route>
-            <Route exact path='/pages/software/dxp-development' element={<DXPDevelopment />}></Route>
-            <Route exact path='/pages/software/configuration-automation' element={<ConfigAutomation />}></Route>
-            <Route exact path='/pages/radio' element={<Radio />}></Route>
-            <Route exact path='/pages/linux' element={<Linux />}></Route>
-        </Routes>
-        </Router>
     )
 }