lblower
diff --git a/‎07 Form/readme.md
Copy file name to clipboardExpand all lines: 07 Form/readme.md
+31-24Lines changed: 31 additions & 24 deletions b/‎07 Form/readme.md
Copy file name to clipboardExpand all lines: 07 Form/readme.md
+31-24Lines changed: 31 additions & 24 deletions
@@ -109,21 +109,25 @@ export * from './members';
 ### ./src/router.tsx
 ```diff
 import * as React from 'react';
-import { Router, Route, IndexRoute, hashHistory } from 'react-router';
+import { Route, Switch } from 'react-router';
+import { HashRouter } from 'react-router-dom';
 import { App } from './app';
 - import { About, MembersPage } from './components';
-+ import { About, MembersPage, MemberPage } from './components';
++ import { About, MembersPage, MemberPageContainer } from './components';
 
 export const AppRouter: React.StatelessComponent<{}> = () => {
   return (
-    <Router history={hashHistory}>
-      <Route path="/" component={App} >
-        <IndexRoute component={About} />
-        <Route path="/about" component={About} />
-        <Route path="/members" component={MembersPage} />
-+       <Route path="/member" component={MemberPage} />
-      </Route>
-    </Router>
+    <HashRouter>
+      <div className="container-fluid">
+        <Route component={App} />
+        <Switch>
+          <Route exact path="/" component={About} />
+          <Route path="/about" component={About} />
+          <Route path="/members" component={MembersPage} />
++         <Route path="/member" component={MemberPageContainer} />
+        </Switch>
+      </div>
+    </HashRouter>
   );
 }
 
@@ -134,7 +138,7 @@ export const AppRouter: React.StatelessComponent<{}> = () => {
 ### ./src/components/members/page.tsx
 ```diff
 import * as React from 'react';
-+ import { Link } from 'react-router';
++ import { Link } from 'react-router-dom';
 import { MemberEntity } from '../../model';
 import { memberAPI } from '../../api/member';
 import { MemberHeader } from './memberHeader';
@@ -391,22 +395,26 @@ export class MemberPageContainer extends React.Component<{}, State> {
 ### ./src/router.tsx
 ```diff
 import * as React from 'react';
-import { Router, Route, IndexRoute, hashHistory } from 'react-router';
+import { Route, Switch } from 'react-router';
+import { HashRouter } from 'react-router-dom';
 import { App } from './app';
-- import { About, MembersPage, MemberPage } from './components';
+- import { About, MembersPage } from './components';
 + import { About, MembersPage, MemberPageContainer } from './components';
 
 export const AppRouter: React.StatelessComponent<{}> = () => {
   return (
-    <Router history={hashHistory}>
-      <Route path="/" component={App} >
-        <IndexRoute component={About} />
-        <Route path="/about" component={About} />
-        <Route path="/members" component={MembersPage} />
--       <Route path="/member" component={MemberPage} />
-+       <Route path="/member" component={MemberPageContainer} />
-      </Route>
-    </Router>
+    <HashRouter>
+      <div className="container-fluid">
+        <Route component={App} />
+        <Switch>
+          <Route exact path="/" component={About} />
+          <Route path="/about" component={About} />
+          <Route path="/members" component={MembersPage} />
+-         <Route path="/member" component={MemberPage} />
++         <Route path="/member" component={MemberPageContainer} />
+        </Switch>
+      </div>
+    </HashRouter>
   );
 }
 
@@ -488,7 +496,6 @@ export const memberAPI = {
 ### ./src/components/member/pageContainer.tsx
 ```diff
 import * as React from 'react';
-+ import { hashHistory } from 'react-router';
 + import * as toastr from 'toastr';
 + import { memberAPI } from '../../api/member';
 import { MemberEntity } from '../../model';
@@ -501,7 +508,7 @@ import { MemberPage } from './page';
 +   memberAPI.saveMember(this.state.member)
 +     .then(() => {
 +       toastr.success('Member saved.');
-+       hashHistory.goBack();
++       history.back();
 +     });
   }