Flaschengeist/flaschengeist-frontend
Flaschengeist
/
flaschengeist-frontend
7
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
src/components/user/Config.vue
View File

@ -173,66 +173,91 @@
<v-card v-for="token in tokens" :key="token.id" outlined>
<v-card-text>
<v-row>
<v-col
>OS:
<v-icon>
{{
token.platform === 'macos' || token.platform === 'iphone'
? apple
: token.platform === 'windows'
? windows
: token.platfrom === 'android'
? android
: token.platform
<v-col>
<v-col>
Betriebssystem
</v-col>
<v-col>
<v-icon>
{{
token.platform === 'macos' || token.platform === 'iphone'
? apple
: token.platform === 'windows'
? 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>
<v-icon
v-if="
token.platform === 'macos' || token.platform === 'iphone'
"
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
>
{{ token.platform === 'macos' ? mac : iphone }}
</v-icon>
</v-col>
<v-col>
Browser:
<v-icon>
{{
token.browser === 'chrome'
? chrome
: token.browser === 'firefox'
? firefox
: token.browser === 'opera'
? opera
: token.browser === 'safari'
? safari
: token.browser
}}
</v-icon>
<v-col>
Lebenszeit
</v-col>
<v-col>
{{ calcLifefime(token.lifetime) }}
</v-col>
</v-col>
<v-col>
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-col class="text-right">
<v-btn icon @click="deleteToken(token)">
<v-icon>
{{trashCan}}
{{ trashCan }}
</v-icon>
</v-btn>
</v-col>
@ -242,7 +267,14 @@
</v-card-text>
<v-card-actions>
<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-card-actions>
<v-expand-transition>
@ -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

7
src/components/vorstand/ManagementNavigation.vue
View File

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

4
src/plugins/routes.js
View File

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