From eec2b646cf6bd020578b80590730aaab143a6ccb Mon Sep 17 00:00:00 2001
From: frab1t <33671357+frab1t@users.noreply.github.com>
Date: Sat, 18 May 2019 13:45:22 +0200
Subject: [PATCH] refactor: edit routes

---
 src/App.js    | 25 +++----------------------
 src/Routes.js | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 22 deletions(-)
 create mode 100644 src/Routes.js

diff --git a/src/App.js b/src/App.js
index 022d170..747a972 100644
--- a/src/App.js
+++ b/src/App.js
@@ -5,34 +5,15 @@ import { Container } from 'reactstrap';
 import './App.css';
 import 'bootstrap/dist/css/bootstrap.min.css';
 
+import Routes from './Routes';
 import NavBar from './components/NavBar';
-import Home from './containers/HomePage/Home';
-import CreateTicket from './containers/CreateTicket/CreateTicket';
-import ViewRequest from './containers/ViewTicket/ViewTicket';
-import PageNotFound from './containers/PageNotFound';
-import Login from './containers/Administration/Login';
-import TicketList from './containers/Administration/TicketList';
-import TicketWork from './containers/Administration/TicketManager';
 
 function App() {
   return (
     <div className="app">
-      <Router>
+      <Routes>
         <NavBar />
-        <Container>
-        <Switch>
-          <Route path="/" exact component={Home} />
-          <Route path="/create" component={CreateTicket} />
-          <Route path="/ticket/:ticketId" component={ViewRequest} />
-          <Route path="/ticket/" exact component={ () => <Redirect to="/" /> } />
-          <Route path="/login" component={Login} />
-          <Route path="/admin/" exact component={ () => <Redirect to="/admin/ticket" /> } />
-          <Route path="/admin/ticket" exact component={TicketList} />
-          <Route path="/admin/ticket/:ticketId" component={TicketWork} />
-          <Route component={PageNotFound} />
-        </Switch>
-        </Container>
-      </Router>
+      </Routes>
     </div>
   );
 }
diff --git a/src/Routes.js b/src/Routes.js
new file mode 100644
index 0000000..c5156a6
--- /dev/null
+++ b/src/Routes.js
@@ -0,0 +1,46 @@
+import React, { Component } from 'react';
+import {
+  Container
+} from 'reactstrap';
+
+import { BrowserRouter as Router, Route, Switch, Redirect } from 'react-router-dom';
+
+import Home from './containers/HomePage/Home';
+import CreateTicket from './containers/CreateTicket/CreateTicket';
+import ViewRequest from './containers/ViewTicket/ViewTicket';
+import PageNotFound from './containers/PageNotFound';
+import Login from './containers/Administration/Login';
+import TicketList from './containers/Administration/TicketList';
+import TicketWork from './containers/Administration/TicketManager';
+
+
+class Routes extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {};
+  }
+
+  render() {
+    return (
+      <Router>
+        {this.props.children}
+        <Container>
+          <Switch>
+            <Route path="/" exact component={Home} />
+            <Route path="/create" component={CreateTicket} />
+            <Route path="/ticket/:ticketId" component={ViewRequest} />
+            <Route path="/ticket/" exact component={() => <Redirect to="/" />} />
+            <Route path="/login" component={Login} />
+            <Route path="/admin/" exact component={() => <Redirect to="/admin/ticket" />} />
+            <Route path="/admin/ticket" exact component={TicketList} />
+            <Route path="/admin/ticket/:ticketId" component={TicketWork} />
+            <Route component={PageNotFound} />
+          </Switch>
+        </Container>
+      </Router>
+    );
+  }
+}
+
+export default Routes;
\ No newline at end of file