Skip to content

Commit 4619393

Browse files
committed
feat: ✨ Add support for developer badges and user role displaying
1 parent a889f8d commit 4619393

File tree

8 files changed

+96
-12
lines changed

8 files changed

+96
-12
lines changed

components/avatars/Centered.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div v-bind="$props" class="bg-dark-700 overflow-hidden flex items-center justify-center">
3-
<Skeleton :enabled="!src" class="!h-full !w-full">
3+
<Skeleton :enabled="!src" class="!h-full !w-full !rounded-none">
44
<img class="cursor-pointer bg-dark-700 ring-1 w-full h-full object-cover" :src="src" :alt="alt" />
55
</Skeleton>
66
</div>

components/buttons/base.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<button v-bind="$props" type="button" :disabled="loading"
3-
:class="['rounded-md duration-200 relative hover:shadow disabled:opacity-70 content-none disabled:cursor-not-allowed px-3 py-2 text-sm font-semibold text-white shadow-sm', loading && '[&>*]:invisible']">
3+
:class="['relative isolate text-base/6 font-semibold px-[calc(theme(spacing[3.5])-1px)] py-[calc(theme(spacing[2.5])-1px)] sm:px-[calc(theme(spacing.3)-1px)] sm:py-[calc(theme(spacing[1.5])-1px)] sm:text-sm/6 focus:outline-none focus:outline focus:outline-2 focus:outline-offset-2 focus:outline-[--btn-bg] before:absolute before:inset-0 before:-z-10 before:rounded-[calc(theme(borderRadius.lg)-1px)] before:shadow before:hidden after:absolute after:-z-10 after:-inset-px after:rounded-md before:disabled:shadow-none after:disabled:shadow-none text-white cursor-default rounded-md duration-200 hover:shadow disabled:opacity-70 content-none disabled:cursor-not-allowed shadow-sm bg-[--btn-bg] before:bg-[--btn-bg] after:active:bg-[--btn-hover-overlay] after:hover:bg-[--btn-hover-overlay]', loading && '[&>*]:invisible']">
44
<div v-if="loading" class="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 !visible">
55
<iconify-icon icon="tabler:loader-2" height="1.25rem" width="1.25rem" class="animate-spin" />
66
</div>

components/buttons/primary.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<template>
2-
<ButtonsBase :loading="loading" class="bg-pink-600 hover:bg-pink-500">
2+
<ButtonsBase :loading="loading"
3+
class="[--btn-border:theme(colors.pink.950/90%)] [--btn-bg:theme(colors.pink.600)] [--btn-hover-overlay:theme(colors.white/5%)] [--btn-icon:theme(colors.pink.400)] active:[--btn-icon:theme(colors.pink.300)] hover:[--btn-icon:theme(colors.pink.300)] after:shadow-[shadow:inset_0_1px_theme(colors.white/15%)] border border-white/5"
4+
v-bind="$props">
35
<slot />
46
</ButtonsBase>
57
</template>

components/buttons/secondary.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<template>
2-
<ButtonsBase class="bg-white/10 hover:bg-white/20" :loading="loading">
2+
<ButtonsBase
3+
class="[--btn-border:theme(colors.zinc.950/90%)] [--btn-bg:theme(colors.zinc.800)] [--btn-hover-overlay:theme(colors.white/5%)] [--btn-icon:theme(colors.zinc.400)] active:[--btn-icon:theme(colors.zinc.300)] hover:[--btn-icon:theme(colors.zinc.300)] after:shadow-[shadow:inset_0_1px_theme(colors.white/15%)] border border-white/5"
4+
v-bind="$props" :loading="loading">
35
<slot />
46
</ButtonsBase>
57
</template>

components/social-elements/notes/note.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- Overlay that blocks clicks for disabled notes -->
55
<div v-if="disabled" class="absolute z-10 inset-0 hover:cursor-not-allowed">
66
</div>
7-
<div v-if="reblog" class="mb-4 flex flex-row gap-2 items-center text-pink-500">
7+
<div v-if="reblog" class="mb-4 flex flex-row gap-2 items-center text-pink-400">
88
<Skeleton :enabled="!loaded" shape="rect" class="!h-6" :min-width="40" :max-width="100" width-unit="%">
99
<iconify-icon width="1.5rem" height="1.5rem" icon="tabler:repeat" class="size-6" aria-hidden="true" />
1010
<AvatarsCentered v-if="reblog.avatar" :src="reblog.avatar" :alt="`${reblog.acct}'s avatar'`"
@@ -91,8 +91,8 @@
9191
</ButtonsDropdownElement>
9292
</Menu.Item>
9393
</Menu.ItemGroup>
94-
<hr class="border-white/10 rounded" />
95-
<Menu.ItemGroup>
94+
<hr class="border-white/10 rounded" v-if="identity" />
95+
<Menu.ItemGroup v-if="identity">
9696
<Menu.Item value="">
9797
<ButtonsDropdownElement @click="outputtedNote && useEvent('note:reply', outputtedNote)"
9898
icon="tabler:arrow-back-up" class="w-full">
@@ -125,8 +125,8 @@
125125
</ButtonsDropdownElement>
126126
</Menu.Item>
127127
</Menu.ItemGroup>
128-
<hr class="border-white/10 rounded" />
129-
<Menu.ItemGroup>
128+
<hr class="border-white/10 rounded" v-if="identity" />
129+
<Menu.ItemGroup v-if="identity">
130130
<Menu.Item value="">
131131
<ButtonsDropdownElement @click="outputtedNote && useEvent('note:report', outputtedNote)"
132132
icon="tabler:flag" class="w-full"

