summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webapp/src/components/DashboardPage.vue25
-rw-r--r--webapp/src/components/LoginPage.vue3
-rw-r--r--webapp/src/components/SettingsModule.vue2
-rw-r--r--webapp/src/main.js4
-rw-r--r--webapp/src/store/global.js14
5 files changed, 24 insertions, 24 deletions
diff --git a/webapp/src/components/DashboardPage.vue b/webapp/src/components/DashboardPage.vue
index ffa57d0..37d4c80 100644
--- a/webapp/src/components/DashboardPage.vue
+++ b/webapp/src/components/DashboardPage.vue
@@ -22,7 +22,7 @@
</i18n>
<template>
- <v-app :dark="dark" class="non-selectable">
+ <v-app :dark="settings.dark" class="non-selectable">
<v-touch
@panstart="drawerDragStart"
@panmove="drawerDragMove"
@@ -36,7 +36,7 @@
:style="drawerDraggingStyle"
persistent
:mini-variant="desktop && drawerMini"
- :clipped="clipped && desktop"
+ :clipped="settings.clipped && desktop"
v-model="drawerOpen"
fixed
width="250"
@@ -65,12 +65,12 @@
</v-touch>
</v-navigation-drawer>
- <v-toolbar dark class="topbar" app :clipped-left="clipped">
+ <v-toolbar dark class="topbar" app :clipped-left="settings.clipped">
<v-toolbar-side-icon class="drawer-icon" @click.stop="toggleDrawer"></v-toolbar-side-icon>
<img class="logo non-draggable hidden-md-and-down" src="@/assets/logo.svg" />
<v-spacer></v-spacer>
- <v-btn v-if="devMode" icon @click="$store.commit('saveSetting', { name: 'locale', value: $i18n.locale === 'en' ? 'de' : 'en' })"><v-icon>language</v-icon></v-btn>
- <v-btn v-if="devMode" icon @click="$store.commit('saveSetting', { name: 'dark', value: !dark })"><v-icon>invert_colors</v-icon></v-btn>
+ <v-btn v-if="devMode" icon @click="$store.commit('saveSetting', { name: 'locale', value: settings.locale === 'en' ? 'de' : 'en' })"><v-icon>language</v-icon></v-btn>
+ <v-btn v-if="devMode" icon @click="$store.commit('saveSetting', { name: 'dark', value: !settings.dark })"><v-icon>invert_colors</v-icon></v-btn>
<v-toolbar-items>
<v-menu offset-y>
<v-btn class="user-button" flat slot="activator">
@@ -150,14 +150,15 @@ export default {
}
},
computed: {
- ...mapState(['dark', 'clipped', 'mini', 'snackbars']),
+ ...mapState(['settings', 'snackbars']),
+ mini () { return this.settings.mini },
...mapGetters(['nextSnackbar']),
desktop () { return this.$vuetify.breakpoint.lgAndUp },
drawerDraggingStyle () {
var style = {}
if (this.dragging) {
style.transition = 'none'
- if (this.mini && this.desktop) style.width = this.drawerWidth + 'px'
+ if (this.settings.mini && this.desktop) style.width = this.drawerWidth + 'px'
else style.transform = 'translateX(' + this.drawerTranslateX + 'px)'
}
return style
@@ -202,16 +203,16 @@ export default {
methods: {
...mapMutations(['shiftSnackbars']),
toggleDrawer () {
- if (this.mini && this.desktop) this.drawerMini = !this.drawerMini
+ if (this.settings.mini && this.desktop) this.drawerMini = !this.drawerMini
else this.drawerOpen = !this.drawerOpen
},
drawerDragStart (event) {
- if (this.mini && this.desktop) this.drawerWidth = this.drawerStartWidth = this.drawerMini ? 80 : 250
+ if (this.settings.mini && this.desktop) this.drawerWidth = this.drawerStartWidth = this.drawerMini ? 80 : 250
else this.drawerTranslateStartX = this.drawerTranslateX = this.drawerOpen ? 0 : -250
this.dragging = true
},
drawerDragMove (event) {
- if (this.mini && this.desktop) {
+ if (this.settings.mini && this.desktop) {
let newX = this.drawerStartWidth + event.deltaX
if (newX >= 80 && newX <= 250) this.drawerWidth = newX
} else {
@@ -221,7 +222,7 @@ export default {
},
drawerDragEnd (event) {
this.dragging = false
- if (this.mini && this.desktop) {
+ if (this.settings.mini && this.desktop) {
if ((this.drawerWidth < 100 && event.velocityX <= 0) || event.velocityX < -0.4) this.drawerMini = true
else this.drawerMini = false
} else {
@@ -236,7 +237,7 @@ export default {
}
},
created () {
- if (this.mini && this.desktop) this.drawerOpen = true
+ if (this.settings.mini && this.desktop) this.drawerOpen = true
this.$http('/api/user/info').then(response => {
this.userFullName = response.data.name
})
diff --git a/webapp/src/components/LoginPage.vue b/webapp/src/components/LoginPage.vue
index 36a7de5..dc77f68 100644
--- a/webapp/src/components/LoginPage.vue
+++ b/webapp/src/components/LoginPage.vue
@@ -48,8 +48,6 @@
</template>
<script>
-import { mapState } from 'vuex'
-
export default {
name: 'LoginPage',
data () {
@@ -69,7 +67,6 @@ export default {
]
}
},
- computed: mapState(['dark']),
methods: {
clearErrors () {
if (this.usernameError) this.usernameError = false
diff --git a/webapp/src/components/SettingsModule.vue b/webapp/src/components/SettingsModule.vue
index 960b9b5..2d3b781 100644
--- a/webapp/src/components/SettingsModule.vue
+++ b/webapp/src/components/SettingsModule.vue
@@ -38,7 +38,7 @@ export default {
}
},
computed: {
- store () { return this.$store.state }
+ store () { return this.$store.state.settings }
},
methods: {
save (name, value) { this.$store.commit('saveSetting', { name: name, value: value }) }
diff --git a/webapp/src/main.js b/webapp/src/main.js
index 5d4f494..3c4ce47 100644
--- a/webapp/src/main.js
+++ b/webapp/src/main.js
@@ -21,7 +21,7 @@ Vue.use(VueTouch)
Vue.use(VueI18n)
const i18n = new VueI18n({
- locale: store.state.locale,
+ locale: store.state.settings.locale,
silentTranslationWarn: true,
messages: {
'en': {
@@ -49,7 +49,7 @@ new Vue({
store,
router,
i18n,
- computed: { locale: () => store.state.locale },
+ computed: { locale: () => store.state.settings.locale },
watch: { locale: v => { i18n.locale = v } },
template: '<router-view/>'
}).$mount('#app')
diff --git a/webapp/src/store/global.js b/webapp/src/store/global.js
index 3672c5f..f467e1a 100644
--- a/webapp/src/store/global.js
+++ b/webapp/src/store/global.js
@@ -1,10 +1,12 @@
export default {
state: {
- locale: localStorage.getItem('locale') || 'en',
- dark: localStorage.getItem('dark') !== 'false',
- coloredTabs: localStorage.getItem('coloredTabs') === 'true',
- clipped: localStorage.getItem('clipped') !== 'false',
- mini: localStorage.getItem('mini') !== 'false',
+ settings: {
+ locale: localStorage.getItem('locale') || 'en',
+ dark: localStorage.getItem('dark') !== 'false',
+ coloredTabs: localStorage.getItem('coloredTabs') === 'true',
+ clipped: localStorage.getItem('clipped') !== 'false',
+ mini: localStorage.getItem('mini') !== 'false',
+ },
snackbars: []
},
getters: {
@@ -17,7 +19,7 @@ export default {
}
},
mutations: {
- saveSetting (state, { name, value }) { if (name in state) state[name] = value; localStorage.setItem(name, value) },
+ saveSetting (state, { name, value }) { if (name in state.settings) state.settings[name] = value; localStorage.setItem(name, value) },
shiftSnackbars (state) {
state.snackbars.shift()
},