Upstream sync

This commit is contained in:
Senad Uka
2018-05-28 15:28:19 +02:00
parent 372b3883a0
commit 3969863cbf
10 changed files with 175 additions and 60 deletions

View File

@@ -8,6 +8,10 @@ import { Router, hashHistory, browserHistory } from 'react-router';
import { syncHistoryWithStore, routerMiddleware } from 'react-router-redux';
import reducers from './reducers';
import Instance from './components/Connection';
import {
loggedUser,
visitReporter,
} from 'utils/authorization';
const middleware = routerMiddleware(hashHistory);
const store = createStore(
@@ -55,7 +59,15 @@ const rootRoute = {
onChange: requireAuth,
onEnter: requireAuth,
component: require('./containers/App'),
indexRoute: { onEnter: (nextState, replace) => replace('/app/table/rides') },
indexRoute: {
onEnter: (nextState, replace) => {
if (loggedUser.anyOf(visitReporter)) {
replace('/app/form/visit/' + loggedUser.useruuid)
} else {
replace('/app/table/rides');
}
}
},
childRoutes: [
require('./routes/app'),
require('./routes/404'),