diff options
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/login_form/login_form.js | 2 | ||||
| -rw-r--r-- | src/components/registration/registration.js | 4 | ||||
| -rw-r--r-- | src/components/settings/settings.js | 3 | ||||
| -rw-r--r-- | src/components/settings/settings.vue | 16 |
4 files changed, 13 insertions, 12 deletions
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js index a117b76f..12144324 100644 --- a/src/components/login_form/login_form.js +++ b/src/components/login_form/login_form.js @@ -5,7 +5,7 @@ const LoginForm = { }), computed: { loggingIn () { return this.$store.state.users.loggingIn }, - registrationOpen () { return this.$store.state.config.registrationOpen } + registrationOpen () { return this.$store.state.interface.registrationOpen } }, methods: { submit () { diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js index 73840608..e53fa4e5 100644 --- a/src/components/registration/registration.js +++ b/src/components/registration/registration.js @@ -5,11 +5,11 @@ const registration = { registering: false }), created () { - if ((!this.$store.state.config.registrationOpen && !this.token) || !!this.$store.state.users.currentUser) { + if ((!this.$store.state.interface.registrationOpen && !this.token) || !!this.$store.state.users.currentUser) { this.$router.push('/main/all') } // Seems like this doesn't work at first page open for some reason - if (this.$store.state.config.registrationOpen && this.token) { + if (this.$store.state.interface.registrationOpen && this.token) { this.$router.push('/registration') } }, diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index 5e28c1af..6d481820 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -44,8 +44,7 @@ const settings = { return this.$store.state.users.currentUser }, currentSaveStateNotice () { - console.log(this.$store.state.config._internal.currentSaveStateNotice && this.$store.state.config._internal.currentSaveStateNotice.error) - return this.$store.state.config._internal.currentSaveStateNotice + return this.$store.state.interface.settings.currentSaveStateNotice } }, watch: { diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index be7c64a7..481cdf09 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -5,15 +5,17 @@ {{$t('settings.settings')}} </div> - <template v-if="currentSaveStateNotice"> - <div @click.prevent class="alert error" v-if="currentSaveStateNotice.error"> - Errr - </div> + <transition name="fade"> + <template v-if="currentSaveStateNotice"> + <div @click.prevent class="alert error" v-if="!currentSaveStateNotice.error"> + Errr + </div> - <div @click.prevent class="alert success" v-if="!currentSaveStateNotice.error"> - Succ - </div> + <div @click.prevent class="alert success" v-if="!currentSaveStateNotice.error"> + Succ + </div> </template> + </transition> </div> <div class="panel-body"> <tab-switcher> |
