Merge pull request #133 from corgicode/feature/132-back-button-bug

update routes and fix issue with the back button not re-rendering

Author: dvidsilva

src/containers/app/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { withRouter } from 'react-router';
 import Header from '../../components/header';
 import Footer from '../../components/footer';
 import Routes from '../../routes';
@@ -23,7 +24,7 @@ class App extends React.Component {
 
     render() {
         const { profile } = this.props;
-        return(
+        return (
             <div>
                 <Header profile={profile} />
                 <Routes />
@@ -48,4 +49,4 @@ const mapDispatchToProps = (dispatch) => bindActionCreators({
     getProfile,
 }, dispatch);
 
-export default connect(mapStateToProps, mapDispatchToProps)(App);
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(App));

src/routes.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
+import { withRouter } from 'react-router';
 import Home from './containers/home';
 import About from './containers/about';
 import WeAreOpenSource from './containers/about/openSource';
@@ -17,26 +18,26 @@ import EasterEgg from './containers/easter';
 
 class Routes extends React.Component {
     render() {
-        return(
+        return (
             <Switch>
-                <Route exact path="/" component={ Home } />
-                <Route path="/about/open-source" component={ WeAreOpenSource } />
-                <Route path="/about" component={ About } />
-                <Route path="/signup" component={ Signup } />
-                <Route path="/learning" component={ LearningPageContainer } />
-                <Route path="/challenges" component={ ChallengesContainer } />
-                <Route path="/submit/new/:number" component={ SubmitFormContainer } />
-                <Route path="/submit/edit/:id" component={ SubmitEditContainer } />
-                <Route path="/submit/:id" component={ SubmitViewContainer } />
-                <Route path="/challenge/:number/:title" component={ SingleChallengeContainer } />
-                <Route path="/profile/edit" component={ ProfileEdit } />
-                <Route path="/profile/:username?" component={ Profile } />
-                <Route path="/g/:username" component={ Profile } />
-                <Route path="/418" component={ () => <EasterEgg type="418" /> } />
-                <Route component={ e404 } />
+                <Route exact path="/" component={Home} />
+                <Route exact path="/about/open-source" component={WeAreOpenSource} />
+                <Route exact path="/about" component={About} />
+                <Route exact path="/signup" component={Signup} />
+                <Route exact path="/learning" component={LearningPageContainer} />
+                <Route exact path="/challenges" component={ChallengesContainer} />
+                <Route exact path="/418" component={() => <EasterEgg type="418" />} />
+                <Route path="/submit/new/:number" component={SubmitFormContainer} />
+                <Route path="/submit/edit/:id" component={SubmitEditContainer} />
+                <Route path="/submit/:id" component={SubmitViewContainer} />
+                <Route path="/challenge/:number/:title" component={SingleChallengeContainer} />
+                <Route path="/profile/edit" component={ProfileEdit} />
+                <Route path="/profile/:username?" component={Profile} />
+                <Route path="/g/:username" component={Profile} />
+                <Route component={e404} />
             </Switch>
         );
     }
 }
 
-export default Routes;
+export default withRouter(Routes);