diff options
Diffstat (limited to 'src/components/follow_card')
| -rw-r--r-- | src/components/follow_card/follow_card.js | 2 | ||||
| -rw-r--r-- | src/components/follow_card/follow_card.vue | 19 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js index 7a16f455..ac4e265a 100644 --- a/src/components/follow_card/follow_card.js +++ b/src/components/follow_card/follow_card.js @@ -22,7 +22,7 @@ const FollowCard = { isMe () { return this.$store.state.users.currentUser.id === this.user.id }, following () { return this.updated ? this.updated.following : this.user.following }, showFollow () { - return !this.following || (this.updated && !this.updated.following) + return !this.following || this.updated && !this.updated.following }, loggedIn () { return this.$store.state.users.currentUser diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue index a808d7ed..9f314fd3 100644 --- a/src/components/follow_card/follow_card.vue +++ b/src/components/follow_card/follow_card.vue @@ -1,24 +1,18 @@ <template> <basic-user-card :user="user"> <div class="follow-card-content-container"> - <span - v-if="!noFollowsYou && user.follows_you" - class="faint" - > + <span class="faint" v-if="!noFollowsYou && user.follows_you"> {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }} </span> - <div - v-if="showFollow && !loggedIn" - class="follow-card-follow-button" - > + <div class="follow-card-follow-button" v-if="showFollow && !loggedIn"> <RemoteFollow :user="user" /> </div> <button v-if="showFollow && loggedIn" class="btn btn-default follow-card-follow-button" + @click="followUser" :disabled="inProgress" :title="requestSent ? $t('user_card.follow_again') : ''" - @click="followUser" > <template v-if="inProgress"> {{ $t('user_card.follow_progress') }} @@ -30,12 +24,7 @@ {{ $t('user_card.follow') }} </template> </button> - <button - v-if="following" - class="btn btn-default follow-card-follow-button pressed" - :disabled="inProgress" - @click="unfollowUser" - > + <button v-if="following" class="btn btn-default follow-card-follow-button pressed" @click="unfollowUser" :disabled="inProgress"> <template v-if="inProgress"> {{ $t('user_card.follow_progress') }} </template> |
