From f7409a4ffe410dbe4835356a7ebf815d531f44e0 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Sat, 26 Sep 2020 07:37:40 -0700
Subject: [PATCH] Fix routing

---
 src/components/App/index.tsx        | 19 ++++++++++++---
 src/components/Header/index.tsx     | 26 ++++++++------------
 src/components/HeaderMenu/index.css |  8 +++++++
 src/components/HeaderMenu/index.tsx | 37 ++++++++++++++++++-----------
 src/components/Main/index.tsx       | 27 ---------------------
 src/index.tsx                       |  1 +
 6 files changed, 58 insertions(+), 60 deletions(-)
 delete mode 100644 src/components/Main/index.tsx

diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index 91789fee..87e97a51 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -1,14 +1,27 @@
 import React from 'react'
+import { Switch, Route, useHistory } from 'react-router-dom'
 import './index.css'
 
 import Header from '~components/Header'
 import Main from '~components/Main'
 
-function App() {
+import New from '~routes/New'
+import Party from '~routes/Party'
+import Parties from '~routes/Parties'
+import Profile from '~routes/Profile'
+
+
+const App = () => {
+    const history = useHistory()
+    const route = (pathname: string) => history.push(pathname)
+
     return (   
         <div>
-            <Header />
-            <Main />
+            <Header navigate={route} />
+            <Route exact path='/' component={New} />
+            <Route exact path='/parties/' component={Parties} />
+            <Route path='/p/:hash' component={Party} />
+            <Route exact path='/:username' component={Profile} />
         </div>
     )
 }
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
index 72892f90..01f97243 100644
--- a/src/components/Header/index.tsx
+++ b/src/components/Header/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { RouteComponentProps, useLocation, withRouter } from 'react-router-dom'
+import { useLocation } from 'react-router-dom'
 import { useCookies } from 'react-cookie'
 
 import Button from '~components/Button'
@@ -7,13 +7,16 @@ import HeaderMenu from '~components/HeaderMenu'
 
 import './index.css'
 
-interface Props {}
-interface HeaderProps extends RouteComponentProps<Props> {}
+interface Props {
+    navigate: (pathname: string) => void
+}
 
-const Header: React.FC<HeaderProps> = (props: HeaderProps) => {
+const Header = (props: Props) => {
     const [username, setUsername] = useState(undefined)
     const [cookies, setCookie, removeCookie] = useCookies(['user'])
     let location = useLocation()
+    
+    const route = (pathname: string) => props.navigate(pathname)
 
     useEffect(() => {
         if (cookies.user) {
@@ -33,16 +36,7 @@ const Header: React.FC<HeaderProps> = (props: HeaderProps) => {
     }
 
     function newParty() {
-        if (props.history.location.pathname === '/') {
-            window.history.replaceState(null, `Grid Tool`, `/`)
-            props.history.go(0)
-        } else {
-            props.history.push('/')
-        }
-    }
-
-    function route(pathname: string) {
-        props.history.push(pathname)
+        props.navigate('/')
     }
 
     function logout() {
@@ -60,7 +54,7 @@ const Header: React.FC<HeaderProps> = (props: HeaderProps) => {
             <div className="left">
                 <div className="dropdown">
                     <Button type="menu">Menu</Button>
-                    <HeaderMenu username={username} navigate={route} logout={logout} />
+                    <HeaderMenu username={username} logout={logout} />
                 </div>
             </div>
             <div className="push" />
@@ -74,4 +68,4 @@ const Header: React.FC<HeaderProps> = (props: HeaderProps) => {
     )
 }
 
-export default withRouter(Header)
\ No newline at end of file
+export default Header
\ No newline at end of file
diff --git a/src/components/HeaderMenu/index.css b/src/components/HeaderMenu/index.css
index 693d4e43..e4169565 100644
--- a/src/components/HeaderMenu/index.css
+++ b/src/components/HeaderMenu/index.css
@@ -23,6 +23,14 @@
     background: #e9e9e9;
 }
 
+.MenuItem a {
+    color: #777
+}
+
+.MenuItem a:hover {
+    color: #555
+}
+
 .MenuGroup {
     border-bottom: 2px solid #f5f5f5;
 }
diff --git a/src/components/HeaderMenu/index.tsx b/src/components/HeaderMenu/index.tsx
index ad4b9561..977f32e9 100644
--- a/src/components/HeaderMenu/index.tsx
+++ b/src/components/HeaderMenu/index.tsx
@@ -6,12 +6,12 @@ import SignupModal from '~components/SignupModal'
 
 import { useModal as useSignupModal } from '~utils/useModal'
 import { useModal as useLoginModal } from '~utils/useModal'
-import { Route } from 'react-router'
+import { Link, Route } from 'react-router-dom'
+import Profile from '~routes/Profile'
 
 
 interface Props {
     username?: string
-    navigate: (pathname: string) => void
     logout: () => void
 }
 
@@ -21,18 +21,27 @@ const HeaderMenu = (props: Props) => {
 
     function authItems() {
         return (
-            <ul className="Menu auth">
-                <div className="MenuGroup">
-                    <li className="MenuItem" onClick={ () => props.username ? props.navigate(`/${props.username}`) : '' }>My Parties</li>
-                </div>
-                <div className="MenuGroup">
-                    <li className="MenuItem" onClick={ () => props.navigate('about') }>About</li>
-                    <li className="MenuItem" onClick={ () => props.navigate('guides') }>Guides</li>
-                </div>
-                <div className="MenuGroup">
-                    <li className="MenuItem" onClick={props.logout}>Logout</li>
-                </div>
-            </ul>
+            <nav>
+                <ul className="Menu auth">
+                    <div className="MenuGroup">
+                        <li className="MenuItem">
+                            <Link to={props.username || ''}>My Parties</Link>
+                        </li>
+                    </div>
+                    <div className="MenuGroup">
+                        <li className="MenuItem">
+                            <Link to='/about'>About</Link>
+                        </li>
+
+                        <li className="MenuItem">
+                            <Link to='/guides'>Guides</Link>
+                        </li>
+                    </div>
+                    <div className="MenuGroup">
+                        <li className="MenuItem" onClick={props.logout}>Logout</li>
+                    </div>
+                </ul>
+            </nav>
         )
     }
 
diff --git a/src/components/Main/index.tsx b/src/components/Main/index.tsx
deleted file mode 100644
index 52fcaccb..00000000
--- a/src/components/Main/index.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react'
-import { Router, Route } from 'react-router-dom'
-
-import history from '~utils/history'
-
-import New from '~routes/New'
-import Party from '~routes/Party'
-import Parties from '~routes/Parties'
-import Profile from '~routes/Profile'
-
-// The Main component renders one of the three provided
-// Routes (provided that one matches). Both the /roster
-// and /schedule routes will match any pathname that starts
-// with /roster or /schedule. The / route will only match
-// when the pathname is exactly the string "/"
-const Main = () => (
-  <main>
-    <Router history={history}>
-      <Route exact path='/' component={New} />
-      <Route exact path='/parties/' component={Parties} />
-      <Route path='/p/:hash' component={Party} />
-      <Route exact path='/:username' component={Profile} />
-    </Router>
-  </main>
-)
-
-export default Main
diff --git a/src/index.tsx b/src/index.tsx
index 4e678cc9..8cd86392 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
+import { createBrowserHistory } from 'history'
 import { CookiesProvider } from 'react-cookie'
 import { BrowserRouter } from 'react-router-dom'