design: redesign user pages

This commit is contained in:
Xylight committed 2024-07-18 18:55:21 -07:00
1 parent 5e9ea24709
commit cc0a7e2869
4 files changed
+149 -124

No files matched your search

@@ -6,6 +6,7 @@
export let body: string export let body: string
export let view: View = 'cozy' export let view: View = 'cozy'
export let clickThrough = false
let expanded = false let expanded = false
let element: Element let element: Element
@@ -31,8 +32,8 @@
bg-gradient-to-b text-transparent from-slate-600 via-slate-600 bg-gradient-to-b text-transparent from-slate-600 via-slate-600
dark:from-zinc-400 dark:via-zinc-400 bg-clip-text z-0 dark:from-zinc-400 dark:via-zinc-400 bg-clip-text z-0
${view == 'list' ? `max-h-24` : 'max-h-48'}` ${view == 'list' ? `max-h-24` : 'max-h-48'}`
: 'text-slate-600 dark:text-zinc-400 max-h-full'} pointer-events-none {$$props.class ?? : 'text-slate-600 dark:text-zinc-400 max-h-full'} {$$props.class ?? ''}"
''}" class:pointer-events-none={!clickThrough}
bind:this={element} bind:this={element}
> >
<Markdown inline={!expanded} source={body} /> <Markdown inline={!expanded} source={body} />
@@ -13,6 +13,7 @@
export let showInstance: boolean = export let showInstance: boolean =
$userSettings.showInstances.user || $userSettings.showInstances.user ||
($userSettings.showInstances.comments && inComment) ($userSettings.showInstances.comments && inComment)
export let displayName = $userSettings.displayNames
</script> </script>
<a <a
@@ -34,7 +35,7 @@
class:ml-0.5={avatar} class:ml-0.5={avatar}
> >
<span class:font-medium={showInstance} class="username-text"> <span class:font-medium={showInstance} class="username-text">
{$userSettings.displayNames ? user.display_name || user.name : user.name} {displayName ? user.display_name || user.name : user.name}
</span> </span>
{#if showInstance} {#if showInstance}
<span <span
+2 -2
View File
@@ -3,7 +3,7 @@
import { createAvatar } from '@dicebear/core' import { createAvatar } from '@dicebear/core'
import * as initials from '@dicebear/initials' import * as initials from '@dicebear/initials'
const sizes = [16, 32, 48, 64, 128, 256, 512] const sizes = [16, 24, 32, 48, 64, 96, 128, 256, 512]
export let url: string | undefined export let url: string | undefined
export let alt: string = '' export let alt: string = ''
@@ -21,7 +21,7 @@
urlObj.searchParams.append('format', 'webp') urlObj.searchParams.append('format', 'webp')
urlObj.searchParams.append( urlObj.searchParams.append(
'thumbnail', 'thumbnail',
findClosestNumber(sizes, res || width).toString() findClosestNumber(sizes, (res || width) * 1.5).toString(),
) )
return urlObj.toString() return urlObj.toString()
+142 -119
View File
@@ -28,7 +28,14 @@
import { isCommentView } from '$lib/lemmy/item.js' import { isCommentView } from '$lib/lemmy/item.js'
import { client, getClient } from '$lib/lemmy.js' import { client, getClient } from '$lib/lemmy.js'
import { isBlocked } from '$lib/lemmy/user.js' import { isBlocked } from '$lib/lemmy/user.js'
import { Menu, MenuButton, Popover, removeToast, toast } from 'mono-svelte' import {
Material,
Menu,
MenuButton,
Popover,
removeToast,
toast,
} from 'mono-svelte'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte' import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import { profile } from '$lib/auth.js' import { profile } from '$lib/auth.js'
import { ban, isAdmin } from '$lib/components/lemmy/moderation/moderation.js' import { ban, isAdmin } from '$lib/components/lemmy/moderation/moderation.js'
@@ -152,142 +159,146 @@
</Modal> </Modal>
{/if} {/if}
{#if data.person_view.person.banner}
<img
src={data.person_view.person.banner}
class="absolute top-0 right-0 object-cover w-full h-40 banner -z-10"
alt="User banner"
/>
{/if}
<div class="flex flex-col gap-4 max-w-full w-full"> <div class="flex flex-col gap-4 max-w-full w-full">
<div class="flex flex-col gap-4"> <Material class="flex flex-col gap-4" color="transparent" padding="none">
<Avatar {#if data.person_view.person.banner}
width={64} <div class="max-h-32 overflow-visible">
url={data.person_view.person.avatar} <img
alt={data.person_view.person.name} src={data.person_view.person.banner}
/> class="w-full object-cover h-max max-h-48 rounded-lg"
<UserLink height="192"
badges alt="User banner"
user={data.person_view.person}
showInstance
class="text-base"
instanceClass="text-sm"
/>
<div class="relative">
{#if data.person_view.person.bio}
<PostBody
class="text-sm"
view="list"
body={data.person_view.person.bio}
/> />
{/if} </div>
</div>
<div class="text-sm flex flex-row flex-wrap gap-3">
<LabelStat
content={data.person_view.counts.post_count.toString()}
formatted
label={$t('content.posts')}
/>
<LabelStat
content={data.person_view.counts.comment_count.toString()}
formatted
label={$t('content.comments')}
/>
</div>
{#if (data.moderates ?? []).length > 0}
<Expandable
class="border-y w-full py-3
dark:border-zinc-800 text-slate-700 dark:text-zinc-300 transition-colors"
>
<span slot="title" class="flex items-center gap-1">
<ShieldIcon width={14} filled />
{$t('routes.profile.moderates')}
</span>
<ItemList
items={data.moderates.map((m) => ({
id: m.community.id,
name: m.community.title,
url: communityLink(m.community),
avatar: m.community.icon,
instance: new URL(m.community.actor_id).hostname,
}))}
/>
</Expandable>
{/if} {/if}
{#if $profile?.user && $profile.jwt && data.person_view.person.id != $profile.user.local_user_view.person.id} <div class="p-4 flex flex-col gap-3">
<div class="flex items-center gap-2 w-full"> <Avatar
<Button width={64}
size="square-md" url={data.person_view.person.avatar}
color="secondary" alt={data.person_view.person.name}
on:click={() => (messaging = true)} class="ring-4 ring-slate-25 dark:ring-zinc-925"
title="Message" />
<div class="space-y-1">
<span class="text-lg font-semibold">
{data.person_view.person.display_name || data.person_view.person.name}
</span>
<span
class="flex items-center gap-0 text-sm text-slate-600 dark:text-zinc-400"
> >
<Icon slot="prefix" solid size="16" src={Envelope} /> @
</Button> <UserLink
{#if data.person_view.person.matrix_user_id} showInstance
user={data.person_view.person}
displayName={false}
/>
</span>
</div>
<div class="relative">
{#if data.person_view.person.bio}
<PostBody
class="text-sm"
view="list"
body={data.person_view.person.bio}
clickThrough
/>
{/if}
</div>
<div class="text-sm flex flex-row flex-wrap gap-3">
<LabelStat
content={data.person_view.counts.post_count.toString()}
formatted
label={$t('content.posts')}
/>
<LabelStat
content={data.person_view.counts.comment_count.toString()}
formatted
label={$t('content.comments')}
/>
</div>
{#if (data.moderates ?? []).length > 0}
<Expandable
class="border-y w-full py-3
dark:border-zinc-800 text-slate-700 dark:text-zinc-300 transition-colors"
>
<span slot="title" class="flex items-center gap-1">
<ShieldIcon width={14} filled />
{$t('routes.profile.moderates')}
</span>
<ItemList
items={data.moderates.map((m) => ({
id: m.community.id,
name: m.community.title,
url: communityLink(m.community),
avatar: m.community.icon,
instance: new URL(m.community.actor_id).hostname,
}))}
/>
</Expandable>
{/if}
{#if $profile?.user && $profile.jwt && data.person_view.person.id != $profile.user.local_user_view.person.id}
<div class="flex items-center gap-2 w-full">
<Button <Button
size="square-md" size="square-md"
color="secondary" color="secondary"
href="https://matrix.to/#/{data.person_view.person.matrix_user_id}" on:click={() => (messaging = true)}
title="Matrix User" title="Message"
> >
<Icon slot="prefix" solid size="16" src={AtSymbol} /> <Icon slot="prefix" solid size="16" src={Envelope} />
</Button> </Button>
{/if} {#if data.person_view.person.matrix_user_id}
{#if isAdmin($profile?.user)} <Button
<Menu class="ml-auto" placement="bottom-start"> size="square-md"
color="secondary"
href="https://matrix.to/#/{data.person_view.person
.matrix_user_id}"
title="Matrix User"
>
<Icon slot="prefix" solid size="16" src={AtSymbol} />
</Button>
{/if}
{#if isAdmin($profile?.user)}
<Menu class="ml-auto" placement="bottom-start">
<Button size="square-md" slot="target">
<ShieldIcon width={16} filled />
</Button>
<MenuButton
color="danger-subtle"
on:click={() =>
ban(data.person_view.person.banned, data.person_view.person)}
>
<Icon slot="prefix" mini size="16" src={ShieldExclamation} />
{data.person_view.person.banned ? 'Unban' : 'Ban'}
</MenuButton>
<MenuButton
color="danger-subtle"
on:click={() => (purgingUser = !purgingUser)}
>
<Icon slot="prefix" mini size="16" src={Fire} />
Purge
</MenuButton>
</Menu>
{/if}
<Menu placement="bottom-start">
<Button size="square-md" slot="target"> <Button size="square-md" slot="target">
<ShieldIcon width={16} filled /> <Icon src={EllipsisHorizontal} slot="prefix" size="16" mini />
</Button> </Button>
<MenuButton <MenuButton
color="danger-subtle" color="danger-subtle"
on:click={() => on:click={() => blockUser(data.person_view.person.id)}
ban(data.person_view.person.banned, data.person_view.person)}
> >
<Icon slot="prefix" mini size="16" src={ShieldExclamation} /> <Icon slot="prefix" mini size="16" src={NoSymbol} />
{data.person_view.person.banned ? 'Unban' : 'Ban'} {isBlocked($profile.user, data.person_view.person.id)
</MenuButton> ? 'Unblock'
<MenuButton : 'Block'}
color="danger-subtle"
on:click={() => (purgingUser = !purgingUser)}
>
<Icon slot="prefix" mini size="16" src={Fire} />
Purge
</MenuButton> </MenuButton>
</Menu> </Menu>
{/if} </div>
<Menu placement="bottom-start"> {/if}
<Button size="square-md" slot="target"> </div>
<Icon src={EllipsisHorizontal} slot="prefix" size="16" mini /> </Material>
</Button>
<MenuButton
color="danger-subtle"
on:click={() => blockUser(data.person_view.person.id)}
>
<Icon slot="prefix" mini size="16" src={NoSymbol} />
{isBlocked($profile.user, data.person_view.person.id)
? 'Unblock'
: 'Block'}
</MenuButton>
</Menu>
</div>
{/if}
</div>
<div class="flex flex-col gap-4 max-w-full w-full min-w-0"> <div class="flex flex-col gap-4 max-w-full w-full min-w-0">
<div class="flex flex-row gap-4 flex-wrap justify-between"> <div class="flex flex-row gap-4 flex-wrap">
<Select
bind:value={data.sort}
on:change={() => searchParam($page.url, 'sort', data.sort, 'page')}
>
<span slot="label" class="flex items-center gap-1">
<Icon src={ChartBar} size="14" mini />
{$t('filter.sort.label')}
</span>
<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>
</Select>
<Select <Select
bind:value={data.type} bind:value={data.type}
on:change={() => searchParam($page.url, 'type', data.type, 'page')} on:change={() => searchParam($page.url, 'type', data.type, 'page')}
@@ -300,6 +311,18 @@
<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
bind:value={data.sort}
on:change={() => searchParam($page.url, 'sort', data.sort, 'page')}
>
<span slot="label" class="flex items-center gap-1">
<Icon src={ChartBar} size="14" mini />
{$t('filter.sort.label')}
</span>
<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>
</Select>
</div> </div>
{#if data.items.length == 0} {#if data.items.length == 0}
<Placeholder <Placeholder