From 338fbb97b36addb32feb1c7b8b848a2c8e5b128c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Thu, 12 Nov 2020 14:28:02 +0100 Subject: [PATCH] =?UTF-8?q?[Admin]=20Design=C3=A4nderung=20der=20Adminpage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/logo-dark.svg | 432 ++--------------------- public/logo.svg | 249 ++++++++++--- src/plugins/user/pages/AdminSettings.vue | 99 ++++-- 3 files changed, 304 insertions(+), 476 deletions(-) diff --git a/public/logo-dark.svg b/public/logo-dark.svg index 6110815..378851d 100644 --- a/public/logo-dark.svg +++ b/public/logo-dark.svg @@ -7,27 +7,17 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="525.1181" - height="635.90552" - id="svg3052" version="1.1" - inkscape:version="0.48.5 r10040" - sodipodi:docname="Loewe_dunkelaufhell.svg"> - - - - image/svg+xml - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview4" /> diff --git a/public/logo.svg b/public/logo.svg index 2cd6ae8..3baaf7b 100644 --- a/public/logo.svg +++ b/public/logo.svg @@ -7,27 +7,17 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="560.12598" - height="678.29919" - id="svg3052" version="1.1" - inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="logo-dark.svg" - viewBox="0 0 525.1181 635.90552"> - - - - image/svg+xml - - - - - - image/svg+xml - - + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview4" /> diff --git a/src/plugins/user/pages/AdminSettings.vue b/src/plugins/user/pages/AdminSettings.vue index 1dffb96..e60494d 100644 --- a/src/plugins/user/pages/AdminSettings.vue +++ b/src/plugins/user/pages/AdminSettings.vue @@ -1,23 +1,44 @@ @@ -32,15 +53,16 @@ import { import UserSelector from '../components/UserSelector.vue'; import MainUserSettings from '../components/settings/MainUserSettings.vue'; import RoleSettings from '../components/settings/RoleSettings.vue'; -import { Store } from 'vuex'; -import { StateInterface } from 'src/store'; -import { hasPermission } from 'src/components/permission'; -import { PERMISSIONS } from '../permissions'; +import {Store} from 'vuex'; +import {StateInterface} from 'src/store'; +import {hasPermission} from 'src/components/permission'; +import {PERMISSIONS} from '../permissions'; +import {Screen} from 'quasar'; export default defineComponent({ name: 'AdminSettings', - components: { UserSelector, MainUserSettings, RoleSettings }, - setup(_, { root }) { + components: {UserSelector, MainUserSettings, RoleSettings}, + setup(_, {root}) { const store = >root.$store; onBeforeMount(() => { @@ -58,10 +80,37 @@ export default defineComponent({ console.log(value); }; + interface Tab { + name: string; + label: string; + } + + const tabs: Tab[] = [ + {name: 'user', label: 'Mitglieder'}, + {name: 'newUser', label: 'Neues Mitglied'}, + {name: 'roles', label: 'Rollen'} + ] + + const drawer = ref(false) + + const showDrawer = computed({ + get: () => { + return !Screen.gt.sm && drawer.value + }, + set: (val: boolean) => { + drawer.value = val + } + }) + + const tab = ref('user'); + return { user, userUpdated, - canEditRoles + canEditRoles, + showDrawer, + tab, + tabs }; } });