From 87ecc5d0e264681acd7bb48406da454bfe71aae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 6 Jun 2020 14:00:26 +0200 Subject: [PATCH] fixed some icons --- src/components/user/Config.vue | 161 +++++++++++------- .../vorstand/ManagementNavigation.vue | 7 +- src/plugins/routes.js | 4 +- 3 files changed, 106 insertions(+), 66 deletions(-) diff --git a/src/components/user/Config.vue b/src/components/user/Config.vue index ab89eb3..532b707 100644 --- a/src/components/user/Config.vue +++ b/src/components/user/Config.vue @@ -173,66 +173,91 @@ - OS: - - {{ - token.platform === 'macos' || token.platform === 'iphone' - ? apple - : token.platform === 'windows' - ? windows - : token.platfrom === 'android' - ? android - : token.platform + + + Betriebssystem + + + + {{ + token.platform === 'macos' || token.platform === 'iphone' + ? apple + : token.platform === 'windows' + ? windows + : token.platform === 'android' + ? android + : token.platform === 'linux' + ? linux + : token.platfrom + }} + + + {{ token.platform === 'macos' ? mac : iphone }} + + + + + + Browser + + + + {{ + token.browser === 'chrome' + ? chrome + : token.browser === 'firefox' + ? firefox + : token.browser === 'opera' + ? opera + : token.browser === 'safari' + ? safari + : token.browser === 'msie' + ? msie + : token.browser + }} + + + + + + Letzter Aktualisierung + + + {{ token.timestamp.day }}.{{ token.timestamp.month }}.{{ + token.timestamp.year }} - - token.timestamp.hour + ? '0' + String(token.timestamp.hour) + : token.timestamp.hour + }}:{{ + 10 > token.timestamp.minute + ? '0' + String(token.timestamp.minute) + : token.timestamp.minute + }}:{{ + 10 > token.timestamp.second + ? '0' + String(token.timestamp.second) + : token.timestamp.second + }} - {{ token.platform === 'macos' ? mac : iphone }} - - Browser: - - {{ - token.browser === 'chrome' - ? chrome - : token.browser === 'firefox' - ? firefox - : token.browser === 'opera' - ? opera - : token.browser === 'safari' - ? safari - : token.browser - }} - + + Lebenszeit + + + {{ calcLifefime(token.lifetime) }} + - - Letzter Aktualisierung: {{ token.timestamp.day }}.{{ - token.timestamp.month - }}.{{ token.timestamp.year }} um - {{ - 10 > token.timestamp.hour - ? '0' + String(token.timestamp.hour) - : token.timestamp.hour - }}:{{ - 10 > token.timestamp.minute - ? '0' + String(token.timestamp.minute) - : token.timestamp.minute - }}:{{ - 10 > token.timestamp.second - ? '0' + String(token.timestamp.second) - : token.timestamp.second - }} - - Lebenszeit: {{ calcLifefime(token.lifetime) }} - + - {{trashCan}} + {{ trashCan }} @@ -242,7 +267,14 @@ - + Speicherns @@ -268,7 +300,8 @@ import { mdiCellphoneIphone, mdiTrashCan, mdiAndroid, - mdiWindows + mdiWindows, + mdiLinux } from '@mdi/js' import { mapGetters, mapActions } from 'vuex' export default { @@ -279,11 +312,12 @@ export default { mac: mdiLaptopMac, iphone: mdiCellphoneIphone, android: mdiAndroid, - mdiWindows: mdiWindows, + windows: mdiWindows, + linux: mdiLinux, chrome: mdiGoogleChrome, firefox: mdiFirefox, opera: mdiOpera, - ie: mdiInternetExplorer, + msie: mdiInternetExplorer, safari: mdiAppleSafari, person: mdiAccount, bar: mdiGlassCocktail, @@ -309,9 +343,10 @@ export default { return true }, empty_password: () => { - return this.acceptedPassword !== null ? true : 'Password wurde nicht gesetzt' + return this.acceptedPassword !== null + ? true + : 'Password wurde nicht gesetzt' } - } }, mounted() { @@ -342,9 +377,13 @@ export default { if (this.password) user.password = this.password } if (this.$refs.acceptedPassword.validate()) { - this.saveConfig({oldUsername: user.username, ...user, acceptedPassword: this.acceptedPassword}) + this.saveConfig({ + oldUsername: user.username, + ...user, + acceptedPassword: this.acceptedPassword + }) } else { - this.passError = "Du musst dein Password eingeben" + this.passError = 'Du musst dein Password eingeben' } this.password = null this.controlPassword = null diff --git a/src/components/vorstand/ManagementNavigation.vue b/src/components/vorstand/ManagementNavigation.vue index 890ff3b..6631763 100644 --- a/src/components/vorstand/ManagementNavigation.vue +++ b/src/components/vorstand/ManagementNavigation.vue @@ -25,7 +25,7 @@ - ??? + {{jobs}} Dienstarten @@ -35,14 +35,15 @@