Change "Remove this follower" to "Remove Follower" and add a button to remove a follower in the followers tab for the logged in user
This commit is contained in:
parent
2453a338be
commit
80f58baa86
6 changed files with 54 additions and 3 deletions
|
@ -33,7 +33,7 @@
|
||||||
class="btn button-default btn-block dropdown-item"
|
class="btn button-default btn-block dropdown-item"
|
||||||
@click="removeUserFromFollowers"
|
@click="removeUserFromFollowers"
|
||||||
>
|
>
|
||||||
{{ $t('user_card.remove_this_follower') }}
|
{{ $t('user_card.remove_follower') }}
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
v-if="relationship.blocking"
|
v-if="relationship.blocking"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import BasicUserCard from '../basic_user_card/basic_user_card.vue'
|
import BasicUserCard from '../basic_user_card/basic_user_card.vue'
|
||||||
import RemoteFollow from '../remote_follow/remote_follow.vue'
|
import RemoteFollow from '../remote_follow/remote_follow.vue'
|
||||||
import FollowButton from '../follow_button/follow_button.vue'
|
import FollowButton from '../follow_button/follow_button.vue'
|
||||||
|
import RemoveFollowerButton from '../remove_follower_button/remove_follower_button.vue'
|
||||||
|
|
||||||
const FollowCard = {
|
const FollowCard = {
|
||||||
props: [
|
props: [
|
||||||
|
@ -10,7 +11,8 @@ const FollowCard = {
|
||||||
components: {
|
components: {
|
||||||
BasicUserCard,
|
BasicUserCard,
|
||||||
RemoteFollow,
|
RemoteFollow,
|
||||||
FollowButton
|
FollowButton,
|
||||||
|
RemoveFollowerButton
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
isMe () {
|
isMe () {
|
||||||
|
|
|
@ -22,6 +22,11 @@
|
||||||
class="follow-card-follow-button"
|
class="follow-card-follow-button"
|
||||||
:user="user"
|
:user="user"
|
||||||
/>
|
/>
|
||||||
|
<RemoveFollowerButton
|
||||||
|
v-if="noFollowsYou && relationship.followed_by"
|
||||||
|
:relationship="relationship"
|
||||||
|
class="follow-card-button"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</basic-user-card>
|
</basic-user-card>
|
||||||
|
@ -40,6 +45,12 @@
|
||||||
line-height: 1.5em;
|
line-height: 1.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&-button {
|
||||||
|
margin-top: 0.5em;
|
||||||
|
padding: 0 1.5em;
|
||||||
|
margin-left: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
&-follow-button {
|
&-follow-button {
|
||||||
margin-top: 0.5em;
|
margin-top: 0.5em;
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
export default {
|
||||||
|
props: ['relationship'],
|
||||||
|
data () {
|
||||||
|
return {
|
||||||
|
inProgress: false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
label () {
|
||||||
|
if (this.inProgress) {
|
||||||
|
return this.$t('user_card.follow_progress')
|
||||||
|
} else {
|
||||||
|
return this.$t('user_card.remove_follower')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
onClick () {
|
||||||
|
this.inProgress = true
|
||||||
|
this.$store.dispatch('removeUserFromFollowers', this.relationship.id).then(() => {
|
||||||
|
this.inProgress = false
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
<template>
|
||||||
|
<button
|
||||||
|
class="btn button-default follow-button"
|
||||||
|
:class="{ toggled: inProgress }"
|
||||||
|
:disabled="inProgress"
|
||||||
|
:title="$t('user_card.remove_follower')"
|
||||||
|
@click="onClick"
|
||||||
|
>
|
||||||
|
{{ label }}
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script src="./remove_follower_button.js"></script>
|
|
@ -1124,7 +1124,7 @@
|
||||||
"note": "Private note",
|
"note": "Private note",
|
||||||
"per_day": "per day",
|
"per_day": "per day",
|
||||||
"remote_follow": "Remote follow",
|
"remote_follow": "Remote follow",
|
||||||
"remove_this_follower": "Remove this follower",
|
"remove_follower": "Remove follower",
|
||||||
"replies": "With Replies",
|
"replies": "With Replies",
|
||||||
"report": "Report",
|
"report": "Report",
|
||||||
"show_repeats": "Show repeats",
|
"show_repeats": "Show repeats",
|
||||||
|
|
Loading…
Reference in a new issue