diff --git a/package.json b/package.json index 3a807a6c67..5718d24ddb 100644 --- a/package.json +++ b/package.json @@ -24,13 +24,13 @@ "phoenix": "^1.3.0", "sanitize-html": "^1.13.0", "sass-loader": "^4.0.2", - "vue": "^2.3.4", + "vue": "^2.5.13", "vue-chat-scroll": "^1.2.1", "vue-i18n": "^7.3.2", - "vue-router": "^2.5.3", + "vue-router": "^3.0.1", "vue-template-compiler": "^2.3.4", "vue-timeago": "^3.1.2", - "vuex": "^2.3.1", + "vuex": "^3.0.1", "whatwg-fetch": "^2.0.3" }, "devDependencies": { diff --git a/src/App.js b/src/App.js index 1c6f4fcc96..4eabba8b67 100644 --- a/src/App.js +++ b/src/App.js @@ -26,7 +26,7 @@ export default { logoStyle () { return { 'background-image': `url(${this.$store.state.config.logo})` } }, style () { return { 'background-image': `url(${this.background})` } }, sitename () { return this.$store.state.config.name }, - chat () { return this.$store.state.chat.channel }, + chat () { return this.$store.state.chat.channel.state === 'joined' }, showInstanceSpecificPanel () { return this.$store.state.config.showInstanceSpecificPanel} }, methods: { diff --git a/src/components/favorite_button/favorite_button.js b/src/components/favorite_button/favorite_button.js index 466e9b848d..1266be901a 100644 --- a/src/components/favorite_button/favorite_button.js +++ b/src/components/favorite_button/favorite_button.js @@ -1,5 +1,5 @@ const FavoriteButton = { - props: ['status'], + props: ['status', 'loggedIn'], data () { return { animated: false diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue index dcf28e35c1..65d368c74b 100644 --- a/src/components/favorite_button/favorite_button.vue +++ b/src/components/favorite_button/favorite_button.vue @@ -1,6 +1,10 @@ @@ -8,7 +12,7 @@