Feature/standardize ui display
This commit is contained in:
@@ -139,15 +139,14 @@ export default {
|
||||
// Swap admin token + user in local state.
|
||||
var token = response.data.token;
|
||||
if (token) {
|
||||
localStorage['Access Token'] = 'Bearer ' + token;
|
||||
vm.util.persistLoginSession(token, response.data.token_expires_at, {
|
||||
adminSession: true,
|
||||
adminRole: response.data.user && response.data.user.role
|
||||
});
|
||||
localStorage.setItem('is_impersonating', '1');
|
||||
if (vm.util && vm.util.setAuthorization) vm.util.setAuthorization();
|
||||
}
|
||||
if (response.data.user) {
|
||||
vm.data.user = response.data.user;
|
||||
if (response.data.user.role !== undefined && response.data.user.role !== null) {
|
||||
localStorage.setItem('admin_role', String(response.data.user.role));
|
||||
}
|
||||
}
|
||||
|
||||
vm.util.notify('Menyamar berjaya', 'success');
|
||||
|
||||
@@ -146,9 +146,14 @@ export default {
|
||||
})
|
||||
.catch(error => {
|
||||
$.notifyClose();
|
||||
if (this.util.showResult(error) == 401) {
|
||||
vm.logout();
|
||||
var status = error.response ? error.response.status : 500;
|
||||
if (status === 401) {
|
||||
vm.util.clearSession();
|
||||
vm.$router.replace({ name: 'Admin Login' });
|
||||
return;
|
||||
}
|
||||
vm.util.showResult(error, 'error');
|
||||
vm.loading = false;
|
||||
})
|
||||
} else {
|
||||
this.$router.push({ name: 'Admin Login' });
|
||||
@@ -186,15 +191,14 @@ export default {
|
||||
return;
|
||||
}
|
||||
if (response.data.token) {
|
||||
localStorage['Access Token'] = 'Bearer ' + response.data.token;
|
||||
if (vm.util && vm.util.setAuthorization) vm.util.setAuthorization();
|
||||
vm.util.persistLoginSession(response.data.token, response.data.token_expires_at, {
|
||||
adminSession: true,
|
||||
adminRole: response.data.user && response.data.user.role
|
||||
});
|
||||
}
|
||||
localStorage.removeItem('is_impersonating');
|
||||
if (response.data.user) {
|
||||
vm.data.user = response.data.user;
|
||||
if (response.data.user.role !== undefined && response.data.user.role !== null) {
|
||||
localStorage.setItem('admin_role', String(response.data.user.role));
|
||||
}
|
||||
}
|
||||
vm.util.notify('Berjaya kembali', 'success');
|
||||
if (vm.$router) vm.$router.go(0);
|
||||
@@ -206,9 +210,7 @@ export default {
|
||||
},
|
||||
|
||||
logout: function () {
|
||||
localStorage.removeItem('admin_role');
|
||||
localStorage.removeItem('is_impersonating');
|
||||
localStorage.clear();
|
||||
this.util.clearSession();
|
||||
this.$router.push({ name: 'Admin Login' });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,12 +84,10 @@ export default {
|
||||
.then(response => {
|
||||
vm.stopLoading();
|
||||
if (this.util.showResult(response, 'success')) {
|
||||
localStorage['Access Token'] = `Bearer ${response.data.token}`;
|
||||
localStorage.setItem('admin_session', '1');
|
||||
if (response.data.user && response.data.user.role !== undefined && response.data.user.role !== null) {
|
||||
localStorage.setItem('admin_role', String(response.data.user.role));
|
||||
}
|
||||
this.util.setAuthorization();
|
||||
this.util.persistLoginSession(response.data.token, response.data.token_expires_at, {
|
||||
adminSession: true,
|
||||
adminRole: response.data.user && response.data.user.role
|
||||
});
|
||||
if (Number(response.data.user && response.data.user.role) === 3) {
|
||||
vm.$router.push({ name: 'Kehadiran Calon' });
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user