From 6462ad64d2a548f7f15af99848666a4ade38d5cb Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Tue, 25 Oct 2022 14:44:23 -0400 Subject: [PATCH] More especial groups --- server/package-lock.json | 4 +- server/package.json | 2 +- web/package-lock.json | 4 +- web/package.json | 2 +- web/src/components/ui/GroupBadge.vue | 55 ++++++++++++++++++++++++++-- 5 files changed, 57 insertions(+), 10 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index 1e9a429..5f4a322 100755 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "ifms-pti-svr", - "version": "3.3.4", + "version": "3.3.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ifms-pti-svr", - "version": "3.3.4", + "version": "3.3.5", "license": "ISC", "dependencies": { "@prisma/client": "^4.2.1", diff --git a/server/package.json b/server/package.json index 2ec8bd5..20cf23d 100755 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "ifms-pti-svr", - "version": "3.3.4", + "version": "3.3.5", "description": "Servidor do Portal de TI do IFMS", "main": "src/index.js", "prisma": { diff --git a/web/package-lock.json b/web/package-lock.json index a98745d..40bfbcc 100755 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "ifms-pti", - "version": "3.3.4", + "version": "3.3.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ifms-pti", - "version": "3.3.4", + "version": "3.3.5", "dependencies": { "@mdi/font": "^6.6.96", "apollo-link-ws": "^1.0.20", diff --git a/web/package.json b/web/package.json index 8f26a7a..13206c3 100755 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "ifms-pti", - "version": "3.3.4", + "version": "3.3.5", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/web/src/components/ui/GroupBadge.vue b/web/src/components/ui/GroupBadge.vue index 6d872f0..47adaa6 100644 --- a/web/src/components/ui/GroupBadge.vue +++ b/web/src/components/ui/GroupBadge.vue @@ -1,6 +1,6 @@ @@ -17,9 +17,29 @@ const especialGroups = [ color: 'blue', icon: 'mdi-book-account' }, + { + name: 'printer', + color: 'pink darken-2', + icon: 'mdi-printer' + }, + { + name: 'impressora', + color: 'pink darken-2', + icon: 'mdi-printer' + }, + { + name: 'share', + color: 'yellow darken-3', + icon: 'mdi-folder' + }, + { + name: 'DIRTI', + color: 'red darken-2', + icon: 'mdi-guy-fawkes-mask' + }, { name: 'SETIS', - color: 'red', + color: 'red darken-2', icon: 'mdi-guy-fawkes-mask' }, { @@ -36,6 +56,31 @@ const especialGroups = [ name: 'IFMS-ADMINISTRATIVO', color: 'green', icon: 'mdi-wifi' + }, + { + name: 'CAFe', + color: 'brown', + icon: 'mdi-coffee' + }, + { + name: 'vpn', + color: 'cyan', + icon: 'mdi-vpn' + }, + { + name: 'eduroam', + color: 'blue darken-2', + icon: 'mdi-radio-tower' + }, + { + name: 'admin', + color: 'red darken-2', + icon: 'mdi-guy-fawkes-mask' + }, + { + name: 'allowed', + color: 'green darken-2', + icon: 'mdi-check' } ] @@ -54,7 +99,9 @@ export default { return group ? group.color : undefined }, groupIcon() { - const group = especialGroups.find(({ name }) => this.group.includes(name)) + const group = especialGroups.find(({ name }) => + this.group.toLowerCase().includes(name.toLowerCase()) + ) return group ? group.icon : 'mdi-account-group' } }