Upstream sync

This commit is contained in:
Senad Uka
2018-05-30 08:52:10 +02:00
parent 8e52651172
commit 04debaf3e9
14 changed files with 540 additions and 233 deletions

View File

@@ -79,18 +79,15 @@ class Login extends React.Component {
}).then(function (res) {
let auth = res.data;
state.setCookie('token', auth.token, auth.valid_time);
Instance.setToken(auth.token);
localStorage.setItem('loggedUser', JSON.stringify(auth.user));
loggedUser.update();
console.log("....");
console.log(loggedUser.anyOf(visitReporter));
if (loggedUser.anyOf(visitReporter)){
if (loggedUser.anyOf(visitReporter)) {
location.href = '/#/app/form/visit/' + auth.user.useruuid;
}else{
} else {
location.href = '/#/app/table/rides';
}
}).catch(function (err) {
state.setState(Object.assign(state.state, {
message: (err.response.data.message),