From 0247d6dc4d52801828850b7d43cf8389f9237998 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 23 Aug 2025 14:59:35 -0700 Subject: [PATCH] design: restructure andd redesign sidebar --- src/lib/components/lemmy/SiteCard.svelte | 42 +- .../lemmy/community/CommunityCard.svelte | 46 +-- .../lemmy/community/CommunityHeader.svelte | 2 - .../components/lemmy/generic/ItemList.svelte | 4 +- src/lib/components/lemmy/post/PostVote.svelte | 2 +- .../lemmy/post/actions/PostActions.svelte | 2 - .../lemmy/post/feed/VirtualFeed.svelte | 2 +- .../lemmy/post/link/PostLink.svelte | 1 - src/lib/components/ui/EndPlaceholder.svelte | 1 + src/lib/components/ui/EntityHeader.svelte | 2 +- src/lib/components/ui/layout/Shell.svelte | 2 +- .../components/ui/layout/pages/Header.svelte | 4 +- .../components/ui/layout/pages/Tabs.svelte | 2 +- src/lib/components/ui/sidebar/Sidebar.svelte | 358 +++++++++--------- .../ui/sidebar/SidebarButton.svelte | 10 +- src/lib/mono/button/Button.svelte | 14 +- src/lib/mono/forms/select/Select.svelte | 70 ++-- .../[id=integer]/confirm/+page.svelte | 2 +- .../(local_user)/settings/+page.svelte | 7 +- src/routes/profile/+layout.svelte | 23 +- src/routes/profile/+page.svelte | 8 - src/routes/profile/+page.ts | 5 + src/routes/profile/user/+page.svelte | 5 +- src/routes/u/[name]/+page.svelte | 20 +- 24 files changed, 281 insertions(+), 353 deletions(-) delete mode 100644 src/routes/profile/+page.svelte create mode 100644 src/routes/profile/+page.ts diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index 78169ca7..098ae46b 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -10,8 +10,7 @@ import Link from '../input/Link.svelte' import Expandable from '../ui/Expandable.svelte' import LabelStat from '../ui/LabelStat.svelte' - import CommonList from '../ui/layout/CommonList.svelte' - import SidebarButton from '../ui/sidebar/SidebarButton.svelte' + import ItemList from './generic/ItemList.svelte' import { optimizeImageURL } from './post/helpers' interface Props { @@ -115,36 +114,15 @@ {$t('cards.site.admins')} {/snippet} - - {#snippet item(admin)} - - {#snippet customIcon()} - {/snippet} - {#snippet label()} -
- {admin.person.display_name ?? admin.person.name} - - {new URL(admin.person.actor_id).hostname} - -
- {/snippet} -
- {/snippet} -
+ ({ + id: i.person.id, + name: i.person.display_name || i.person.name, + url: userLink(i.person), + avatar: i.person.avatar, + instance: new URL(i.person.actor_id).hostname, + }))} + /> {/if} diff --git a/src/lib/components/lemmy/community/CommunityCard.svelte b/src/lib/components/lemmy/community/CommunityCard.svelte index 91508c73..0e61404a 100644 --- a/src/lib/components/lemmy/community/CommunityCard.svelte +++ b/src/lib/components/lemmy/community/CommunityCard.svelte @@ -76,8 +76,6 @@ import Entity from '$lib/components/ui/Entity.svelte' import Expandable from '$lib/components/ui/Expandable.svelte' import LabelStat from '$lib/components/ui/LabelStat.svelte' - import CommonList from '$lib/components/ui/layout/CommonList.svelte' - import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte' import { t } from '$lib/i18n/translations' import { client, getClient } from '$lib/lemmy.svelte.js' import { errorMessage } from '$lib/lemmy/error' @@ -107,6 +105,7 @@ NoSymbol, Plus, } from 'svelte-hero-icons' + import ItemList from '../generic/ItemList.svelte' let loading = $state({ blocking: false, @@ -214,40 +213,15 @@ {$t('cards.community.moderators')} {/snippet} - - {#snippet item(moderator)} - - {#snippet customIcon()} - - {/snippet} - {#snippet label()} -
- - {moderator.moderator.display_name ?? - moderator.moderator.name} - - - {new URL(moderator.moderator.actor_id).hostname} - -
- {/snippet} -
- {/snippet} -
+ ({ + id: i.moderator.id, + name: i.moderator.display_name || i.moderator.name, + url: userLink(i.moderator), + avatar: i.moderator.avatar, + instance: new URL(i.moderator.actor_id).hostname, + }))} + /> {/if} diff --git a/src/lib/components/lemmy/community/CommunityHeader.svelte b/src/lib/components/lemmy/community/CommunityHeader.svelte index a5cc3d80..6ab0c685 100644 --- a/src/lib/components/lemmy/community/CommunityHeader.svelte +++ b/src/lib/components/lemmy/community/CommunityHeader.svelte @@ -31,8 +31,6 @@ import ItemList from '../generic/ItemList.svelte' import { amMod, isAdmin } from '../moderation/moderation' import { block, blockInstance, purgeCommunity } from './CommunityCard.svelte' - import CommonList from '$lib/components/ui/layout/CommonList.svelte' - import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte' interface Props { community: Community diff --git a/src/lib/components/lemmy/generic/ItemList.svelte b/src/lib/components/lemmy/generic/ItemList.svelte index f526003c..b29a5fe6 100644 --- a/src/lib/components/lemmy/generic/ItemList.svelte +++ b/src/lib/components/lemmy/generic/ItemList.svelte @@ -2,8 +2,6 @@ import Avatar from '$lib/components/ui/Avatar.svelte' import CommonList from '$lib/components/ui/layout/CommonList.svelte' import { Button } from 'mono-svelte' - import { flip } from 'svelte/animate' - import { expoOut } from 'svelte/easing' interface Props { items: { @@ -18,7 +16,7 @@ let { items }: Props = $props() - + {#snippet item(item)} + {/snippet} + {#each profile.meta.profiles as p} + { + profile.meta.profile = p.id + + goto(page.url, { + invalidateAll: true, + }) + }} + > + {#snippet prefix()} + + {/snippet} +
+
{p.username}
+
+ {p.instance} +
+
+ {#if profile.meta.profile == p.id} + + {/if} + {#if !p.jwt} + + + + {/if} +
+ {/each} + + {#snippet prefix()} + + {/snippet} + {$t('account.accounts')} + + + {$t('profile.profile')} {#if profile.current?.jwt} - - {#snippet label()} - - {$t('profile.profile')} - - {/snippet} - - - {#snippet label()} - - {$t('profile.inbox')} - {#if $notifications.inbox} - - {$notifications.inbox > 99 ? '∞' : $notifications.inbox} - - {/if} - - {/snippet} - - - {#snippet label()} - {$t('profile.saved')} - {/snippet} + + + {#if $notifications.inbox} + + {$notifications.inbox > 99 ? '∞' : $notifications.inbox} + + {/if} + {:else} - {#snippet label()} - {$t('account.login')} - {/snippet} - + /> - {#snippet label()} - {$t('account.signup')} - {/snippet} - + /> - {#snippet label()} - {$t('nav.menu.settings')} - {/snippet} - + href="/accounts" + title={$t('accounts.accounts')} + icon={UserGroup} + /> {/if} - {#if profile.meta.profiles.length >= 1} -
- - - {#snippet title()} - - - {$t('account.accounts')} - {#snippet action()} - - {profile.meta.profiles.length} - - {/snippet} - - - {/snippet} - prof.id == profile.meta.profile} + {$t('nav.menu.app')} + + + {#if profile.current?.user} - {#if profile.current?.user.moderates.length > 0} - + {$t('content.communities')} + +
+ {#if profile.current?.user.moderates.length > 0} + + {#snippet title()} + + + {$t('routes.profile.moderates')} + {#snippet action()} + + {profile.current.user?.moderates.length} + + {/snippet} + + + {/snippet} + ({ + id: i.community.id, + name: i.community.title, + url: communityLink(i.community), + avatar: i.community.icon, + instance: new URL(i.community.actor_id).hostname, + }))} + /> + + {/if} + + {#snippet title()} - {$t('routes.profile.moderates')} + {$t('profile.subscribed')} {#snippet action()} - {profile.current.user?.moderates.length} + {profile.current.user?.follows.length} {/snippet} {/snippet} - - {#snippet item(moderate)} - - {#snippet customIcon()} - {/snippet} - {#snippet label()} -
- {moderate.community.title} - - {new URL(moderate.community.actor_id).hostname} - -
- {/snippet} -
- {/snippet} -
-
-
- {/if} - - {#snippet title()} - - - {$t('profile.subscribed')} - {#snippet action()} - - {profile.current.user?.follows.length} - - {/snippet} - - - {/snippet} - - {#snippet item(follow)} - - {#snippet customIcon()} - {/snippet} - {#snippet label()} -
- {follow.community.title} - - {new URL(follow.community.actor_id).hostname} - -
- {/snippet} -
- {/snippet} -
-
+ ({ + id: i.community.id, + name: i.community.title, + url: communityLink(i.community), + avatar: i.community.icon, + instance: new URL(i.community.actor_id).hostname, + }))} + /> + +
{/if} + +
diff --git a/src/lib/components/ui/sidebar/SidebarButton.svelte b/src/lib/components/ui/sidebar/SidebarButton.svelte index 9eafb14b..293cf7ac 100644 --- a/src/lib/components/ui/sidebar/SidebarButton.svelte +++ b/src/lib/components/ui/sidebar/SidebarButton.svelte @@ -8,9 +8,9 @@ href?: string | undefined icon?: IconSource | undefined class?: string + label?: string customIcon?: import('svelte').Snippet<[{ selected: boolean }]> children?: import('svelte').Snippet - label?: import('svelte').Snippet } let { @@ -27,9 +27,9 @@ diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index aaac2f20..8d3a6ac5 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -18,7 +18,7 @@ hover:bg-slate-100 dark:hover:bg-zinc-800 dark:hover:border-zinc-700 dark:active:bg-zinc-900 active:bg-slate-200`, tertiary: - 'border border-transparent bg-transparent hover:bg-slate-100 dark:hover:bg-zinc-700/30 dark:text-zinc-200', + ' bg-transparent hover:bg-slate-200/50 dark:hover:bg-zinc-700/30 dark:text-zinc-200', danger: 'border border-red-500 bg-red-500 hover:text-red-500 hover:bg-transparent text-white', @@ -47,9 +47,9 @@ export const buttonSize = { xs: 'px-2 py-1 text-xs', sm: 'px-3 py-1.5 text-[12px]', - md: 'px-3 py-1.5', - lg: 'px-4 py-2', - xl: 'px-6 py-3', + md: 'px-3 py-1.5 text-sm', + lg: 'px-4 py-2 text-sm', + xl: 'px-6 py-3 text-base', 'square-sm': 'w-6 h-6', 'square-md': 'w-8 h-8', 'square-lg': 'w-10 h-10', @@ -105,7 +105,7 @@ size = 'md', rounding = size == 'lg' ? 'xl' : 'lg', alignment = 'center', - shadow = color != 'tertiary' ? 'sm' : 'none', + shadow = color != 'tertiary' ? 'none' : 'none', column = false, disabled, loaderWidth = undefined, @@ -129,7 +129,7 @@ buttonRounding[rounding], buttonShadow[shadow], buttonColor[color], - 'text-sm transition-all font-medium cursor-pointer duration-75 disabled:opacity-50 disabled:pointer-events-none disabled:shadow-none', + 'transition-all font-medium cursor-pointer duration-75 disabled:opacity-50 disabled:pointer-events-none disabled:shadow-none text-sm', (disabled || loading) && 'pointer-events-none opacity-50 shadow-none', alignment == 'center' ? 'origin-center' @@ -144,7 +144,7 @@ class={[ 'flex', column ? 'flex-col justify-center' : 'flex-row items-center', - 'h-full gap-1.5 button-content', + 'h-full gap-1.5 button-content w-full', buttonAlignment[alignment], ]} > diff --git a/src/lib/mono/forms/select/Select.svelte b/src/lib/mono/forms/select/Select.svelte index b2bf8bde..eba89a2f 100644 --- a/src/lib/mono/forms/select/Select.svelte +++ b/src/lib/mono/forms/select/Select.svelte @@ -24,6 +24,7 @@ }, ] > + target?: Snippet oncontextmenu?: HTMLSelectAttributes['oncontextmenu'] onchange?: HTMLSelectAttributes['onchange'] placement?: Placement @@ -33,7 +34,7 @@ +{#snippet selectTarget()} + +{/snippet} +
{#if customLabel || label}