From a198bfcfb91027f6800cc4888078c82ace301ea6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 5 Nov 2018 21:35:34 +0000 Subject: [PATCH] --- app/ayanova/public/index.html | 2 +- app/ayanova/src/App.vue | 145 ++++------------------------ app/ayanova/src/router.js | 32 +++++++ devdocs/specs/core-ui-design.txt | 159 +++++++++++++++++++++++++++++++ 4 files changed, 212 insertions(+), 126 deletions(-) diff --git a/app/ayanova/public/index.html b/app/ayanova/public/index.html index b95eea51..41181945 100644 --- a/app/ayanova/public/index.html +++ b/app/ayanova/public/index.html @@ -12,7 +12,7 @@
diff --git a/app/ayanova/src/App.vue b/app/ayanova/src/App.vue index be423204..0e1c8174 100644 --- a/app/ayanova/src/App.vue +++ b/app/ayanova/src/App.vue @@ -10,18 +10,7 @@ Home - - fa-info-circle @@ -174,7 +66,11 @@ About - + fa-sign-out-alt @@ -228,8 +124,7 @@ export default { name: "App", data() { return { - drawer: null, - + drawer: null }; }, mounted() { diff --git a/app/ayanova/src/router.js b/app/ayanova/src/router.js index 13c9a999..5230aa5c 100644 --- a/app/ayanova/src/router.js +++ b/app/ayanova/src/router.js @@ -43,3 +43,35 @@ export default new Router({ } ] }); + +// router.beforeEach((to, from, next) => { +// if(to.matched.some(record => record.meta.requiresAuth)) { +// if (localStorage.getItem('jwt') == null) { +// next({ +// path: '/login', +// params: { nextUrl: to.fullPath } +// }) +// } else { +// let user = JSON.parse(localStorage.getItem('user')) +// if(to.matched.some(record => record.meta.is_admin)) { +// if(user.is_admin == 1){ +// next() +// } +// else{ +// next({ name: 'userboard'}) +// } +// }else { +// next() +// } +// } +// } else if(to.matched.some(record => record.meta.guest)) { +// if(localStorage.getItem('jwt') == null){ +// next() +// } +// else{ +// next({ name: 'userboard'}) +// } +// }else { +// next() +// } +// }) diff --git a/devdocs/specs/core-ui-design.txt b/devdocs/specs/core-ui-design.txt index 383161f8..79a847d9 100644 --- a/devdocs/specs/core-ui-design.txt +++ b/devdocs/specs/core-ui-design.txt @@ -118,3 +118,162 @@ COLOURS - Canucks colours of course, Blue primary and green secondary. RI already uses them, get the hex codes there. - No indigo or pastels + + +=-=-=-=-=- +Ref material kept for new icons possibly: + \ No newline at end of file