Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master

packages/xpub-faraday/app/config/journal/submit-wizard.js

@@ -9,7 +9,7 @@ import {
 } from '@pubsweet/ui'
 import uploadFileFn from 'xpub-upload'
 import { required, minChars, minSize } from 'xpub-validators'
-import { AuthorList } from 'pubsweet-component-wizard/src/components/AuthorList'
+import { AuthorList } from 'pubsweet-components-faraday/src/components'
 
 import { declarations } from './'
 import issueTypes from './issues-types'
@@ -49,6 +49,7 @@ const uploadFile = input => uploadFileFn(input)
 export default {
   showProgress: true,
   formSectionKeys: ['metadata', 'declarations', 'conflicts', 'notes', 'files'],
+  submissionRedirect: '/confirmation-page',
   dispatchFunctions: [uploadFile],
   steps: [
     {

packages/xpub-faraday/app/routes.js

 import React from 'react'
-import { Route } from 'react-router-dom'
-import { DragDropContext } from 'react-dnd'
-import HTML5Backend from 'react-dnd-html5-backend'
+import { Route, Switch } from 'react-router-dom'
 
 import App from 'pubsweet-component-xpub-app/src/components'
 
@@ -14,19 +12,35 @@ import {
 
 import DashboardPage from 'pubsweet-component-xpub-dashboard/src/components/DashboardPage'
 import WizardPage from 'pubsweet-component-wizard/src/components/WizardPage'
+import ManuscriptPage from 'pubsweet-component-xpub-manuscript/src/components/ManuscriptPage'
+import ConfirmationPage from 'pubsweet-components-faraday/src/components/UIComponents/ConfirmationPage'
+import NotFound from 'pubsweet-components-faraday/src/components/UIComponents/NotFound'
 
 const Routes = () => (
   <App>
-    <Route component={LoginPage} exact path="/login" />
-    <Route component={SignupPage} exact path="/signup" />
-    <PrivateRoute component={DashboardPage} exact path="/" />
-    <PrivateRoute component={LogoutPage} exact path="/logout" />
-    <PrivateRoute
-      component={WizardPage}
-      exact
-      path="/projects/:project/versions/:version/submit"
-    />
+    <Switch>
+      <Route component={LoginPage} exact path="/login" />
+      <Route component={SignupPage} exact path="/signup" />
+      <PrivateRoute component={DashboardPage} exact path="/" />
+      <PrivateRoute
+        component={ConfirmationPage}
+        exact
+        path="/confirmation-page"
+      />
+      <PrivateRoute component={LogoutPage} exact path="/logout" />
+      <PrivateRoute
+        component={WizardPage}
+        exact
+        path="/projects/:project/versions/:version/submit"
+      />
+      <PrivateRoute
+        component={ManuscriptPage}
+        exact
+        path="/projects/:project/versions/:version/manuscript"
+      />
+      <Route component={NotFound} />
+    </Switch>
   </App>
 )
 
-export default DragDropContext(HTML5Backend)(Routes)
+export default Routes

packages/xpub-faraday/config/components.json

@@ -4,5 +4,6 @@
   "pubsweet-component-xpub-dashboard",
   "xpub-faraday-server",
   "pubsweet-component-ink-backend",
-  "pubsweet-component-wizard"
+  "pubsweet-component-wizard",
+  "pubsweet-components-faraday"
 ]

packages/xpub-faraday/webpack/babel-includes.js

@@ -8,6 +8,7 @@ module.exports = [
   /pubsweet-[^/]+\/src/,
   /xpub-[^/]+\/src/,
   /component-[^/]+\/src/,
+  /components-[^/]+\/src/,
   /wax-[^/]+\/src/,
   /@pubsweet\/[^/]+\/src/,
 ]

yarn.lock

@@ -6599,7 +6599,7 @@ modify-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
 
-moment@2.x.x, moment@^2.18.1, moment@^2.6.0:
+moment@2.x.x, moment@^2.18.1, moment@^2.20.1, moment@^2.6.0:
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"