Upstream sync

This commit is contained in:
Senad Uka
2018-05-29 17:02:50 +02:00
parent 3969863cbf
commit 8e52651172
24 changed files with 657 additions and 252 deletions

View File

@@ -9,7 +9,8 @@ import Dialog from 'material-ui/Dialog';
import Instance from '../../../components/Connection';
import {
loggedUser
loggedUser,
visitReporter,
} from 'utils/authorization';
class Login extends React.Component {
@@ -79,11 +80,17 @@ class Login extends React.Component {
let auth = res.data;
state.setCookie('token', auth.token, auth.valid_time);
localStorage.setItem('loggedUser', JSON.stringify(auth.user));
Instance.setToken(auth.token);
loggedUser.update();
console.log("....");
console.log(loggedUser.anyOf(visitReporter));
if (loggedUser.anyOf(visitReporter)){
location.href = '/#/app/form/visit/' + auth.user.useruuid;
}else{
location.href = '/#/app/table/rides';
}
location.href = '/#/';
}).catch(function (err) {
state.setState(Object.assign(state.state, {
message: (err.response.data.message),