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
This commit is contained in:
commit
935c0e09c6
|
@ -7,18 +7,18 @@
|
||||||
<div class='user-name'>{{user.name}}</div>
|
<div class='user-name'>{{user.name}}</div>
|
||||||
<div class='user-screen-name'>@{{user.screen_name}}</div>
|
<div class='user-screen-name'>@{{user.screen_name}}</div>
|
||||||
<div v-if="isOtherUser" class="user-interactions">
|
<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!
|
Follows you!
|
||||||
</div>
|
</div>
|
||||||
<div class="follow">
|
<div class="follow" v-if="loggedIn">
|
||||||
<span v-if="user.following">
|
<span v-if="user.following">
|
||||||
<!--Following them!-->
|
<!--Following them!-->
|
||||||
<button @click="unfollowUser" class="base06 base01-background base06-border">
|
<button @click="unfollowUser" class="base06 base01-background">
|
||||||
Unfollow
|
Unfollow
|
||||||
</button>
|
</button>
|
||||||
</span>
|
</span>
|
||||||
<span v-if="!user.following">
|
<span v-if="!user.following">
|
||||||
<button @click="followUser" class="base01 base04-background base01-border">
|
<button @click="followUser" class="base01 base04-background">
|
||||||
Follow
|
Follow
|
||||||
</button>
|
</button>
|
||||||
</span>
|
</span>
|
||||||
|
@ -66,6 +66,9 @@
|
||||||
},
|
},
|
||||||
isOtherUser () {
|
isOtherUser () {
|
||||||
return this.user !== this.$store.state.users.currentUser
|
return this.user !== this.$store.state.users.currentUser
|
||||||
|
},
|
||||||
|
loggedIn () {
|
||||||
|
return this.$store.state.users.currentUser
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
Loading…
Reference in New Issue