Merge pull request #30 from chiss2906/Routing

Routing

Author: chenkie

01-Login/src/history.js

@@ -1,5 +1,3 @@
 import createHistory from 'history/createBrowserHistory'
 
-export default createHistory({
-  forceRefresh: true
-})
+export default createHistory()

01-Login/src/routes.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Route, BrowserRouter } from 'react-router-dom';
+import { Route, Router } from 'react-router-dom';
 import App from './App';
 import Home from './Home/Home';
 import Callback from './Callback/Callback';
@@ -16,7 +16,7 @@ const handleAuthentication = (nextState, replace) => {
 
 export const makeMainRoutes = () => {
   return (
-      <BrowserRouter history={history} component={App}>
+      <Router history={history} component={App}>
         <div>
           <Route path="/" render={(props) => <App auth={auth} {...props} />} />
           <Route path="/home" render={(props) => <Home auth={auth} {...props} />} />
@@ -25,6 +25,6 @@ export const makeMainRoutes = () => {
             return <Callback {...props} /> 
           }}/>
         </div>
-      </BrowserRouter>
+      </Router>
   );
 }

02-User-Profile/src/history.js

@@ -1,5 +1,3 @@
 import createHistory from 'history/createBrowserHistory'
 
-export default createHistory({
-  forceRefresh: true
-})
+export default createHistory()

02-User-Profile/src/routes.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Redirect, Route, BrowserRouter } from 'react-router-dom';
+import { Redirect, Route, Router } from 'react-router-dom';
 import App from './App';
 import Home from './Home/Home';
 import Profile from './Profile/Profile';
@@ -17,7 +17,7 @@ const handleAuthentication = (nextState, replace) => {
 
 export const makeMainRoutes = () => {
   return (
-    <BrowserRouter history={history} component={App}>
+    <Router history={history} component={App}>
         <div>
           <Route path="/" render={(props) => <App auth={auth} {...props} />} />
           <Route path="/home" render={(props) => <Home auth={auth} {...props} />} />
@@ -33,6 +33,6 @@ export const makeMainRoutes = () => {
             return <Callback {...props} /> 
           }}/>        
         </div>
-      </BrowserRouter>
+      </Router>
   );
 }

03-Calling-an-API/src/history.js

@@ -1,5 +1,3 @@
 import createHistory from 'history/createBrowserHistory'
 
-export default createHistory({
-  forceRefresh: true
-})
+export default createHistory()

03-Calling-an-API/src/routes.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Redirect, Route, BrowserRouter } from 'react-router-dom';
+import { Redirect, Route, Router } from 'react-router-dom';
 import App from './App';
 import Home from './Home/Home';
 import Profile from './Profile/Profile';
@@ -18,7 +18,7 @@ const handleAuthentication = (nextState, replace) => {
 
 export const makeMainRoutes = () => {
   return (
-    <BrowserRouter history={history} component={App}>
+    <Router history={history} component={App}>
         <div>
           <Route path="/" render={(props) => <App auth={auth} {...props} />} />
           <Route path="/home" render={(props) => <Home auth={auth} {...props} />} />
@@ -41,6 +41,6 @@ export const makeMainRoutes = () => {
             return <Callback {...props} /> 
           }}/>        
         </div>
-      </BrowserRouter>
+      </Router>
   );
 }

04-Authorization/src/history.js

@@ -1,5 +1,3 @@
 import createHistory from 'history/createBrowserHistory'
 
-export default createHistory({
-  forceRefresh: true
-})
+export default createHistory()

04-Authorization/src/routes.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Redirect, Route, BrowserRouter } from 'react-router-dom';
+import { Redirect, Route, Router } from 'react-router-dom';
 import App from './App';
 import Home from './Home/Home';
 import Profile from './Profile/Profile';
@@ -19,7 +19,7 @@ const handleAuthentication = (nextState, replace) => {
 
 export const makeMainRoutes = () => {
   return (
-    <BrowserRouter history={history} component={App}>
+    <Router history={history} component={App}>
         <div>
           <Route path="/" render={(props) => <App auth={auth} {...props} />} />
           <Route path="/home" render={(props) => <Home auth={auth} {...props} />} />
@@ -49,6 +49,6 @@ export const makeMainRoutes = () => {
             return <Callback {...props} /> 
           }}/>        
         </div>
-      </BrowserRouter>
+      </Router>
   );
 }