From 5bcc1dcdb064c8a4cab83cedbb1901dbc18cd736 Mon Sep 17 00:00:00 2001 From: alfredojl Date: Fri, 18 Sep 2020 22:10:05 -0500 Subject: [PATCH] Views updated and correct functionally. Improvements added. --- src/routes.js | 15 ++ src/views/AddEquip.vue | 2 +- src/views/Login.vue | 2 +- src/views/UpdateEquip.vue | 267 ++++++++++++++++++----- src/views/UpdatePrinter.vue | 417 ++++++++++++++++++++++++++++++++++++ src/views/User.vue | 11 +- 6 files changed, 653 insertions(+), 61 deletions(-) create mode 100644 src/views/UpdatePrinter.vue diff --git a/src/routes.js b/src/routes.js index 44a787b..beb1140 100644 --- a/src/routes.js +++ b/src/routes.js @@ -6,6 +6,7 @@ import User from './views/User.vue' import AddEquip from './views/AddEquip.vue' import AddPrinter from './views/AddPrinter.vue' import UpdateEquip from './views/UpdateEquip.vue' +import UpdatePrinter from './views/UpdatePrinter.vue' const routes = [{ @@ -83,6 +84,20 @@ const routes = [{ next(true); } }, + { + path: '/updatePrinter', + component: UpdatePrinter, + name: 'updatePrinter', + meta: { perm: true }, + beforeEnter: (to, from, next) => { + if (!isAuthenticated()) + next('/login'); + else if (isAuthenticated() && !isAdmin()) + next(false) + else + next(true); + } + }, ] Vue.use(VueRouter) diff --git a/src/views/AddEquip.vue b/src/views/AddEquip.vue index 226850d..ab3142e 100644 --- a/src/views/AddEquip.vue +++ b/src/views/AddEquip.vue @@ -20,7 +20,7 @@ enctype="multipart/form-data" > { if (res.status == 200) { - localStorage.setItem('isAdmin', res.data.user.isAdmin); + localStorage.setItem('isAdmin', (res.data.user.isAdmin)); localStorage.setItem('token', res.data.token); localStorage.setItem('user', res.data.user.userName); localStorage.setItem( diff --git a/src/views/UpdateEquip.vue b/src/views/UpdateEquip.vue index 538a879..94dee5c 100644 --- a/src/views/UpdateEquip.vue +++ b/src/views/UpdateEquip.vue @@ -1,7 +1,27 @@