From e801d78e9d923df1263eb9dc78db8fdfa8637734 Mon Sep 17 00:00:00 2001 From: shpuld Date: Sun, 17 Feb 2019 18:54:22 +0200 Subject: [PATCH] Take over branch and fix some issues --- src/components/follow_list/follow_list.js | 4 +- src/components/follow_list/follow_list.vue | 3 +- src/components/user_card/user_card.js | 7 +- src/components/user_card/user_card.vue | 129 ++++++++++++--------- src/i18n/en.json | 2 +- 5 files changed, 81 insertions(+), 64 deletions(-) diff --git a/src/components/follow_list/follow_list.js b/src/components/follow_list/follow_list.js index acdb216d..51327e2f 100644 --- a/src/components/follow_list/follow_list.js +++ b/src/components/follow_list/follow_list.js @@ -26,7 +26,9 @@ const FollowList = { entries () { return this.showFollowers ? this.user.followers : this.user.friends }, - showActions () { return this.$store.state.users.currentUser.id === this.userId } + showFollowsYou () { + return !this.showFollowers || (this.showFollowers && this.userId !== this.$store.state.users.currentUser.id) + } }, methods: { fetchEntries () { diff --git a/src/components/follow_list/follow_list.vue b/src/components/follow_list/follow_list.vue index 7be2e7b7..27102edf 100644 --- a/src/components/follow_list/follow_list.vue +++ b/src/components/follow_list/follow_list.vue @@ -3,8 +3,7 @@