commit: 935c0e09c650bca5f92d05335d158ef3c148901b
parent: 8d4d8b6b6c66ff7d3269917ca88c9698326a73f4
Author: lambadalambda <gitgud@rogerbraun.net>
Date: Wed, 22 Feb 2017 05:11:18 -0500
Merge branch 'fix/dont_display_following_when_logged_out' into 'develop'
Hide Follow-button and 'Follows you' text when not logged in
Closes #14
See merge request !27
Diffstat:
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
@@ -7,18 +7,18 @@
<div class='user-name'>{{user.name}}</div>
<div class='user-screen-name'>@{{user.screen_name}}</div>
<div v-if="isOtherUser" class="user-interactions">
- <div v-if="user.follows_you" class="following base06">
+ <div v-if="user.follows_you && loggedIn" class="following base06">
Follows you!
</div>
- <div class="follow">
+ <div class="follow" v-if="loggedIn">
<span v-if="user.following">
<!--Following them!-->
- <button @click="unfollowUser" class="base06 base01-background base06-border">
+ <button @click="unfollowUser" class="base06 base01-background">
Unfollow
</button>
</span>
<span v-if="!user.following">
- <button @click="followUser" class="base01 base04-background base01-border">
+ <button @click="followUser" class="base01 base04-background">
Follow
</button>
</span>
@@ -66,6 +66,9 @@
},
isOtherUser () {
return this.user !== this.$store.state.users.currentUser
+ },
+ loggedIn () {
+ return this.$store.state.users.currentUser
}
},
methods: {