components/social-elements/users/Account.vue

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
22
<ClientOnly>
3-
<div class="w-full ring-1 ring-inset ring-white/5 pb-10">
3+
<div class="w-full ring-1 ring-inset ring-white/5 pb-10 bg-dark-800">
44
<AvatarsCentered :src="account?.header" :alt="`${account?.acct}'s header image'`"
5-
class="w-full aspect-[8/3] border-b border-white/10 bg-dark-700" />
5+
class="w-full aspect-[8/3] border-b border-white/10 bg-dark-700 !rounded-none" />
66

77
<div class="flex items-start justify-between px-4 py-3">
88
<AvatarsCentered :src="account?.avatar" :alt="`${account?.acct}'s avatar'`"
@@ -36,9 +36,15 @@
3636
title="This account manually approves its followers" />
3737
</Skeleton>
3838
</h2>
39-
<span class="text-gray-400 block mt-2">
39+
<span class="text-gray-300 block mt-2">
4040
<Skeleton :enabled="skeleton" :min-width="130" :max-width="250">@{{ account?.acct }}</Skeleton>
4141
</span>
42+
<div class="flex flex-row flex-wrap gap-4 mt-4" v-if="isDeveloper || visibleRoles.length > 0">
43+
<SocialElementsUsersBadge v-for="role of visibleRoles" :key="role.id" :name="role.name"
44+
:description="role.description" :img="role.icon" />
45+
<SocialElementsUsersBadge v-if="isDeveloper" name="Lysand Developer"
46+
description="This user is a Lysand developer." :verified="true" />
47+
</div>
4248
</div>
4349

4450
<div class="mt-4 px-4">
@@ -105,6 +111,7 @@ const props = defineProps<{
105111
const skeleton = computed(() => !props.account);
106112
const identity = useCurrentIdentity();
107113
const client = useClient();
114+
const config = useConfig();
108115
const accountId = computed(() => props.account?.id ?? null);
109116
const { relationship, isLoading } = useRelationship(client, accountId);
110117
@@ -138,6 +145,18 @@ const parsedFields: Ref<
138145
value: string;
139146
}[]
140147
> = ref([]);
148+
const handle = computed(() => {
149+
if (!props.account?.acct.includes("@")) {
150+
return `${props.account?.acct}@${new URL(useBaseUrl().value).host}`;
151+
}
152+
return props.account?.acct;
153+
});
154+
const isDeveloper = computed(() =>
155+
config.DEVELOPER_HANDLES.includes(handle.value),
156+
);
157+
const visibleRoles = computed(
158+
() => props.account?.roles.filter((r) => r.visible) ?? [],
159+
);
141160
142161
watch(
143162
skeleton,
+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<template>
2+
<Tooltip.Root @update:open="(o) => open = o" :open="open" :open-delay="0">
3+
<Tooltip.Trigger><span
4+
class="inline-flex items-center px-2 py-1 gap-x-2 rounded text-sm font-medium bg-dark-300 text-pink-200 ring-white/5 ring-1">
5+
<svg viewBox="0 0 22 22" v-if="verified" aria-label="Verified account" role="img"
6+
class="size-4 fill-pink-500">
7+
<g>
8+
<path
9+
d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z">
10+
</path>
11+
</g>
12+
</svg>
13+
<img v-else-if="img" :src="img" alt="" class="size-4 rounded-sm" />
14+
<iconify-icon v-else-if="icon" :icon="icon" width="none" class="text-pink-200 size-4"
15+
aria-hidden="true" />
16+
<span>{{ name }}</span>
17+
</span></Tooltip.Trigger>
18+
<Tooltip.Positioner>
19+
<transition enter-active-class="transition ease-in duration-100"
20+
enter-from-class="transform opacity-0 translate-y-full sm:translate-y-0 scale-95"
21+
enter-to-class="transform translate-y-0 opacity-100 scale-100"
22+
leave-active-class="transition ease-out duration-75" leave-from-class="transform opacity-100 scale-100"
23+
leave-to-class="transform opacity-0 scale-95">
24+
<Tooltip.Content v-if="open"
25+
class="rounded px-4 py-2 text-sm bg-dark-400 text-gray-200 ring-1 ring-white/10 shadow-xl">
26+
<svg viewBox="0 0 22 22" v-if="verified" aria-label="Verified account" role="img"
27+
class="size-4 fill-pink-500 inline mb-0.5">
28+
<g>
29+
<path
30+
d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z">
31+
</path>
32+
</g>
33+
</svg>
34+
{{ description }}
35+
</Tooltip.Content>
36+
</transition>
37+
</Tooltip.Positioner>
38+
</Tooltip.Root>
39+
40+
</template>
41+
42+
<script lang="ts" setup>
43+
import { Tooltip } from "@ark-ui/vue";
44+
45+
const props = defineProps<{
46+
name: string;
47+
description?: string | null;
48+
icon?: string | null;
49+
img?: string | null;
50+
verified?: boolean;
51+
}>();
52+
53+
const open = ref(false);
54+
</script>

composables/Config.ts

+7
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,12 @@ export const useConfig = () => {
2323
"I'm sorry, Dave. I'm afraid I can't do that.",
2424
"I am the Senate",
2525
],
26+
DEVELOPER_HANDLES: [
27+
28+
29+
30+
31+
32+
],
2633
};
2734
};

0 commit comments

Comments
 (0)