From 2da6de9747f4847f0cdcea56b64a7d7237f32d77 Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Sat, 25 Nov 2017 15:54:31 +0100
Subject: [PATCH] Added recent shorted URLs listing: fix #43 Moved back to the
 HistoryRouter

---
 static/src/About/About.js   |  4 ++--
 static/src/Recent/Recent.js |  2 +-
 static/src/index.js         | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/static/src/About/About.js b/static/src/About/About.js
index 89df86a..ec8ed96 100644
--- a/static/src/About/About.js
+++ b/static/src/About/About.js
@@ -7,8 +7,8 @@ export default class AboutComponent extends Component {
         info: null
     }
 
-    componentDidMount() {
-       this.setState({ info: this.props.location.state.info })
+    componentWillMount() {
+        this.setState({ info: this.props.info })
     }
 
     render() {
diff --git a/static/src/Recent/Recent.js b/static/src/Recent/Recent.js
index 77f4d34..7d796d5 100644
--- a/static/src/Recent/Recent.js
+++ b/static/src/Recent/Recent.js
@@ -8,7 +8,7 @@ export default class RecentComponent extends Component {
         recent: null
     }
 
-    componentWillMount() {
+    componentDidMount() {
         fetch('/api/v1/protected/recent', {
             method: 'POST',
             headers: {
diff --git a/static/src/index.js b/static/src/index.js
index db81965..8f59a24 100644
--- a/static/src/index.js
+++ b/static/src/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import ReactDOM from 'react-dom';
-import { MemoryRouter, Route, Link } from 'react-router-dom'
+import { HashRouter, Route, Link } from 'react-router-dom'
 import { Menu, Container, Modal, Button, Image, Icon } from 'semantic-ui-react'
 import toastr from 'toastr'
 import 'semantic-ui-css/semantic.min.css';
@@ -28,7 +28,7 @@ export default class BaseComponent extends Component {
         this.setState({ oAuthOpen: true })
     }
 
-    componentDidMount() {
+    componentWillMount() {
         fetch('/api/v1/info')
             .then(d => d.json())
             .then(info => this.setState({ info }))
@@ -129,7 +129,7 @@ export default class BaseComponent extends Component {
             )
         }
         return (
-            <MemoryRouter>
+            <HashRouter>
                 <Container style={{ paddingTop: "15px" }}>
                     <Menu stackable>
                         <Menu.Item as={Link} to="/" name='shorten' onClick={this.handleItemClick} >
@@ -158,13 +158,13 @@ export default class BaseComponent extends Component {
                         </Menu.Menu>
                     </Menu>
                     <Route exact path="/" component={Home} />
-                    <Route path="/about" component={About} />
+                    <Route path="/about" render={() => <About info={info} />} />
                     <Route path="/ShareX" component={ShareX} />
                     <Route path="/Lookup" component={Lookup} />
                     <Route path="/recent" component={Recent} />
                     <Route path="/visitors/:id" component={Visitors} />
                 </Container>
-            </MemoryRouter>
+            </HashRouter>
         )
     }
 }