design: restructure andd redesign sidebar

This commit is contained in:
James Xylight committed 2025-08-23 14:59:35 -07:00
1 parent 0b3c1f7856
commit 0247d6dc4d
24 files changed
+281 -353

No files matched your search

+10 -32
View File
@@ -10,8 +10,7 @@
import Link from '../input/Link.svelte' import Link from '../input/Link.svelte'
import Expandable from '../ui/Expandable.svelte' import Expandable from '../ui/Expandable.svelte'
import LabelStat from '../ui/LabelStat.svelte' import LabelStat from '../ui/LabelStat.svelte'
import CommonList from '../ui/layout/CommonList.svelte' import ItemList from './generic/ItemList.svelte'
import SidebarButton from '../ui/sidebar/SidebarButton.svelte'
import { optimizeImageURL } from './post/helpers' import { optimizeImageURL } from './post/helpers'
interface Props { interface Props {
@@ -115,36 +114,15 @@
{$t('cards.site.admins')} {$t('cards.site.admins')}
</span> </span>
{/snippet} {/snippet}
<CommonList <ItemList
animate={false} items={admins.map(i => ({
size="xs" id: i.person.id,
items={admins} name: i.person.display_name || i.person.name,
class="px-1 py-0.5" url: userLink(i.person),
> avatar: i.person.avatar,
{#snippet item(admin)} instance: new URL(i.person.actor_id).hostname,
<SidebarButton }))}
class="font-normal w-full h-max" />
color="none"
alignment="left"
href={userLink(admin.person)}
>
{#snippet customIcon()}
<Avatar
url={admin.person.avatar}
alt={admin.person.name}
width={28}
/>{/snippet}
{#snippet label()}
<div class="flex flex-col max-w-full break-words">
<span>{admin.person.display_name ?? admin.person.name}</span>
<span class="text-xs text-slate-600 dark:text-zinc-400">
{new URL(admin.person.actor_id).hostname}
</span>
</div>
{/snippet}
</SidebarButton>
{/snippet}
</CommonList>
</Expandable> </Expandable>
{/if} {/if}
@@ -76,8 +76,6 @@
import Entity from '$lib/components/ui/Entity.svelte' import Entity from '$lib/components/ui/Entity.svelte'
import Expandable from '$lib/components/ui/Expandable.svelte' import Expandable from '$lib/components/ui/Expandable.svelte'
import LabelStat from '$lib/components/ui/LabelStat.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 { t } from '$lib/i18n/translations'
import { client, getClient } from '$lib/lemmy.svelte.js' import { client, getClient } from '$lib/lemmy.svelte.js'
import { errorMessage } from '$lib/lemmy/error' import { errorMessage } from '$lib/lemmy/error'
@@ -107,6 +105,7 @@
NoSymbol, NoSymbol,
Plus, Plus,
} from 'svelte-hero-icons' } from 'svelte-hero-icons'
import ItemList from '../generic/ItemList.svelte'
let loading = $state({ let loading = $state({
blocking: false, blocking: false,
@@ -214,40 +213,15 @@
{$t('cards.community.moderators')} {$t('cards.community.moderators')}
</span> </span>
{/snippet} {/snippet}
<CommonList <ItemList
animate={false} items={moderators.map(i => ({
size="xs" id: i.moderator.id,
items={moderators} name: i.moderator.display_name || i.moderator.name,
class="px-1 py-0.5" url: userLink(i.moderator),
> avatar: i.moderator.avatar,
{#snippet item(moderator)} instance: new URL(i.moderator.actor_id).hostname,
<SidebarButton }))}
class="font-normal w-full h-max" />
color="none"
alignment="left"
href={userLink(moderator.moderator)}
>
{#snippet customIcon()}
<Avatar
url={moderator.moderator.avatar}
alt={moderator.moderator.name}
width={28}
/>
{/snippet}
{#snippet label()}
<div class="flex flex-col max-w-full break-words">
<span>
{moderator.moderator.display_name ??
moderator.moderator.name}
</span>
<span class="text-xs text-slate-600 dark:text-zinc-400">
{new URL(moderator.moderator.actor_id).hostname}
</span>
</div>
{/snippet}
</SidebarButton>
{/snippet}
</CommonList>
</Expandable> </Expandable>
{/if} {/if}
</div> </div>
@@ -31,8 +31,6 @@
import ItemList from '../generic/ItemList.svelte' import ItemList from '../generic/ItemList.svelte'
import { amMod, isAdmin } from '../moderation/moderation' import { amMod, isAdmin } from '../moderation/moderation'
import { block, blockInstance, purgeCommunity } from './CommunityCard.svelte' 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 { interface Props {
community: Community community: Community
@@ -2,8 +2,6 @@
import Avatar from '$lib/components/ui/Avatar.svelte' import Avatar from '$lib/components/ui/Avatar.svelte'
import CommonList from '$lib/components/ui/layout/CommonList.svelte' import CommonList from '$lib/components/ui/layout/CommonList.svelte'
import { Button } from 'mono-svelte' import { Button } from 'mono-svelte'
import { flip } from 'svelte/animate'
import { expoOut } from 'svelte/easing'
interface Props { interface Props {
items: { items: {
@@ -18,7 +16,7 @@
let { items }: Props = $props() let { items }: Props = $props()
</script> </script>
<CommonList animate={false} size="xs" {items}> <CommonList animate={false} class="px-1 py-0.5" size="xs" {items}>
{#snippet item(item)} {#snippet item(item)}
<Button <Button
class="font-normal w-full h-max block" class="font-normal w-full h-max block"
@@ -94,7 +94,7 @@
buttonColor.secondary, buttonColor.secondary,
'rounded-full h-full font-medium flex items-center *:p-2 relative', 'rounded-full h-full font-medium flex items-center *:p-2 relative',
'hover:bg-white dark:hover:bg-zinc-900 overflow-hidden transition-colors shrink-0', 'hover:bg-white dark:hover:bg-zinc-900 overflow-hidden transition-colors shrink-0',
'text-inherit! divide-x divide-slate-200 dark:divide-zinc-800 shadow-xs', 'text-inherit! divide-x divide-slate-200 dark:divide-zinc-800',
loading && 'animate-pulse opacity-75 pointer-events-none', loading && 'animate-pulse opacity-75 pointer-events-none',
voteRatio < 85 && settings.voteRatioBar && 'vote-ratio', voteRatio < 85 && settings.voteRatioBar && 'vote-ratio',
]} ]}
@@ -89,8 +89,6 @@
bind:score={post.counts.score} bind:score={post.counts.score}
bind:upvotes={post.counts.upvotes} bind:upvotes={post.counts.upvotes}
bind:downvotes={post.counts.downvotes} bind:downvotes={post.counts.downvotes}
showCounts={profile.current?.user?.local_user_view?.local_user
?.show_scores ?? true}
/> />
<Button <Button
@@ -190,7 +190,7 @@
{:else} {:else}
<VirtualList <VirtualList
id="feed" id="feed"
class="divide-y-2 -mx-3 sm:-mx-6 divide-slate-200 dark:divide-zinc-900" class="divide-y-2 -mx-3 sm:-mx-6 divide-slate-100 dark:divide-zinc-900"
items={posts} items={posts}
{initialOffset} {initialOffset}
overscan={3} overscan={3}
@@ -35,7 +35,6 @@
class={[ class={[
'flex flex-col-reverse sm:flex-row overflow-hidden gap-4 embed-card z-0 relative', 'flex flex-col-reverse sm:flex-row overflow-hidden gap-4 embed-card z-0 relative',
'dark:bg-zinc-950 group-hover/link:bg-slate-50 dark:group-hover/link:bg-zinc-900 transition-colors', 'dark:bg-zinc-950 group-hover/link:bg-slate-50 dark:group-hover/link:bg-zinc-900 transition-colors',
'shadow-xs',
]} ]}
rounding="2xl" rounding="2xl"
element="article" element="article"
@@ -2,6 +2,7 @@
import type { ClassValue } from 'svelte/elements' import type { ClassValue } from 'svelte/elements'
const sizes = { const sizes = {
xs: 'text-xs px-3 mt-3 mb-1',
sm: 'text-sm', sm: 'text-sm',
md: 'text-base', md: 'text-base',
lg: 'text-lg', lg: 'text-lg',
+1 -1
View File
@@ -44,7 +44,7 @@
<div class="absolute inset-0 h-96 overflow-x-hidden -z-10"> <div class="absolute inset-0 h-96 overflow-x-hidden -z-10">
<img <img
src={banner || avatar} src={banner || avatar}
class="w-full h-48 blur-3xl" class="w-full h-64 object-cover blur-3xl opacity-30 dark:opacity-30"
height="192" height="192"
alt="User banner" alt="User banner"
/> />
+1 -1
View File
@@ -55,7 +55,7 @@
</div> </div>
<div class={['content flex-1', settings.newWidth && 'limit-width']}> <div class={['content flex-1', settings.newWidth && 'limit-width']}>
{@render sidebar?.({ {@render sidebar?.({
class: `hidden md:flex sticky top-0 lg:top-16 left-0 h-max bg-slate-100 dark:bg-zinc-950 z-40 max-h-screen`, class: `hidden md:flex sticky top-0 lg:top-16 left-0 h-max bg-slate-100 dark:bg-zinc-950 z-40 max-h-[calc(100vh-4rem)] min-h-[calc(100vh-4rem)]`,
style: 'grid-area: sidebar; width: 100% !important;', style: 'grid-area: sidebar; width: 100% !important;',
})} })}
{@render main?.({ {@render main?.({
@@ -29,8 +29,8 @@
class={[ class={[
pageHeader && pageHeader &&
`w-[calc(100%+1.5rem)] sm:w-[calc(100%+3rem)] `w-[calc(100%+1.5rem)] sm:w-[calc(100%+3rem)]
bg-slate-100 dark:bg-zinc-950 -mx-3 sm:-mx-6 sm:px-6 sm:pb-6 px-4 pb-4 -mt-24 pt-24 bg-slate-100 dark:bg-zinc-950 -mx-3 sm:-mx-6 sm:px-6 sm:pb-6 px-4 pb-4 -mt-64 pt-64
border-b border-slate-200/50 dark:border-zinc-900 margin z-20`, border-b border-slate-200 dark:border-zinc-900 margin z-0`,
]} ]}
{style} {style}
> >
@@ -27,7 +27,7 @@
</script> </script>
<nav <nav
class="flex flex-row items-center gap-x-8 gap-y-4 p-1 justify-center sm:justify-start my-2 sm:mt-0 flex-wrap" class="flex flex-row items-center gap-x-8 gap-y-4 p-1 justify-center sm:justify-start my-2 sm:mt-0 flex-wrap z-20"
> >
{#each routes as route (route.href)} {#each routes as route (route.href)}
{@const selected = isSelected( {@const selected = isSelected(
+183 -175
View File
@@ -1,25 +1,35 @@
<script lang="ts"> <script lang="ts">
import { goto } from '$app/navigation'
import { page } from '$app/state'
import { notifications, profile } from '$lib/auth.svelte.js' import { notifications, profile } from '$lib/auth.svelte.js'
import ItemList from '$lib/components/lemmy/generic/ItemList.svelte'
import Expandable from '$lib/components/ui/Expandable.svelte' import Expandable from '$lib/components/ui/Expandable.svelte'
import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte'
import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte' import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte'
import { t } from '$lib/i18n/translations' import { t } from '$lib/i18n/translations'
import { communityLink } from '$lib/lemmy/generic' import { communityLink } from '$lib/lemmy/generic'
import { settings } from '$lib/settings.svelte.js' import { settings } from '$lib/settings.svelte.js'
import { Badge } from 'mono-svelte' import { Badge, Button, Menu, MenuButton, Option, Select } from 'mono-svelte'
import { import {
ArrowLeftOnRectangle, ArrowLeftOnRectangle,
Bookmark, Bookmark,
CheckCircle,
ChevronUpDown,
Cog6Tooth, Cog6Tooth,
ComputerDesktop,
Icon,
Identification, Identification,
Inbox, Inbox,
Moon,
QuestionMarkCircle,
Sun,
Swatch,
UserCircle, UserCircle,
UserGroup, UserGroup,
} from 'svelte-hero-icons' } from 'svelte-hero-icons'
import type { ClassValue } from 'svelte/elements' import type { ClassValue } from 'svelte/elements'
import Avatar from '../Avatar.svelte' import Avatar from '../Avatar.svelte'
import EndPlaceholder from '../EndPlaceholder.svelte' import EndPlaceholder from '../EndPlaceholder.svelte'
import CommonList from '../layout/CommonList.svelte' import { theme } from '$lib/ui/colors.svelte'
interface Props { interface Props {
style?: string style?: string
@@ -30,201 +40,199 @@
</script> </script>
<nav class={['flex flex-col overflow-auto gap-1', clazz]} {style}> <nav class={['flex flex-col overflow-auto gap-1', clazz]} {style}>
<Menu placement="bottom">
{#snippet target()}
<Button
color="tertiary"
alignment="left"
size="md"
class="flex flex-row gap-2 items-center"
>
{#snippet prefix()}
<Avatar
url={profile.current.avatar}
alt={profile.current.username}
width={24}
/>
{/snippet}
<div class="flex-1">
<div class="font-medium">{profile.current.username}</div>
<div class="text-xs text-slate-500 dark:text-zinc-500">
{profile.current.instance}
</div>
</div>
{#snippet suffix()}
<Icon
src={ChevronUpDown}
size="16"
micro
class="block justify-self-end"
/>
{/snippet}
</Button>
{/snippet}
{#each profile.meta.profiles as p}
<MenuButton
onclick={() => {
profile.meta.profile = p.id
goto(page.url, {
invalidateAll: true,
})
}}
>
{#snippet prefix()}
<Avatar url={p.avatar} alt={p.username} width={24} />
{/snippet}
<div>
<div class="font-medium text-sm">{p.username}</div>
<div class="text-xs text-slate-500 dark:text-zinc-500">
{p.instance}
</div>
</div>
{#if profile.meta.profile == p.id}
<Icon
src={CheckCircle}
class="text-primary-900 dark:text-primary-100 ml-auto"
size="16"
micro
/>
{/if}
{#if !p.jwt}
<Badge color="gray-subtle" class="ml-auto p-1!">
<Icon src={QuestionMarkCircle} size="16" micro />
</Badge>
{/if}
</MenuButton>
{/each}
<MenuButton href="/accounts">
{#snippet prefix()}
<Icon src={UserGroup} size="16" micro />
{/snippet}
{$t('account.accounts')}
</MenuButton>
</Menu>
<EndPlaceholder size="xs">{$t('profile.profile')}</EndPlaceholder>
{#if profile.current?.jwt} {#if profile.current?.jwt}
<SidebarButton icon={UserCircle} href="/profile"> <SidebarButton
{#snippet label()} icon={UserCircle}
<span> href="/profile"
{$t('profile.profile')} label={$t('profile.profile')}
</span> />
{/snippet} <SidebarButton icon={Inbox} href="/inbox" label={$t('profile.inbox')}>
</SidebarButton> {#if $notifications.inbox}
<SidebarButton icon={Inbox} href="/inbox"> <Badge
{#snippet label()} class="min-w-5 h-5 p-0! px-0.5 grid place-items-center ml-auto"
<span class="flex items-center gap-2"> color="red-subtle"
{$t('profile.inbox')} >
{#if $notifications.inbox} {$notifications.inbox > 99 ? '∞' : $notifications.inbox}
<Badge </Badge>
class="min-w-5 h-5 p-0! px-0.5 grid place-items-center ml-auto" {/if}
color="red-subtle"
>
{$notifications.inbox > 99 ? '∞' : $notifications.inbox}
</Badge>
{/if}
</span>
{/snippet}
</SidebarButton>
<SidebarButton icon={Bookmark} href="/saved">
{#snippet label()}
<span>{$t('profile.saved')}</span>
{/snippet}
</SidebarButton> </SidebarButton>
<SidebarButton icon={Bookmark} href="/saved" label={$t('profile.saved')} />
{:else} {:else}
<SidebarButton <SidebarButton
href="/login" href="/login"
title={$t('account.login')} label={$t('account.login')}
icon={ArrowLeftOnRectangle} icon={ArrowLeftOnRectangle}
> />
{#snippet label()}
<span>{$t('account.login')}</span>
{/snippet}
</SidebarButton>
<SidebarButton <SidebarButton
href="/signup" href="/signup"
title={$t('account.signup')} label={$t('account.signup')}
icon={Identification} icon={Identification}
> />
{#snippet label()}
<span>{$t('account.signup')}</span>
{/snippet}
</SidebarButton>
<SidebarButton <SidebarButton
href="/settings" href="/accounts"
title={$t('nav.menu.settings')} title={$t('accounts.accounts')}
icon={Cog6Tooth} icon={UserGroup}
> />
{#snippet label()}
<span>{$t('nav.menu.settings')}</span>
{/snippet}
</SidebarButton>
{/if} {/if}
{#if profile.meta.profiles.length >= 1} <EndPlaceholder size="xs">{$t('nav.menu.app')}</EndPlaceholder>
<hr class="border-slate-200 dark:border-zinc-900 my-1" /> <SidebarButton
href="/settings"
<Expandable label={$t('nav.menu.settings')}
class="max-w-full min-w-0 w-full" icon={Cog6Tooth}
bind:open={settings.expand.accounts} />
> <Select bind:value={theme.colorScheme} size="sm">
{#snippet title()} {#snippet target()}
<span class="px-2 py-1 w-full"> <SidebarButton
<EndPlaceholder border={false}> label={$t('nav.menu.colorscheme.label')}
{$t('account.accounts')} icon={theme.colorScheme == 'system'
{#snippet action()} ? ComputerDesktop
<span class="dark:text-white text-black"> : theme.colorScheme == 'light'
{profile.meta.profiles.length} ? Sun
</span> : Moon}
{/snippet} class=" w-full"
</EndPlaceholder>
</span>
{/snippet}
<CommonList
size="xs"
animate={false}
items={profile.meta.profiles}
class="px-1 py-0.5"
selected={prof => prof.id == profile.meta.profile}
> >
{#snippet item(prof, index)} <Option value="system" class="hidden" icon={ComputerDesktop}>
<ProfileButton {index} {prof} /> {$t('nav.menu.colorscheme.system')}
{/snippet} </Option>
<li class="xs px-1 py-0.5"> <Option value="light" class="hidden" icon={Sun}>
<SidebarButton href="/accounts" icon={UserGroup}> {$t('nav.menu.colorscheme.light')}
{$t('account.accounts')} </Option>
</SidebarButton> <Option value="dark" class="hidden" icon={Moon}>
</li> {$t('nav.menu.colorscheme.dark')}
</CommonList> </Option>
</Expandable> </SidebarButton>
{/if} {/snippet}
<hr class="border-slate-200 dark:border-zinc-900 my-1" /> </Select>
<SidebarButton href="/theme" label={$t('nav.menu.theme')} icon={Swatch} />
{#if profile.current?.user} {#if profile.current?.user}
{#if profile.current?.user.moderates.length > 0} <EndPlaceholder size="xs">{$t('content.communities')}</EndPlaceholder>
<Expandable
class="max-w-full min-w-0 w-full" <div class="space-y-3">
bind:open={settings.expand.moderates} {#if profile.current?.user.moderates.length > 0}
> <Expandable class="px-1.5" bind:open={settings.expand.moderates}>
{#snippet title()}
<span class="px-2 py-1 w-full">
<EndPlaceholder border={false}>
{$t('routes.profile.moderates')}
{#snippet action()}
<span class="dark:text-white text-black">
{profile.current.user?.moderates.length}
</span>
{/snippet}
</EndPlaceholder>
</span>
{/snippet}
<ItemList
items={profile.current.user.moderates.map(i => ({
id: i.community.id,
name: i.community.title,
url: communityLink(i.community),
avatar: i.community.icon,
instance: new URL(i.community.actor_id).hostname,
}))}
/>
</Expandable>
{/if}
<Expandable class="px-1.5" bind:open={settings.expand.communities}>
{#snippet title()} {#snippet title()}
<span class="px-2 py-1 w-full"> <span class="px-2 py-1 w-full">
<EndPlaceholder border={false}> <EndPlaceholder border={false}>
{$t('routes.profile.moderates')} {$t('profile.subscribed')}
{#snippet action()} {#snippet action()}
<span class="dark:text-white text-black"> <span class="dark:text-white text-black">
{profile.current.user?.moderates.length} {profile.current.user?.follows.length}
</span> </span>
{/snippet} {/snippet}
</EndPlaceholder> </EndPlaceholder>
</span> </span>
{/snippet} {/snippet}
<CommonList
animate={false}
size="xs"
items={profile.current.user.moderates}
class="px-1 py-0.5"
>
{#snippet item(moderate)}
<SidebarButton
class="font-normal w-full h-max"
color="none"
alignment="left"
href={communityLink(moderate.community)}
>
{#snippet customIcon()}
<Avatar
url={moderate.community.icon}
alt={moderate.community.name}
title={moderate.community.title}
width={28}
/>{/snippet}
{#snippet label()}
<div class="flex flex-col max-w-full break-words">
<span>{moderate.community.title}</span>
<span class="text-xs text-slate-600 dark:text-zinc-400">
{new URL(moderate.community.actor_id).hostname}
</span>
</div>
{/snippet}
</SidebarButton>
{/snippet}
</CommonList>
</Expandable>
<hr class="border-slate-200 dark:border-zinc-900 my-1" />
{/if}
<Expandable <ItemList
class="max-w-full min-w-0 w-full" items={profile.current.user.follows.map(i => ({
bind:open={settings.expand.communities} id: i.community.id,
> name: i.community.title,
{#snippet title()} url: communityLink(i.community),
<span class="px-2 py-1 w-full"> avatar: i.community.icon,
<EndPlaceholder border={false}> instance: new URL(i.community.actor_id).hostname,
{$t('profile.subscribed')} }))}
{#snippet action()} />
<span class="dark:text-white text-black"> </Expandable>
{profile.current.user?.follows.length} </div>
</span>
{/snippet}
</EndPlaceholder>
</span>
{/snippet}
<CommonList
animate={false}
size="xs"
items={profile.current.user.follows}
class="px-1 py-0.5"
>
{#snippet item(follow)}
<SidebarButton
class="font-normal w-full h-max"
color="none"
alignment="left"
href={communityLink(follow.community)}
>
{#snippet customIcon()}
<Avatar
url={follow.community.icon}
alt={follow.community.name}
title={follow.community.title}
width={28}
/>{/snippet}
{#snippet label()}
<div class="flex flex-col max-w-full break-words">
<span>{follow.community.title}</span>
<span class="text-xs text-slate-600 dark:text-zinc-400">
{new URL(follow.community.actor_id).hostname}
</span>
</div>
{/snippet}
</SidebarButton>
{/snippet}
</CommonList>
</Expandable>
{/if} {/if}
<div class="flex-1 h-full mt-auto"></div>
</nav> </nav>
@@ -8,9 +8,9 @@
href?: string | undefined href?: string | undefined
icon?: IconSource | undefined icon?: IconSource | undefined
class?: string class?: string
label?: string
customIcon?: import('svelte').Snippet<[{ selected: boolean }]> customIcon?: import('svelte').Snippet<[{ selected: boolean }]>
children?: import('svelte').Snippet children?: import('svelte').Snippet
label?: import('svelte').Snippet
} }
let { let {
@@ -27,9 +27,9 @@
</script> </script>
<Button <Button
color="none" color="tertiary"
alignment="left" alignment="left"
rounding="pill" rounding="xl"
{...rest} {...rest}
{href} {href}
class={[ class={[
@@ -49,8 +49,6 @@
<Icon src={icon} solid size="20" /> <Icon src={icon} solid size="20" />
{/if} {/if}
{/snippet} {/snippet}
{label}
{@render children?.()} {@render children?.()}
<div class="contents">
{@render label?.()}
</div>
</Button> </Button>
+7 -7
View File
@@ -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`, hover:bg-slate-100 dark:hover:bg-zinc-800 dark:hover:border-zinc-700 dark:active:bg-zinc-900 active:bg-slate-200`,
tertiary: 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: danger:
'border border-red-500 bg-red-500 hover:text-red-500 hover:bg-transparent text-white', 'border border-red-500 bg-red-500 hover:text-red-500 hover:bg-transparent text-white',
@@ -47,9 +47,9 @@
export const buttonSize = { export const buttonSize = {
xs: 'px-2 py-1 text-xs', xs: 'px-2 py-1 text-xs',
sm: 'px-3 py-1.5 text-[12px]', sm: 'px-3 py-1.5 text-[12px]',
md: 'px-3 py-1.5', md: 'px-3 py-1.5 text-sm',
lg: 'px-4 py-2', lg: 'px-4 py-2 text-sm',
xl: 'px-6 py-3', xl: 'px-6 py-3 text-base',
'square-sm': 'w-6 h-6', 'square-sm': 'w-6 h-6',
'square-md': 'w-8 h-8', 'square-md': 'w-8 h-8',
'square-lg': 'w-10 h-10', 'square-lg': 'w-10 h-10',
@@ -105,7 +105,7 @@
size = 'md', size = 'md',
rounding = size == 'lg' ? 'xl' : 'lg', rounding = size == 'lg' ? 'xl' : 'lg',
alignment = 'center', alignment = 'center',
shadow = color != 'tertiary' ? 'sm' : 'none', shadow = color != 'tertiary' ? 'none' : 'none',
column = false, column = false,
disabled, disabled,
loaderWidth = undefined, loaderWidth = undefined,
@@ -129,7 +129,7 @@
buttonRounding[rounding], buttonRounding[rounding],
buttonShadow[shadow], buttonShadow[shadow],
buttonColor[color], 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', (disabled || loading) && 'pointer-events-none opacity-50 shadow-none',
alignment == 'center' alignment == 'center'
? 'origin-center' ? 'origin-center'
@@ -144,7 +144,7 @@
class={[ class={[
'flex', 'flex',
column ? 'flex-col justify-center' : 'flex-row items-center', 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], buttonAlignment[alignment],
]} ]}
> >
+36 -34
View File
@@ -24,6 +24,7 @@
}, },
] ]
> >
target?: Snippet
oncontextmenu?: HTMLSelectAttributes['oncontextmenu'] oncontextmenu?: HTMLSelectAttributes['oncontextmenu']
onchange?: HTMLSelectAttributes['onchange'] onchange?: HTMLSelectAttributes['onchange']
placement?: Placement placement?: Placement
@@ -33,7 +34,7 @@
</script> </script>
<script lang="ts" generics="T"> <script lang="ts" generics="T">
import { setContext, tick } from 'svelte' import { setContext, tick, type Snippet } from 'svelte'
import { import {
CheckCircle, CheckCircle,
ChevronUpDown, ChevronUpDown,
@@ -87,10 +88,43 @@
oncontextmenu, oncontextmenu,
onchange, onchange,
placement = 'bottom', placement = 'bottom',
target,
...rest ...rest
}: Props<T> = $props() }: Props<T> = $props()
</script> </script>
{#snippet selectTarget()}
<select
{...rest}
{id}
bind:this={element}
class={[
buttonSize[size],
buttonShadow[shadow],
buttonColor.secondary,
'appearance-none transition-colors rounded-xl text-sm w-full min-w-full cursor-pointer pr-6',
selectClass,
clazz,
]}
bind:value
onmousedown={e => {
e.preventDefault()
}}
onkeypress={e => {
e.preventDefault()
open = !open
}}
{onchange}
{oncontextmenu}
{placeholder}
>
{#if placeholder}
<option disabled selected value="">{placeholder}</option>
{/if}
{@render children?.()}
</select>
{/snippet}
<div class={['flex flex-col gap-1', clazz, baseClass]}> <div class={['flex flex-col gap-1', clazz, baseClass]}>
{#if customLabel || label} {#if customLabel || label}
<Label for={id} text={label}> <Label for={id} text={label}>
@@ -99,39 +133,7 @@
{/if} {/if}
<div class="w-full relative"> <div class="w-full relative">
<Menu bind:open {placement}> <Menu bind:open {placement} target={target ?? selectTarget}>
{#snippet target()}
<select
{...rest}
{id}
bind:this={element}
class={[
buttonSize[size],
buttonShadow[shadow],
buttonColor.secondary,
'appearance-none transition-colors rounded-xl text-sm w-full min-w-full cursor-pointer pr-6',
selectClass,
clazz,
]}
bind:value
onmousedown={e => {
e.preventDefault()
}}
onkeypress={e => {
e.preventDefault()
open = !open
}}
{onchange}
{oncontextmenu}
{placeholder}
>
{#if placeholder}
<option disabled selected value="">{placeholder}</option>
{/if}
{@render children?.()}
</select>
{/snippet}
{#each context.options as option (option)} {#each context.options as option (option)}
{#if customOption}{@render customOption({ {#if customOption}{@render customOption({
option, option,
@@ -6,9 +6,9 @@
import Header from '$lib/components/ui/layout/pages/Header.svelte' import Header from '$lib/components/ui/layout/pages/Header.svelte'
import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte' import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte'
import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte' import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte'
import { t } from '$lib/i18n/translations'
import { client } from '$lib/lemmy.svelte' import { client } from '$lib/lemmy.svelte'
import { errorMessage } from '$lib/lemmy/error' import { errorMessage } from '$lib/lemmy/error'
import { t } from '$lib/i18n/translations'
import { toast } from 'mono-svelte' import { toast } from 'mono-svelte'
import Button from 'mono-svelte/button/Button.svelte' import Button from 'mono-svelte/button/Button.svelte'
import Material from 'mono-svelte/materials/Material.svelte' import Material from 'mono-svelte/materials/Material.svelte'
@@ -1,16 +1,15 @@
<script lang="ts"> <script lang="ts">
import { profile } from '$lib/auth.svelte.js' import { profile } from '$lib/auth.svelte.js'
import ImageInputUpload from '$lib/components/form/ImageInputUpload.svelte'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte' import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte' import Header from '$lib/components/ui/layout/pages/Header.svelte'
import SectionTitle from '$lib/components/ui/SectionTitle.svelte' import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import { t } from '$lib/i18n/translations.js' import { t } from '$lib/i18n/translations.js'
import { getClient, site } from '$lib/lemmy.svelte.js' import { getClient, site } from '$lib/lemmy.svelte.js'
import { uploadImage } from '$lib/util.svelte.js'
import type { SaveUserSettings } from 'lemmy-js-client' import type { SaveUserSettings } from 'lemmy-js-client'
import { import {
Badge, Badge,
Button, Button,
ImageInput,
Material, Material,
Menu, Menu,
MenuButton, MenuButton,
@@ -20,7 +19,6 @@
} from 'mono-svelte' } from 'mono-svelte'
import { Icon, Plus } from 'svelte-hero-icons' import { Icon, Plus } from 'svelte-hero-icons'
import type { PageData } from './$types' import type { PageData } from './$types'
import ImageInputUpload from '$lib/components/form/ImageInputUpload.svelte'
interface Props { interface Props {
inline?: boolean inline?: boolean
@@ -110,6 +108,9 @@
<Switch bind:checked={formData.show_bot_accounts}> <Switch bind:checked={formData.show_bot_accounts}>
{$t('form.profile.showBots')} {$t('form.profile.showBots')}
</Switch> </Switch>
<Switch bind:checked={formData.show_read_posts}>
{$t('form.profile.showRead')}
</Switch>
<div class="space-y-1"> <div class="space-y-1">
<SectionTitle id="languages"> <SectionTitle id="languages">
{$t('form.profile.languages.title')} {$t('form.profile.languages.title')}
+6 -17
View File
@@ -1,8 +1,6 @@
<script> <script>
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte' import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
import { t } from '$lib/i18n/translations' import { t } from '$lib/i18n/translations'
import { site } from '$lib/lemmy.svelte'
import { feature } from '$lib/version'
import { Button, Menu, MenuButton } from 'mono-svelte' import { Button, Menu, MenuButton } from 'mono-svelte'
import { import {
ArrowDown, ArrowDown,
@@ -28,10 +26,6 @@
<div class="flex flex-row justify-between"> <div class="flex flex-row justify-between">
<Tabs <Tabs
routes={[ routes={[
{
href: '/profile',
name: $t('profile.profile'),
},
{ {
href: '/profile/user', href: '/profile/user',
name: $t('routes.profile.submissions'), name: $t('routes.profile.submissions'),
@@ -52,21 +46,16 @@
name: $t('routes.profile.credentials'), name: $t('routes.profile.credentials'),
}, },
]} ]}
/> >
{#if feature('mediaAndVotes', site.data?.version)}
<Menu class="flex-1" placement="bottom-end"> <Menu class="flex-1" placement="bottom-end">
{#snippet target()} {#snippet target()}
<Button <Button
title={$t('post.actions.more.label')} aria-label={$t('post.actions.more.label')}
size="square-lg" size="square-sm"
rounding="pill"
color="none" color="none"
class="bg-white/60 dark:bg-zinc-800/60 class="z-0 text-slate-600 dark:text-zinc-500 hover:bg-slate-100 hover:dark:bg-zinc-800"
border border-slate-200/60 dark:border-zinc-800
backdrop-blur-xl shadow-xl hover:bg-slate-100 dark:hover:bg-zinc-800
shrink-0"
> >
<Icon src={EllipsisHorizontal} size="16" mini /> <Icon src={EllipsisHorizontal} size="16" micro />
</Button> </Button>
{/snippet} {/snippet}
<MenuButton href="/profile/media"> <MenuButton href="/profile/media">
@@ -88,7 +77,7 @@
{$t('routes.profile.downvoted')} {$t('routes.profile.downvoted')}
</MenuButton> </MenuButton>
</Menu> </Menu>
{/if} </Tabs>
</div> </div>
{@render children?.()} {@render children?.()}
</div> </div>
-8
View File
@@ -1,8 +0,0 @@
<script lang="ts">
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { t } from '$lib/i18n/translations.js'
</script>
<Header pageHeader>
{$t('profile.profile')}
</Header>
+5
View File
@@ -0,0 +1,5 @@
import { redirect } from '@sveltejs/kit'
export function load() {
redirect(302, '/profile/user')
}
+2 -3
View File
@@ -6,7 +6,6 @@
{#if data.user && data.sort && data.type && data.page} {#if data.user && data.sort && data.type && data.page}
<UserPage <UserPage
inline
data={{ data={{
items: new ReactiveState(data.user.submissions), items: new ReactiveState(data.user.submissions),
filters: new ReactiveState({ filters: new ReactiveState({
@@ -14,8 +13,8 @@
sort: data.sort, sort: data.sort,
type: data.type, type: data.type,
}), }),
person_view: {value: data.user.person_view}, person_view: { value: data.user.person_view },
moderates: {value: data.user.moderates}, moderates: { value: data.user.moderates },
}} }}
/> />
{:else} {:else}
+4 -16
View File
@@ -3,6 +3,7 @@
import { page } from '$app/state' import { page } from '$app/state'
import { profile } from '$lib/auth.svelte.js' import { profile } from '$lib/auth.svelte.js'
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte' import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
import Sort from '$lib/components/lemmy/dropdowns/Sort.svelte'
import ItemList from '$lib/components/lemmy/generic/ItemList.svelte' import ItemList from '$lib/components/lemmy/generic/ItemList.svelte'
import { ban, isAdmin } from '$lib/components/lemmy/moderation/moderation.js' import { ban, isAdmin } from '$lib/components/lemmy/moderation/moderation.js'
import ShieldIcon from '$lib/components/lemmy/moderation/ShieldIcon.svelte' import ShieldIcon from '$lib/components/lemmy/moderation/ShieldIcon.svelte'
@@ -34,7 +35,6 @@
import { import {
AdjustmentsHorizontal, AdjustmentsHorizontal,
AtSymbol, AtSymbol,
ChartBar,
EllipsisHorizontal, EllipsisHorizontal,
Envelope, Envelope,
Fire, Fire,
@@ -330,22 +330,10 @@
<Option value="posts">{$t('content.posts')}</Option> <Option value="posts">{$t('content.posts')}</Option>
<Option value="comments">{$t('content.comments')}</Option> <Option value="comments">{$t('content.comments')}</Option>
</Select> </Select>
<Select <Sort
bind:value={data.filters.value.sort} bind:selected={data.filters.value.sort}
name="sort"
onchange={() => sortForm?.requestSubmit()} onchange={() => sortForm?.requestSubmit()}
> />
{#snippet customLabel()}
<span class="flex items-center gap-1">
<Icon src={ChartBar} size="14" mini />
{$t('filter.sort.label')}
</span>
{/snippet}
<Option value="New">{$t('filter.sort.new')}</Option>
<Option value="TopAll">{$t('filter.sort.top.label')}</Option>
<Option value="Old">{$t('filter.sort.old')}</Option>
<Option value="Controversial">{$t('filter.sort.controversial')}</Option>
</Select>
</form> </form>
{#if data.items.value.length == 0} {#if data.items.value.length == 0}
<Placeholder <Placeholder