mirror of
https://github.com/dborth/vbagx.git
synced 2024-11-22 18:49:18 +01:00
Updates:
-Fix user data state on before enter to route -Block app on start instead of "free look"
This commit is contained in:
parent
7cec420ced
commit
f682dacd9b
@ -68,9 +68,6 @@ var app = new Framework7({
|
||||
cordovaApp.init(f7);
|
||||
}
|
||||
|
||||
// Retrieve data for user on app start
|
||||
user.dispatch('checkData').then(() =>{ });
|
||||
|
||||
//Intercept axios call to determine if it gets (401 Unauthorized) response
|
||||
http.interceptors.response.use(undefined, function (err) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
|
@ -1,8 +1,9 @@
|
||||
import user from './../stores/user.js';
|
||||
|
||||
let Check = {
|
||||
authorization( { to, resolve } ) {
|
||||
async authorization( { to, resolve } ) {
|
||||
const router = this;
|
||||
await user.dispatch('checkData');
|
||||
if (!user.getters.isLogged.value){
|
||||
router.navigate('/login/', { reloadCurrent: true });
|
||||
}
|
||||
|
@ -12,8 +12,6 @@ let routes = [
|
||||
name: 'about',
|
||||
path: '/about/',
|
||||
component: AboutPage,
|
||||
allowedRoles: [15],
|
||||
beforeEnter: [Check.authorization, Check.permission],
|
||||
},
|
||||
...home,
|
||||
...login,
|
||||
|
@ -2,11 +2,15 @@ import HomePage from '../../pages/home.f7.html';
|
||||
import LeftPanelPage from '../../pages/home/panel-left.f7.html';
|
||||
import RightPanelPage from '../../pages/home/panel-right.f7.html';
|
||||
|
||||
import Check from './../controllers/check';
|
||||
|
||||
const home = [
|
||||
{
|
||||
name: 'home',
|
||||
path: '/',
|
||||
component: HomePage,
|
||||
allowedRoles: [1,9,10,14,15],
|
||||
beforeEnter: [Check.authorization, Check.permission],
|
||||
},
|
||||
{
|
||||
name: 'panel-left-',
|
||||
|
Loading…
Reference in New Issue
Block a user