aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Braun <rbraun@Bobble.local>2017-12-05 14:20:34 +0100
committerRoger Braun <rbraun@Bobble.local>2017-12-05 14:20:34 +0100
commit6c4e3a509a23a4f683aee02fcd0b186813ae3de0 (patch)
treee307d15bd4093b274444e684d7b7487c92257942 /src
parenta03b92e252406a8469a9ffe871a6882b3aedb366 (diff)
Don't display if we don't have a chat.
Diffstat (limited to 'src')
-rw-r--r--src/components/chat/chat.vue2
-rw-r--r--src/components/nav_panel/nav_panel.js3
-rw-r--r--src/components/nav_panel/nav_panel.vue2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index 0c397472..488faf9a 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -7,7 +7,7 @@
</div>
<div class="panel-body base01-background">
<div class="chat-window">
- <div class="chat-message" v-for="message in messages">
+ <div class="chat-message" v-for="message in messages" :key="message.id">
<span class="chat-avatar">
<img :src="message.author.avatar" />
{{message.author.username}}:
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index baeaaede..ea5d7ea4 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -2,6 +2,9 @@ const NavPanel = {
computed: {
currentUser () {
return this.$store.state.users.currentUser
+ },
+ chat () {
+ return this.$store.state.chat.channel
}
}
}
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index fa4000b0..ccc772a8 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -7,7 +7,7 @@
{{ $t("nav.timeline") }}
</router-link>
</li>
- <li v-if='currentUser'>
+ <li v-if='chat && currentUser'>
<router-link class="base00-background" to='/chat'>
{{ $t("nav.chat") }}
</router-link>