design: improve entityheader design

This commit is contained in:
Xylight committed 2024-09-08 14:48:03 -07:00
1 parent 23834137a7
commit 53ec967dce
8 files changed
+198 -141

No files matched your search

@@ -68,8 +68,8 @@
</button>
{#if moderators.length > 0}
<Expandable
bind:open={$userSettings.expand.team}
class="py-2 border-y border-slate-200 dark:border-zinc-800"
class="border rounded-xl bg-white/50 dark:bg-zinc-900/50 w-full p-3 px-4
dark:border-zinc-800 border-slate-300 border-opacity-50 text-slate-700 dark:text-zinc-300 transition-colors"
>
<svelte:fragment slot="title">
<ShieldIcon width={15} filled />
@@ -166,6 +166,7 @@
body={post.post.body}
{view}
style="grid-area: body"
class="relative"
/>
{/if}
{#if actions}
@@ -47,9 +47,9 @@ ${view == 'list' ? `max-h-24` : 'max-h-48'}`
on:click={() => (expanded = !expanded)}
size="square-sm"
color="tertiary"
class="text-black dark:text-white absolute z-10 isolate drop-shadow-xl pointer-events-auto {expanded
? 'bottom-6'
: 'bottom-16'} left-1/2 -translate-x-1/2"
class="text-black dark:text-white absolute z-10 isolate pointer-events-auto bottom-0 {expanded
? 'bg-slate-200/50 dark:bg-zinc-900 border shadow-md'
: ''} left-1/2 -translate-x-1/2 mb-4"
title="Expand"
>
<Icon
@@ -102,8 +102,6 @@
}
let popoverOpen = false
$: console.log(popoverOpen)
</script>
<!--
+49 -17
View File
@@ -4,6 +4,7 @@
import PostBody from '../lemmy/post/PostBody.svelte'
import LabelStat from './LabelStat.svelte'
import { optimizeImageURL } from '../lemmy/post/helpers'
import FormattedNumber from '../util/FormattedNumber.svelte'
export let avatar: string | undefined = undefined
export let name: string
@@ -13,7 +14,10 @@
export let stats: {
name: string
value: string
format?: boolean
}[] = []
export let center: boolean = false
</script>
<Material
@@ -23,11 +27,12 @@
class="z-10 relative border-slate-200 dark:border-zinc-700"
{...$$restProps}
>
{#if banner}
{#if banner || avatar}
<div class="max-h-36 overflow-visible">
<img
src={banner}
class="w-full object-cover h-48 rounded-xl bg-white dark:bg-zinc-900"
src={banner ?? avatar}
class="w-full object-cover h-48 rounded-t-xl bg-white dark:bg-zinc-900 banner-mask"
class:blur-3xl={!banner}
height="192"
alt="User banner"
/>
@@ -37,41 +42,46 @@
overflow-hidden"
>
<img
src={optimizeImageURL(banner, 64)}
src={optimizeImageURL(banner ?? avatar ?? '', 64)}
alt=""
class="opacity-10 blur-2xl h-full w-full saturate-200"
/>
</div>
{/if}
<div class="p-4 flex flex-col sm:flex-row gap-4">
<div class="space-y-3 flex-1">
<div class="p-4 flex flex-col sm:flex-row gap-4 items">
<div class="space-y-3 flex-1 flex flex-col items-center text-center">
<Avatar
width={64}
url={avatar}
alt={name}
class="ring-4 ring-slate-25 dark:ring-zinc-925 bg-slate-25 dark:bg-zinc-925"
class=" ring-slate-25 dark:ring-zinc-925 bg-slate-25 dark:bg-zinc-925"
/>
<div>
<div class="flex flex-col items-center">
<svelte:element
this={url ? 'a' : 'span'}
href={url}
class="text-lg font-medium {url
class="text-xl font-semibold {url
? 'hover:underline hover:text-primary-900 hover:dark:text-primary-100'
: ''}"
>
{name}
</svelte:element>
<span
class="flex items-center gap-0 text-sm text-slate-600 dark:text-zinc-400"
class="flex items-center gap-0 text-sm text-slate-600 dark:text-zinc-400 max-w-full w-max"
>
<slot name="nameDetail" />
</span>
</div>
<div class="relative">
{#if bio}
<PostBody class="text-sm" view="list" body={bio} clickThrough />
{/if}
</div>
{#if bio}
<div class="relative {center ? 'text-center' : 'text-left'}">
<div
class="p-4 relative bg-white/50 dark:bg-zinc-900/50 border border-slate-300 dark:border-zinc-800 border-opacity-50
rounded-xl"
>
<PostBody class="text-sm" view="list" body={bio} clickThrough />
</div>
</div>
{/if}
</div>
{#if $$slots.actions}
<div class="space-y-3 flex flex-col" class:sm:pt-12={banner != undefined}>
@@ -81,12 +91,34 @@
</div>
<div class="space-y-3 p-4 pt-0">
{#if stats.length > 0}
<div class="text-sm flex flex-row flex-wrap gap-3">
<div class="text-sm flex flex-row flex-wrap gap-3 mx-auto">
{#each stats as stat}
<LabelStat content={stat.value} formatted label={stat.name} />
<div
class="p-3 px-4 rounded-xl flex-1 bg-white/50 dark:bg-zinc-900/50 border border-slate-300 dark:border-zinc-800 border-opacity-50"
>
<div class="text-primary-900 dark:text-primary-100">
{stat.name}
</div>
<div class="text-xl font-semibold">
{#if stat.format ?? true}
<FormattedNumber
number={Number(stat.value)}
options={{ notation: 'standard' }}
/>
{:else}
{stat.value}
{/if}
</div>
</div>
{/each}
</div>
{/if}
<slot />
</div>
</Material>
<style>
.banner-mask {
mask-image: linear-gradient(to bottom, rgba(0, 0, 0, 1), rgba(0, 0, 0, 0));
}
</style>
+30 -23
View File
@@ -1,24 +1,10 @@
<script lang="ts">
import { locale } from '$lib/translations'
export let date: Date
export let relativeTo: Date | undefined = undefined
export let options: Intl.RelativeTimeFormatOptions = {
numeric: 'always',
style: 'narrow',
}
const toLocaleDateString = (date: Date): string => {
try {
return date.toLocaleString()
} catch (err) {
return 'Invalid Date'
}
}
$: dateTime = toLocaleDateString(date)
function formatRelativeDate(date: Date) {
<script lang="ts" context="module">
export function formatRelativeDate(
date: Date,
options: Intl.RelativeTimeFormatOptions,
locale?: string,
relativeTo?: Date
) {
try {
const now = relativeTo?.getTime() ?? Date.now()
@@ -38,7 +24,7 @@
if (diffInMillis >= thresholds[i].threshold) {
const value = Math.round(diffInMillis / thresholds[i].threshold)
let language = $locale
let language = locale ?? 'en'
const rtf = new Intl.RelativeTimeFormat(language, options)
@@ -52,11 +38,32 @@
}
</script>
<script lang="ts">
import { locale } from '$lib/translations'
export let date: Date
export let relativeTo: Date | undefined = undefined
export let options: Intl.RelativeTimeFormatOptions = {
numeric: 'always',
style: 'narrow',
}
const toLocaleDateString = (date: Date): string => {
try {
return date.toLocaleString()
} catch (err) {
return 'Invalid Date'
}
}
$: dateTime = toLocaleDateString(date)
</script>
<time
datetime={dateTime}
title={dateTime}
class={$$props.class ?? ''}
style={$$props.style ?? ''}
>
{formatRelativeDate(date)}
{formatRelativeDate(date, options, $locale, relativeTo)}
</time>
+3
View File
@@ -859,5 +859,8 @@
"upvotes": "{{default}} upvotes",
"downvotes": "{{default}} downvotes"
}
},
"stats": {
"joined": "Joined"
}
}
+110 -94
View File
@@ -34,6 +34,8 @@
import ItemList from '$lib/components/lemmy/generic/ItemList.svelte'
import { t } from '$lib/translations.js'
import EntityHeader from '$lib/components/ui/EntityHeader.svelte'
import { publishedToDate } from '$lib/components/util/date.js'
import { formatRelativeDate } from '$lib/components/util/RelativeDate.svelte'
export let data
@@ -142,113 +144,127 @@
{/if}
<div class="flex flex-col gap-4 max-w-full w-full">
<EntityHeader
avatar={data.person_view.person.avatar}
name={data.person_view.person.display_name || data.person_view.person.name}
banner={data.person_view.person.banner}
bio={data.person_view.person.bio}
stats={[
{
name: $t('content.posts'),
value: data.person_view.counts.post_count.toString(),
},
{
name: $t('content.comments'),
value: data.person_view.counts.comment_count.toString(),
},
]}
>
<span class="text-sm flex gap-0 items-center" slot="nameDetail">
@
<UserLink
showInstance
user={data.person_view.person}
displayName={false}
class="font-normal"
/>
</span>
{#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,
}))}
<div class="">
<EntityHeader
avatar={data.person_view.person.avatar}
name={data.person_view.person.display_name ||
data.person_view.person.name}
banner={data.person_view.person.banner}
bio={data.person_view.person.bio}
stats={[
{
name: $t('content.posts'),
value: data.person_view.counts.post_count.toString(),
},
{
name: $t('content.comments'),
value: data.person_view.counts.comment_count.toString(),
},
{
name: $t('stats.joined'),
value: formatRelativeDate(
publishedToDate(data.person_view.person.published),
{ style: 'long' }
).toString(),
format: false,
},
]}
>
<span class="text-sm flex gap-0 items-center w-max" slot="nameDetail">
@
<UserLink
showInstance
user={data.person_view.person}
displayName={false}
class="font-normal"
/>
</Expandable>
{/if}
<svelte:fragment slot="actions">
{#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
size="square-md"
color="secondary"
href="/inbox/messages/{data.person_view.person.id}"
title="Message"
>
<Icon slot="prefix" solid size="16" src={Envelope} />
</Button>
{#if data.person_view.person.matrix_user_id}
</span>
{#if (data.moderates ?? []).length > 0}
<Expandable
class="border rounded-xl bg-white/50 dark:bg-zinc-900/50 w-full p-3 px-4
dark:border-zinc-800 border-slate-300 border-opacity-50 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}
<svelte:fragment slot="actions">
{#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
size="square-md"
color="secondary"
href="https://matrix.to/#/{data.person_view.person
.matrix_user_id}"
title="Matrix User"
href="/inbox/messages/{data.person_view.person.id}"
title="Message"
>
<Icon slot="prefix" solid size="16" src={AtSymbol} />
<Icon slot="prefix" solid size="16" src={Envelope} />
</Button>
{/if}
{#if isAdmin($profile?.user)}
<Menu class="ml-auto" placement="bottom-end">
{#if data.person_view.person.matrix_user_id}
<Button
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-end">
<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-end">
<Button size="square-md" slot="target">
<ShieldIcon width={16} filled />
<Icon src={EllipsisHorizontal} slot="prefix" size="16" mini />
</Button>
<MenuButton
color="danger-subtle"
on:click={() =>
ban(data.person_view.person.banned, data.person_view.person)}
on:click={() => blockUser(data.person_view.person.id)}
>
<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
<Icon slot="prefix" mini size="16" src={NoSymbol} />
{isBlocked($profile.user, data.person_view.person.id)
? 'Unblock'
: 'Block'}
</MenuButton>
</Menu>
{/if}
<Menu placement="bottom-end">
<Button size="square-md" slot="target">
<Icon src={EllipsisHorizontal} slot="prefix" size="16" mini />
</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}
</svelte:fragment>
</EntityHeader>
</div>
{/if}
</svelte:fragment>
</EntityHeader>
</div>
<div class="flex flex-col gap-4 max-w-full w-full min-w-0">
<div class="flex flex-row gap-4 flex-wrap">