fixed some icons

This commit is contained in:
Tim Gröger 2020-06-06 14:00:26 +02:00
parent 37649abbbf
commit 87ecc5d0e2
3 changed files with 106 additions and 66 deletions

View File

@ -173,66 +173,91 @@
<v-card v-for="token in tokens" :key="token.id" outlined> <v-card v-for="token in tokens" :key="token.id" outlined>
<v-card-text> <v-card-text>
<v-row> <v-row>
<v-col <v-col>
>OS: <v-col>
<v-icon> Betriebssystem
{{ </v-col>
token.platform === 'macos' || token.platform === 'iphone' <v-col>
? apple <v-icon>
: token.platform === 'windows' {{
? windows token.platform === 'macos' || token.platform === 'iphone'
: token.platfrom === 'android' ? apple
? android : token.platform === 'windows'
: token.platform ? windows
: token.platform === 'android'
? android
: token.platform === 'linux'
? linux
: token.platfrom
}}
</v-icon>
<v-icon
v-if="
token.platform === 'macos' || token.platform === 'iphone'
"
>
{{ token.platform === 'macos' ? mac : iphone }}
</v-icon>
</v-col>
</v-col>
<v-col>
<v-col>
Browser
</v-col>
<v-col>
<v-icon>
{{
token.browser === 'chrome'
? chrome
: token.browser === 'firefox'
? firefox
: token.browser === 'opera'
? opera
: token.browser === 'safari'
? safari
: token.browser === 'msie'
? msie
: token.browser
}}
</v-icon>
</v-col>
</v-col>
<v-col>
<v-col>
Letzter Aktualisierung
</v-col>
<v-col>
{{ token.timestamp.day }}.{{ token.timestamp.month }}.{{
token.timestamp.year
}} }}
</v-icon> um
<v-icon {{
v-if=" 10 > token.timestamp.hour
token.platform === 'macos' || token.platform === 'iphone' ? '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
}}</v-col
> >
{{ token.platform === 'macos' ? mac : iphone }}
</v-icon>
</v-col> </v-col>
<v-col> <v-col>
Browser: <v-col>
<v-icon> Lebenszeit
{{ </v-col>
token.browser === 'chrome' <v-col>
? chrome {{ calcLifefime(token.lifetime) }}
: token.browser === 'firefox' </v-col>
? firefox
: token.browser === 'opera'
? opera
: token.browser === 'safari'
? safari
: token.browser
}}
</v-icon>
</v-col> </v-col>
<v-col> <v-col class="text-right">
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
}}
</v-col>
<v-col>Lebenszeit: {{ calcLifefime(token.lifetime) }}</v-col>
<v-col>
<v-btn icon @click="deleteToken(token)"> <v-btn icon @click="deleteToken(token)">
<v-icon> <v-icon>
{{trashCan}} {{ trashCan }}
</v-icon> </v-icon>
</v-btn> </v-btn>
</v-col> </v-col>
@ -242,7 +267,14 @@
</v-card-text> </v-card-text>
<v-card-actions> <v-card-actions>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-text-field outlined label="Passwort" v-model="acceptedPassword" type="password" ref="acceptedPassword" :rules="[empty_password]"></v-text-field> <v-text-field
outlined
label="Passwort"
v-model="acceptedPassword"
type="password"
ref="acceptedPassword"
:rules="[empty_password]"
></v-text-field>
<v-btn text color="primary" @click="save">Speicherns</v-btn> <v-btn text color="primary" @click="save">Speicherns</v-btn>
</v-card-actions> </v-card-actions>
<v-expand-transition> <v-expand-transition>
@ -268,7 +300,8 @@ import {
mdiCellphoneIphone, mdiCellphoneIphone,
mdiTrashCan, mdiTrashCan,
mdiAndroid, mdiAndroid,
mdiWindows mdiWindows,
mdiLinux
} from '@mdi/js' } from '@mdi/js'
import { mapGetters, mapActions } from 'vuex' import { mapGetters, mapActions } from 'vuex'
export default { export default {
@ -279,11 +312,12 @@ export default {
mac: mdiLaptopMac, mac: mdiLaptopMac,
iphone: mdiCellphoneIphone, iphone: mdiCellphoneIphone,
android: mdiAndroid, android: mdiAndroid,
mdiWindows: mdiWindows, windows: mdiWindows,
linux: mdiLinux,
chrome: mdiGoogleChrome, chrome: mdiGoogleChrome,
firefox: mdiFirefox, firefox: mdiFirefox,
opera: mdiOpera, opera: mdiOpera,
ie: mdiInternetExplorer, msie: mdiInternetExplorer,
safari: mdiAppleSafari, safari: mdiAppleSafari,
person: mdiAccount, person: mdiAccount,
bar: mdiGlassCocktail, bar: mdiGlassCocktail,
@ -309,9 +343,10 @@ export default {
return true return true
}, },
empty_password: () => { empty_password: () => {
return this.acceptedPassword !== null ? true : 'Password wurde nicht gesetzt' return this.acceptedPassword !== null
? true
: 'Password wurde nicht gesetzt'
} }
} }
}, },
mounted() { mounted() {
@ -342,9 +377,13 @@ export default {
if (this.password) user.password = this.password if (this.password) user.password = this.password
} }
if (this.$refs.acceptedPassword.validate()) { if (this.$refs.acceptedPassword.validate()) {
this.saveConfig({oldUsername: user.username, ...user, acceptedPassword: this.acceptedPassword}) this.saveConfig({
oldUsername: user.username,
...user,
acceptedPassword: this.acceptedPassword
})
} else { } else {
this.passError = "Du musst dein Password eingeben" this.passError = 'Du musst dein Password eingeben'
} }
this.password = null this.password = null
this.controlPassword = null this.controlPassword = null

View File

@ -25,7 +25,7 @@
</v-list-item> </v-list-item>
<v-list-item link :to="{name: 'jobkindManagement'}"> <v-list-item link :to="{name: 'jobkindManagement'}">
<v-list-item-icon> <v-list-item-icon>
<v-icon>???</v-icon> <v-icon>{{jobs}}</v-icon>
</v-list-item-icon> </v-list-item-icon>
<v-list-item-title> <v-list-item-title>
Dienstarten Dienstarten
@ -35,14 +35,15 @@
</template> </template>
<script> <script>
import { mdiBriefcase, mdiAccountMultiple, mdiAccountGroup } from '@mdi/js' import { mdiBriefcase, mdiAccountMultiple, mdiAccountGroup, mdiAccountNetwork } from '@mdi/js'
export default { export default {
name: 'ManagementNavigation', name: 'ManagementNavigation',
data() { data() {
return { return {
work: mdiBriefcase, work: mdiBriefcase,
list: mdiAccountMultiple, list: mdiAccountMultiple,
group: mdiAccountGroup group: mdiAccountGroup,
jobs: mdiAccountNetwork
} }
} }
} }

View File

@ -1,6 +1,6 @@
//const main = 'https://192.168.5.128:5000/' //const main = 'https://192.168.5.128:5000/'
const main = 'http://localhost:5000/' //const main = 'http://localhost:5000/'
//const main = 'http://192.168.5.118:5000/' const main = 'http://192.168.5.118:5000/'
//const main = 'https://groeger-clan.duckdns.org:5000/' //const main = 'https://groeger-clan.duckdns.org:5000/'
const url = { const url = {