Skip to content
Snippets Groups Projects
Commit 93ca0818 authored by Tamlyn Rhodes's avatar Tamlyn Rhodes Committed by john
Browse files

Use Root component from pubsweet-client.

parent c84c254e
No related branches found
No related tags found
No related merge requests found
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'),
)
......
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
......@@ -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",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment