Move route creation code from USFS into here

app.js

@@ -1,13 +1,13 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { IndexRedirect, Route, Router, useRouterHistory } from 'react-router';
+import { IndexRedirect, Route, Router, useRouterHistory, withRouter } from 'react-router';
 import { Provider } from 'react-redux';
 import { createStore, combineReducers } from 'redux';
 import { createHistory } from 'history';
 
 import 'us-forms-system/lib/css/styles.css';
 
-import route from './js/routes.jsx';
+import { makeRoutes } from './js/routes.jsx';
 import reducer from './js/reducers';
 import Form from './js/components/Form.jsx';
 
@@ -21,7 +21,7 @@ ReactDOM.render(
 	(
 	  <Provider store={store}>
       <Router history={browserHistory}>
-      	{route}
+      	{makeRoutes(withRouter)}
       </Router>
     </Provider>
 	), document.getElementById('root')

js/routes.jsx

@@ -1,17 +1,58 @@
-import { createRoutes } from 'us-forms-system/lib/js/helpers';
-
 import formConfig from './config/form';
 import Form from './components/Form.jsx';
 
-const routes = createRoutes(formConfig);
+import FormPage from 'us-forms-system/lib/js/containers/FormPage';
+import ReviewPage from 'us-forms-system/lib/js/review/ReviewPage';
+
+import { createFormPageList, createPageList } from 'us-forms-system/lib/js/helpers';
+
+export function makeRoutes(withRouter) {
+  const formPages = createFormPageList(formConfig);
+  const pageList = createPageList(formConfig, formPages);
+  let routes = formPages
+    .map(page => {
+      return {
+        path: page.path,
+        component: withRouter(page.component || FormPage),
+        pageConfig: page,
+        pageList,
+        urlPrefix: formConfig.urlPrefix
+      };
+    });
+  if (formConfig.introduction) {
+    routes = [
+      {
+        path: 'introduction',
+        component: withRouter(formConfig.introduction),
+        formConfig,
+        pageList
+      }
+    ].concat(routes);
+  }
 
-const route = {
-  path: '/',
-  component: Form,
-  indexRoute: {
-    onEnter: (nextState, replace) => replace(formConfig.urlPrefix+routes[0].path)
-  },
-  childRoutes: routes,
-};
+  routes = routes.concat([
+    {
+      path: 'review-and-submit',
+      formConfig,
+      component: withRouter(ReviewPage),
+      pageList
+    },
+    {
+      path: 'confirmation',
+      component: formConfig.confirmation //withRouter
+    },
+    {
+      path: '*',
+      onEnter: (nextState, replace) => replace(formConfig.urlPrefix || '/')
+    }
+  ]);
 
-export default route;
+  return {
+    path: '/',
+    component: Form,
+    indexRoute: {
+      onEnter: (nextState, replace) => replace(formConfig.urlPrefix+routes[0].path)
+    },
+    childRoutes: routes,
+  };
+}

package.json

@@ -24,6 +24,7 @@
     "css-loader": "^0.28.11",
     "react": "^15.6.2",
     "react-dom": "^15.6.2",
+    "react-router": "3",
     "style-loader": "^0.21.0",
     "svg-url-loader": "^2.3.2",
     "url-loader": "^1.0.1",
@@ -35,6 +36,6 @@
     "webpack-merge": "^4.1.3"
   },
   "dependencies": {
-    "us-forms-system": "^1.0.1"
+    "us-forms-system": "dmethvin-gov/us-forms-system.git#no-router"
   }
 }