From 8069f82bd2057a32721dc2f6949d4eeccfd40f0c Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Sat, 24 Aug 2019 01:04:11 +0430 Subject: [PATCH] auth and checkbox and permission --- public/mix-manifest.json | 10 ++--- .../js/Global/components/Drawer/SideBar.vue | 25 ++++++----- .../js/Global/components/Inputs/Checkbox.vue | 42 +++++++++++++++---- .../js/Global/services/storage.services.js | 24 +++++++++-- resources/js/Global/utils/Permissions/list.js | 6 ++- 5 files changed, 78 insertions(+), 29 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index f73db3a..4bc7d39 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=f5fb638c433d6693293e", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=7779873442778964e2ec", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=1dfb9aebca08b2326107", - "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=afa817b12d26db1dd668", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=5aecdd3181f2c8ff8f34" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=dfec734f6a8269341342", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=9f7b5df53789693aae62", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=252b52bb78d06845370f", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=1fd7d081faa5afc1e968", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=caa37176d181f1cabcd1" } diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue index bef1ee5..bd9c0ac 100644 --- a/resources/js/Global/components/Drawer/SideBar.vue +++ b/resources/js/Global/components/Drawer/SideBar.vue @@ -20,7 +20,7 @@ - علیرضا حسنی + {{ user.name }}
مدیریت
@@ -34,11 +34,10 @@ - - - - - + + @@ -49,7 +48,7 @@ import Tile from '@Global/components/Drawer/Tile'; import Notifications from '@Global/components/Drawer/Notifications'; import {mapActions} from 'vuex'; - + import {UserService} from '@Global/services/storage.services' export default { data() { return { @@ -59,10 +58,11 @@ hints: true, drawer: false, Items: [ - { TitleEn: 'My Profile', TitleFa: ' حساب کاربری من ', Icon: 'dashboard' }, - { TitleEn: ' My Messages ', TitleFa: ' پیام های من ', Icon: 'question_answer' }, - { TitleEn: ' My Users ', TitleFa: ' کاربران مجموعه ی من ', Icon: 'question_answer' } - ] + { titleEn: 'My Profile', titleFa: ' حساب کاربری من ', icon: 'dashboard', permission: "", href: '/User/List' }, + // { titleEn: ' My Messages ', titleFa: ' پیام های من ', icon: 'question_answer', permission: "", href: '/User/List' }, + { titleEn: ' My Users ', titleFa: ' کاربران مجموعه ی من ', icon: 'question_answer', permission: "", href: '/User/List' } + ], + user: {name: ''} } }, components: { @@ -71,6 +71,9 @@ }, methods:{ ...mapActions('auth', ['logout']) + }, + created() { + this.user = UserService.get(); } } diff --git a/resources/js/Global/components/Inputs/Checkbox.vue b/resources/js/Global/components/Inputs/Checkbox.vue index 5ece309..2839930 100644 --- a/resources/js/Global/components/Inputs/Checkbox.vue +++ b/resources/js/Global/components/Inputs/Checkbox.vue @@ -1,10 +1,18 @@ @@ -12,15 +20,33 @@ diff --git a/resources/js/Global/services/storage.services.js b/resources/js/Global/services/storage.services.js index 7de6845..cee1739 100644 --- a/resources/js/Global/services/storage.services.js +++ b/resources/js/Global/services/storage.services.js @@ -2,6 +2,7 @@ import qs from 'qs'; const TOKEN_KEY = 'access_token' const USER = 'user' +const PERMISSION = 'permission' /** * Manage the how Access Tokens are being stored and retreived from storage. * @@ -23,18 +24,33 @@ const TokenService = { } const UserService = { - getUser() { + get() { return qs.parse(localStorage.getItem(USER)) }, - saveUser(user = null) { + save(user = null) { user = qs.stringify(user); localStorage.setItem(USER, user) }, - removeUser() { + remove() { localStorage.removeItem(USER) }, } -export { TokenService, UserService } +const PermissionService = { + get() { + return qs.parse(localStorage.getItem(PERMISSION)) + }, + + save(permission = null) { + permission = qs.stringify(permission); + localStorage.setItem(PERMISSION, permission) + }, + + remove() { + localStorage.removeItem(PERMISSION) + }, +} + +export { TokenService, UserService, PermissionService } diff --git a/resources/js/Global/utils/Permissions/list.js b/resources/js/Global/utils/Permissions/list.js index 3364099..ad8e5ed 100644 --- a/resources/js/Global/utils/Permissions/list.js +++ b/resources/js/Global/utils/Permissions/list.js @@ -54,7 +54,8 @@ export default { updateDepartment: 'update-department', destroyDepartment: 'destroy-department', - indexRole: 'index-role', + indexRole: 'assign-role', + assignRole: 'assign-role', storeRole: 'store-role', updateRole: 'update-role', destroyRole: 'destroy-role', @@ -63,4 +64,7 @@ export default { storePermission: 'store-permission', updatePermission: 'update-permission', destroyPermission: 'destroy-permission', + + sendEmail: 'send-email', + sendSMS: 'send-sms', } \ No newline at end of file