diff --git a/components/notes/copyable-text.vue b/components/notes/copyable-text.vue deleted file mode 100644 index ecd1640..0000000 --- a/components/notes/copyable-text.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - {{ m.clean_yummy_owl_reside() }} - - - - - - \ No newline at end of file diff --git a/components/notes/header.vue b/components/notes/header.vue index 6552ab4..b4e691b 100644 --- a/components/notes/header.vue +++ b/components/notes/header.vue @@ -1,5 +1,5 @@ - + { if (!preferences.popup_avatar_hover) { popupOpen = false; @@ -16,24 +16,18 @@ - - {{ + + {{ author.display_name - }} - - - - @{{ username }} - - {{ instance && "@" }}{{ instance }} - + }} + + · - {{ timeAgo }} - - - + {{ timeAgo }} + + + @@ -52,8 +46,12 @@ import { AtSign, Globe, Lock, LockOpen } from "lucide-vue-next"; import type { z } from "zod"; import { cn } from "@/lib/utils"; import { getLocale } from "~/paraglide/runtime"; +import Address from "../profiles/address.vue"; import Avatar from "../profiles/avatar.vue"; import SmallCard from "../profiles/small-card.vue"; +import Col from "../typography/layout/col.vue"; +import Row from "../typography/layout/row.vue"; +import Text from "../typography/text.vue"; import { HoverCard, HoverCardContent, diff --git a/components/notifications/follow-request.vue b/components/notifications/follow-request.vue index b9ccc95..d5f070d 100644 --- a/components/notifications/follow-request.vue +++ b/components/notifications/follow-request.vue @@ -8,13 +8,7 @@ follower.display_name }} - - - @{{ username }} - - {{ instance && "@" }}{{ instance }} - + @@ -39,9 +33,9 @@ import type { Account } from "@versia/client/schemas"; import { Check, Loader, X } from "lucide-vue-next"; import { toast } from "vue-sonner"; import type { z } from "zod"; -import CopyableText from "~/components/notes/copyable-text.vue"; import { Button } from "~/components/ui/button"; import * as m from "~/paraglide/messages.js"; +import Address from "../profiles/address.vue"; import Avatar from "../profiles/avatar.vue"; const { follower } = defineProps<{ @@ -50,7 +44,7 @@ const { follower } = defineProps<{ const loading = ref(true); const followerUrl = `/@${follower.acct}`; -const [username, instance] = follower.acct.split("@"); +const [username, domain] = follower.acct.split("@"); const { relationship } = useRelationship(client, follower.id); // TODO: Add "followed" notification diff --git a/components/profiles/address.vue b/components/profiles/address.vue new file mode 100644 index 0000000..c50957a --- /dev/null +++ b/components/profiles/address.vue @@ -0,0 +1,15 @@ + + + @{{ username }} + @{{ domain }} + + + + diff --git a/components/profiles/profile-badge.vue b/components/profiles/profile-badge.vue index a9aa24d..9100f00 100644 --- a/components/profiles/profile-badge.vue +++ b/components/profiles/profile-badge.vue @@ -1,31 +1,27 @@ - - - - - - - + + {{ name }} - {{ description }} + {{ description }} - - diff --git a/components/profiles/profile-fields.vue b/components/profiles/profile-fields.vue index a0d68e0..e9fdbaf 100644 --- a/components/profiles/profile-fields.vue +++ b/components/profiles/profile-fields.vue @@ -1,15 +1,18 @@ - - - {{ field.name }} - - - + + + {{ field.name }} + + + diff --git a/components/profiles/profile-stats.vue b/components/profiles/profile-stats.vue index e7ff2a8..bafc574 100644 --- a/components/profiles/profile-stats.vue +++ b/components/profiles/profile-stats.vue @@ -1,41 +1,30 @@ - - - - - {{ m.gross_fancy_platypus_seek() }} {{ formattedCreationDate }} - - - - - {{ noteCount }} {{ m.real_gray_stork_seek() }} - - · - - {{ followerCount }} {{ m.teal_helpful_parakeet_hike() }} - - · - - {{ followingCount }} {{ m.aloof_royal_samuel_startle() }} - - - + + + {{ noteCount }} + {{ m.real_gray_stork_seek() }} + + + {{ followerCount }} + {{ m.teal_helpful_parakeet_hike() }} + + + {{ followingCount }} + {{ m.aloof_royal_samuel_startle() }} + + diff --git a/components/profiles/profile.vue b/components/profiles/profile.vue index a0f393a..b8dadf3 100644 --- a/components/profiles/profile.vue +++ b/components/profiles/profile.vue @@ -1,141 +1,65 @@ - - - - - - - - {{ - relationship?.following - ? m.brief_upper_otter_cuddle() - : relationship?.requested - ? m.weak_bright_larva_grasp() - : m.lazy_major_loris_grasp() - }} - + + + + + + + - - - - - - - - - {{ account.display_name }} - - - - @{{ username }} - - {{ instance && "@" }}{{ instance }} - - - - - - - - - - + + + + + {{ account.display_name }} + + + + + + + + + + + {{ formattedCreationDate }} + + + + diff --git a/components/profiles/small-card.vue b/components/profiles/small-card.vue index 28741e3..874f36b 100644 --- a/components/profiles/small-card.vue +++ b/components/profiles/small-card.vue @@ -23,23 +23,14 @@ - + {{ account.display_name }} - - - - @{{ username }} - - {{ instance && "@" }}{{ instance }} - + + - @@ -55,14 +46,15 @@ import type { Account } from "@versia/client/schemas"; import type { z } from "zod"; import { Separator } from "~/components/ui/separator"; -import CopyableText from "../notes/copyable-text.vue"; +import Html from "../typography/html.vue"; +import Text from "../typography/text.vue"; +import Address from "./address.vue"; import Avatar from "./avatar.vue"; -import ProfileContent from "./profile-content.vue"; import ProfileFields from "./profile-fields.vue"; const { account } = defineProps<{ account: z.infer; }>(); -const [username, instance] = account.acct.split("@"); +const [username, domain] = account.acct.split("@"); diff --git a/components/profiles/tiny-card.vue b/components/profiles/tiny-card.vue index c0f0957..03932e2 100644 --- a/components/profiles/tiny-card.vue +++ b/components/profiles/tiny-card.vue @@ -5,14 +5,10 @@ > - {{ account.display_name }} - - @{{ account.username }}@{{ domain }} - + + {{ account.display_name }} + + @@ -21,6 +17,8 @@ import type { Account } from "@versia/client/schemas"; import type { z } from "zod"; import { Card, CardContent } from "~/components/ui/card"; +import Text from "../typography/text.vue"; +import Address from "./address.vue"; import Avatar from "./avatar.vue"; const { account, domain, naked } = defineProps<{ diff --git a/components/typography/bold.vue b/components/typography/bold.vue new file mode 100644 index 0000000..a36d885 --- /dev/null +++ b/components/typography/bold.vue @@ -0,0 +1,23 @@ + + + + + + + diff --git a/components/typography/headings/large.vue b/components/typography/headings/large.vue new file mode 100644 index 0000000..d28d4de --- /dev/null +++ b/components/typography/headings/large.vue @@ -0,0 +1,23 @@ + + + + + + + diff --git a/components/typography/headings/medium.vue b/components/typography/headings/medium.vue new file mode 100644 index 0000000..ce6a6b5 --- /dev/null +++ b/components/typography/headings/medium.vue @@ -0,0 +1,23 @@ + + + + + + + diff --git a/components/typography/headings/small.vue b/components/typography/headings/small.vue new file mode 100644 index 0000000..12c7f79 --- /dev/null +++ b/components/typography/headings/small.vue @@ -0,0 +1,23 @@ + + + + + + + diff --git a/components/typography/html.vue b/components/typography/html.vue new file mode 100644 index 0000000..82784dc --- /dev/null +++ b/components/typography/html.vue @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/components/typography/layout/col.vue b/components/typography/layout/col.vue new file mode 100644 index 0000000..b2fb517 --- /dev/null +++ b/components/typography/layout/col.vue @@ -0,0 +1,25 @@ + + + + + + + diff --git a/components/typography/layout/row.vue b/components/typography/layout/row.vue new file mode 100644 index 0000000..5ad2b89 --- /dev/null +++ b/components/typography/layout/row.vue @@ -0,0 +1,25 @@ + + + + + + + diff --git a/components/typography/small.vue b/components/typography/small.vue new file mode 100644 index 0000000..abbc3c2 --- /dev/null +++ b/components/typography/small.vue @@ -0,0 +1,24 @@ + + + + + + + diff --git a/components/typography/text.vue b/components/typography/text.vue new file mode 100644 index 0000000..b2efdcd --- /dev/null +++ b/components/typography/text.vue @@ -0,0 +1,24 @@ + + + + + + +
{{ description }}