Merge branch 'dev' of github.com:ffplayout/ffplayout-gui into dev

This commit is contained in:
jb-alvarado 2021-03-23 09:22:17 +01:00
commit 3420ec06b3
2 changed files with 6 additions and 6 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "ffplayout",
"version": "2.0.0",
"version": "3.0.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "ffplayout",
"version": "2.0.0",
"version": "3.0.0",
"dependencies": {
"@nuxtjs/axios": "^5.13.1",
"@nuxtjs/dayjs": "^1.3.0",

View File

@ -201,19 +201,19 @@ export default {
}
this.checkLogin()
this.$store.dispatch('config/getGuiConfig')
await this.$store.dispatch('config/getGuiConfig')
this.$store.dispatch('config/getPlayoutConfig')
this.$store.dispatch('config/getUserConfig')
} catch (e) {
this.formError = e.message
}
},
async logout () {
logout () {
clearInterval(this.interval)
try {
await this.$store.commit('auth/REMOVE_TOKEN')
await this.$store.commit('auth/UPDATE_IS_LOGIN', false)
this.$store.commit('auth/REMOVE_TOKEN')
this.$store.commit('auth/UPDATE_IS_LOGIN', false)
} catch (e) {
this.formError = e.message
}