Skip to content
Snippets Groups Projects
Commit 47b8888e authored by Alexandros Georgantas's avatar Alexandros Georgantas
Browse files

Merge branch '128-redirect-invalid-routes' into 'master'

Resolve "Redirect invalid routes"

Closes #128

See merge request !119
parents 0bab4904 3e745b96
No related branches found
No related tags found
No related merge requests found
import React from 'react' import React from 'react'
import { withProps } from 'recompose' import { withProps } from 'recompose'
import { Route } from 'react-router-dom' import { Route, Switch } from 'react-router-dom'
import { AuthenticatedComponent } from 'pubsweet-client' import { AuthenticatedComponent } from 'pubsweet-client'
import App from 'pubsweet-component-xpub-app/src/components' import App from 'pubsweet-component-xpub-app/src/components'
...@@ -31,36 +31,38 @@ const PrivateRoute = ({ component: Component, ...rest }) => ( ...@@ -31,36 +31,38 @@ const PrivateRoute = ({ component: Component, ...rest }) => (
const Routes = () => ( const Routes = () => (
<App> <App>
<PrivateRoute component={DashboardPage} exact path="/" /> <Switch>
<PrivateRoute <PrivateRoute component={DashboardPage} exact path="/" />
component={SubmitPage} <PrivateRoute
exact component={SubmitPage}
path="/projects/:project/versions/:version/submit" exact
/> path="/projects/:project/versions/:version/submit"
<PrivateRoute />
component={ManuscriptPage} <PrivateRoute
exact component={ManuscriptPage}
path="/projects/:project/versions/:version/manuscript" exact
/> path="/projects/:project/versions/:version/manuscript"
<PrivateRoute />
component={ReviewersPage} <PrivateRoute
exact component={ReviewersPage}
path="/projects/:project/versions/:version/reviewers" exact
/> path="/projects/:project/versions/:version/reviewers"
<PrivateRoute />
component={ReviewPage} <PrivateRoute
exact component={ReviewPage}
path="/projects/:project/versions/:version/reviews/:review" exact
/> path="/projects/:project/versions/:version/reviews/:review"
<PrivateRoute />
component={DecisionPage} <PrivateRoute
exact component={DecisionPage}
path="/projects/:project/versions/:version/decisions/:decision" exact
/> path="/projects/:project/versions/:version/decisions/:decision"
/>
<Route component={Signup} exact path="/signup" />
<Route component={LoginPage} exact path="/login" />
<Route component={Signup} exact path="/signup" />
<Route component={LoginPage} exact path="/login" />
<PrivateRoute component={DashboardPage} path="*" />
</Switch>
{/* <Redirect from="/" to="/dashboard"/> */} {/* <Redirect from="/" to="/dashboard"/> */}
</App> </App>
) )
......
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