diff --git a/resources/js/vue/services/acl/role.js b/resources/js/vue/services/acl/role.js index 71e0077d..3ffcd77a 100644 --- a/resources/js/vue/services/acl/role.js +++ b/resources/js/vue/services/acl/role.js @@ -3,16 +3,15 @@ import { TokenService } from '@/services' const $hasRole = function(roles) { if (TokenService.getToken()) { roles = roles.split('|'); - + for (const role of roles) { if(TokenService.getInfo().roles && Array.isArray(TokenService.getInfo().roles) && TokenService.getInfo().roles.includes(role)) { return true; } } } - return false; }; export { $hasRole -} \ No newline at end of file +} diff --git a/resources/js/vue/views/Dashboard.vue b/resources/js/vue/views/Dashboard.vue index c02e6f95..50e55ce5 100644 --- a/resources/js/vue/views/Dashboard.vue +++ b/resources/js/vue/views/Dashboard.vue @@ -1,105 +1,77 @@ - +