Merge branch 'client-root' into 'master'

Use Root component from pubsweet-client.

See merge request xpub!73

packages/xpub-collabra/app/app.js

 import React from 'react'
 import ReactDOM from 'react-dom'
 import { AppContainer } from 'react-hot-loader'
-import { Provider as StoreProvider } from 'react-redux'
-import { Router } from 'react-router-dom'
 import createHistory from 'history/createBrowserHistory'
 
-import { configureStore } from 'pubsweet-client'
+import { configureStore, Root } from 'pubsweet-client'
 import { JournalProvider } from 'xpub-journal'
 import 'xpub-theme'
 
 import * as journal from './config/journal'
-import Root from './routes'
+import Routes from './routes'
 
 const history = createHistory()
 const store = configureStore(history, {})
+const theme = {}
 
 const render = () => {
   ReactDOM.render(
     <AppContainer>
-      <StoreProvider store={store}>
-        <JournalProvider journal={journal}>
-          <Router history={history}>
-            <Root />
-          </Router>
-        </JournalProvider>
-      </StoreProvider>
+      <JournalProvider journal={journal}>
+        <Root
+          history={history}
+          routes={<Routes />}
+          store={store}
+          theme={theme}
+        />
+      </JournalProvider>
     </AppContainer>,
     document.getElementById('root'),
   )

packages/xpub-collabra/app/routes.js

 import React from 'react'
-import { Route, withRouter } from 'react-router-dom'
+import { Route } from 'react-router-dom'
 
 import App from 'pubsweet-component-xpub-app/src/components'
 
@@ -19,7 +19,7 @@ import DecisionPage from 'pubsweet-component-xpub-review/src/components/Decision
 
 // TODO: use componentDidMount to fetch the current user before rendering?
 
-const Root = () => (
+const Routes = () => (
   <App>
     <PrivateRoute component={DashboardPage} exact path="/" />
     <PrivateRoute
@@ -57,4 +57,4 @@ const Root = () => (
   </App>
 )
 
-export default withRouter(Root)
+export default Routes

packages/xpub-collabra/package.json

@@ -30,7 +30,6 @@
     "pubsweet-server": "^1.0.0-beta.2",
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
-    "react-redux": "^5.0.2",
     "react-router-dom": "^4.2.2",
     "recompose": "^0.26.0",
     "redux": "^3.6.0",