From cb21ab02c5bf18003f36bc4e894df6102c42a3d3 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sat, 9 Mar 2024 11:16:05 -0800 Subject: [PATCH] design: redesign user page --- src/lib/components/lemmy/post/PostBody.svelte | 4 +- src/lib/components/lemmy/user/UserLink.svelte | 12 +- src/routes/u/[name]/+page.svelte | 151 +++++++++--------- 3 files changed, 83 insertions(+), 84 deletions(-) diff --git a/src/lib/components/lemmy/post/PostBody.svelte b/src/lib/components/lemmy/post/PostBody.svelte index 9442a7a3..a9a9b177 100644 --- a/src/lib/components/lemmy/post/PostBody.svelte +++ b/src/lib/components/lemmy/post/PostBody.svelte @@ -20,12 +20,12 @@
diff --git a/src/lib/components/lemmy/user/UserLink.svelte b/src/lib/components/lemmy/user/UserLink.svelte index 1aca020a..d9bdc657 100644 --- a/src/lib/components/lemmy/user/UserLink.svelte +++ b/src/lib/components/lemmy/user/UserLink.svelte @@ -16,18 +16,22 @@ {#if avatar} {/if} - + - {$userSettings.displayNames ? (user.display_name || user.name) : user.name} + {$userSettings.displayNames ? user.display_name || user.name : user.name} {#if showInstance} - + @{new URL(user.actor_id).hostname} {/if} diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte index 211bd03c..cacae612 100644 --- a/src/routes/u/[name]/+page.svelte +++ b/src/routes/u/[name]/+page.svelte @@ -7,6 +7,7 @@ import RelativeDate from '$lib/components/util/RelativeDate.svelte' import { AdjustmentsHorizontal, + AtSymbol, Bars3BottomRight, Calendar, ChartBar, @@ -38,6 +39,8 @@ import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte' import { publishedToDate } from '$lib/components/util/date.js' import PrivateMessageModal from '$lib/components/lemmy/modal/PrivateMessageModal.svelte' + import LabelStat from '$lib/components/ui/LabelStat.svelte' + import PostBody from '$lib/components/lemmy/post/PostBody.svelte' export let data @@ -205,29 +208,37 @@ />
- +
- - - - - - + + {#if data.person_view.person.bio} + + {/if}
- - - - - - - - + +
{#if (data.moderates ?? []).length > 0}
@@ -258,78 +269,62 @@
{/if} {#if $profile?.user && $profile.jwt && data.person_view.person.id != $profile.user.local_user_view.person.id} -
-
+
+ + {#if data.person_view.person.matrix_user_id} - {#if data.person_view.person.matrix_user_id} - - {/if} -
-
- {#if isAdmin($profile?.user)} - - - - ban(data.person_view.person.banned, data.person_view.person)} - > - - {data.person_view.person.banned ? 'Unban' : 'Ban'} - - (purgingUser = !purgingUser)} - > - - Purge - - - {/if} - + {/if} + {#if isAdmin($profile?.user)} + blockUser(data.person_view.person.id)} + on:click={() => + ban(data.person_view.person.banned, data.person_view.person)} > - - {isBlocked($profile.user, data.person_view.person.id) - ? 'Unblock' - : 'Block'} + + {data.person_view.person.banned ? 'Unban' : 'Ban'} + + (purgingUser = !purgingUser)} + > + + Purge -
+ {/if} + + + blockUser(data.person_view.person.id)} + > + + {isBlocked($profile.user, data.person_view.person.id) + ? 'Unblock' + : 'Block'} + +
{/if} -
-

- -

- {new URL(data.person_view.person.actor_id).hostname} -
- {#if data.person_view.person.bio} - - {/if} - +