From 9719867ebd8f2eb70e0945013ebdbe93306dbf32 Mon Sep 17 00:00:00 2001
From: Tanner Collin <git@tannercollin.com>
Date: Thu, 23 Jan 2020 02:54:33 +0000
Subject: [PATCH] Move <Router> to index.js, go home on log out

---
 webclient/src/App.js   | 12 ++++++------
 webclient/src/index.js |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/webclient/src/App.js b/webclient/src/App.js
index bc79972..d5c2f0d 100644
--- a/webclient/src/App.js
+++ b/webclient/src/App.js
@@ -1,5 +1,5 @@
-import React, { useState, useEffect, useReducer } from 'react';
-import { BrowserRouter as Router, Switch, Route, Link, useParams } from 'react-router-dom';
+import React, { useState, useEffect, useReducer, useContext } from 'react';
+import { BrowserRouter as Router, Switch, Route, Link, useParams, useHistory } from 'react-router-dom';
 import './light.css'; import { Container, Divider, Dropdown, Form, Grid, Header, Icon, Image, Menu, Message, Segment, Table } from 'semantic-ui-react';
 import { requester } from './utils.js';
 import { Home } from './Home.js';
@@ -18,6 +18,7 @@ function App() {
 	const [user, setUser] = useState(JSON.parse(localStorage.getItem('user', 'false')));
 	const [refreshCount, refreshUser] = useReducer(x => x + 1, 0);
 	const [yousure, setYousure] = useState(false);
+	const history = useHistory();
 
 	function setTokenCache(x) {
 		setToken(x);
@@ -45,13 +46,14 @@ function App() {
 			setTokenCache('');
 			setUserCache(false);
 			setYousure(false);
+			history.push('/');
 		} else {
 			setYousure(true);
 		}
 	}
 
 	return (
-		<Router>
+		<div>
 			<div className='content-wrap'>
 			<div className='content-wrap-inside'>
 
@@ -119,8 +121,6 @@ function App() {
 							content={yousure ? 'You Sure?' : 'Log Out'}
 							onClick={logout}
 							icon='cancel'
-							as={Link}
-							to='/'
 						/>
 						<Menu.Item fitted content='' />
 					</Menu.Menu>}
@@ -189,7 +189,7 @@ function App() {
 			</div>
 
 			<Footer />
-		</Router>
+		</div>
 	)
 };
 
diff --git a/webclient/src/index.js b/webclient/src/index.js
index ec27f2b..27c851a 100644
--- a/webclient/src/index.js
+++ b/webclient/src/index.js
@@ -1,9 +1,10 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { BrowserRouter as Router } from 'react-router-dom';
 import App from './App';
 //import * as serviceWorker from './serviceWorker';
 
-ReactDOM.render(<App />, document.getElementById('root'));
+ReactDOM.render(<Router><App /></Router>, document.getElementById('root'));
 
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.