mirror of
https://github.com/elk-zone/elk.git
synced 2024-11-07 01:19:57 +00:00
feat: blocking feedback on follow button
This commit is contained in:
parent
79fb8c5d92
commit
e72d45a208
6 changed files with 34 additions and 2 deletions
|
@ -23,6 +23,18 @@ async function toggleFollow() {
|
|||
}
|
||||
}
|
||||
|
||||
async function unblock() {
|
||||
relationship!.blocking = false
|
||||
try {
|
||||
const newRel = await useMasto().accounts.unblock(account.id)
|
||||
Object.assign(relationship!, newRel)
|
||||
}
|
||||
catch {
|
||||
// TODO error handling
|
||||
relationship!.blocking = true
|
||||
}
|
||||
}
|
||||
|
||||
const { t } = useI18n()
|
||||
|
||||
useCommand({
|
||||
|
@ -39,6 +51,9 @@ const buttonStyle = $computed(() => {
|
|||
if (!relationship)
|
||||
return 'text-inverted'
|
||||
|
||||
if (relationship.blocking)
|
||||
return 'text-inverted bg-red border-red'
|
||||
|
||||
// If following, use a label style with a strong border for Mutuals
|
||||
if (relationship.following)
|
||||
return `text-base ${relationship.followedBy ? 'border-strong' : 'border-base'}`
|
||||
|
@ -54,9 +69,16 @@ const buttonStyle = $computed(() => {
|
|||
gap-1 items-center group
|
||||
:disabled="relationship?.requested"
|
||||
border-1
|
||||
rounded-full flex="~ gap2 center" font-500 w-30 h-fit py1 :class="buttonStyle" :hover="relationship?.following ? 'border-red text-red' : 'bg-base border-primary text-primary'" @click="toggleFollow"
|
||||
rounded-full flex="~ gap2 center" font-500 w-30 h-fit py1
|
||||
:class="buttonStyle"
|
||||
:hover="!relationship?.blocking && relationship?.following ? 'border-red text-red' : 'bg-base border-primary text-primary'"
|
||||
@click="relationship?.blocking ? unblock() : toggleFollow()"
|
||||
>
|
||||
<template v-if="relationship?.following">
|
||||
<template v-if="relationship?.blocking">
|
||||
<span group-hover="hidden">{{ $t('account.blocking') }}</span>
|
||||
<span hidden group-hover="inline">{{ $t('account.unblock') }}</span>
|
||||
</template>
|
||||
<template v-else-if="relationship?.following">
|
||||
<span group-hover="hidden">{{ relationship?.followedBy ? $t('account.mutuals') : $t('account.following') }}</span>
|
||||
<span hidden group-hover="inline">{{ $t('account.unfollow') }}</span>
|
||||
</template>
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
"blocked_by": "You're blocked by this user.",
|
||||
"blocked_domains": "Blocked domains",
|
||||
"blocked_users": "Blocked users",
|
||||
"blocking": "Blocked",
|
||||
"bot": "BOT",
|
||||
"favourites": "Favourites",
|
||||
"follow": "Follow",
|
||||
|
@ -24,6 +25,7 @@
|
|||
"posts_count": "{0} posts|{0} post|{0} posts",
|
||||
"profile_description": "{0}'s profile header",
|
||||
"profile_unavailable": "Profile unavailable",
|
||||
"unblock": "Unblock",
|
||||
"unfollow": "Unfollow"
|
||||
},
|
||||
"action": {
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
"blocked_by": "Fuiste bloqueado por este usuario.",
|
||||
"blocked_domains": "Dominios bloqueados",
|
||||
"blocked_users": "Usuarios bloqueados",
|
||||
"blocking": "Blocked",
|
||||
"favourites": "Favoritos",
|
||||
"follow": "Seguir",
|
||||
"follow_back": "Seguir de vuelta",
|
||||
|
@ -23,6 +24,7 @@
|
|||
"posts_count": "{0} publicaciones|{0} publicación|{0} publicaciones",
|
||||
"profile_description": "Encabezado del perfil de {0}",
|
||||
"profile_unavailable": "Perfil no disponible",
|
||||
"unblock": "Unblock",
|
||||
"unfollow": "Dejar de seguir"
|
||||
},
|
||||
"action": {
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
"blocked_by": "Vous êtes bloqué·e par cet·te utilisateur.",
|
||||
"blocked_domains": "Domaines bloqués",
|
||||
"blocked_users": "Utilisateurs bloqués",
|
||||
"blocking": "Blocked",
|
||||
"bot": "Automatisé",
|
||||
"favourites": "Favoris",
|
||||
"follow": "Suivre",
|
||||
|
@ -24,6 +25,7 @@
|
|||
"posts_count": "{0} messages",
|
||||
"profile_description": "En-tête du profil de {0}",
|
||||
"profile_unavailable": "Profil non accessible",
|
||||
"unblock": "Unblock",
|
||||
"unfollow": "Ne plus suivre"
|
||||
},
|
||||
"action": {
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
"account": {
|
||||
"blocked_domains": "ブロックしたドメイン",
|
||||
"blocked_users": "ブロックしたユーザー",
|
||||
"blocking": "Blocked",
|
||||
"favourites": "お気に入り",
|
||||
"follow": "フォローする",
|
||||
"follow_back": "フォローバックする",
|
||||
|
@ -12,6 +13,7 @@
|
|||
"muted_users": "ミュート済み",
|
||||
"pinned": "固定された投稿",
|
||||
"posts_count": "{0} 投稿",
|
||||
"unblock": "Unblock",
|
||||
"unfollow": "フォロー解除"
|
||||
},
|
||||
"action": {
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
"blocked_by": "您已被此用户拉黑",
|
||||
"blocked_domains": "已拉黑的域名",
|
||||
"blocked_users": "已拉黑的用户",
|
||||
"blocking": "Blocked",
|
||||
"bot": "机器人",
|
||||
"favourites": "喜欢的帖文",
|
||||
"follow": "关注",
|
||||
|
@ -24,6 +25,7 @@
|
|||
"posts_count": "{0} 条帖文",
|
||||
"profile_description": "{0}的个人资料头图",
|
||||
"profile_unavailable": "个人资料不可见",
|
||||
"unblock": "Unblock",
|
||||
"unfollow": "取消关注"
|
||||
},
|
||||
"action": {
|
||||
|
|
Loading…
Reference in a new issue