design: redesign inbox (again)

This commit is contained in:
Xylight committed 2024-10-19 14:27:36 -07:00
1 parent 0d378ec248
commit 0d0681b687
13 files changed
+361 -281

No files matched your search

+74 -70
View File
@@ -31,7 +31,9 @@
export let node: CommentNodeI export let node: CommentNodeI
export let postId: number export let postId: number
export let op: boolean = false export let op: boolean = false
export let actions: boolean = true export let actions: boolean = true
export let meta: boolean = true
export let open = true export let open = true
export let replying = false export let replying = false
@@ -109,81 +111,83 @@
: ''} {highlight} {$$props.class}" : ''} {highlight} {$$props.class}"
id={node.comment_view.comment.id.toString()} id={node.comment_view.comment.id.toString()}
> >
<button {#if meta}
on:click={() => (open = !open)} <button
class="flex flex-row cursor-pointer gap-2 items-center group text-[13px] flex-wrap w-full on:click={() => (open = !open)}
class="flex flex-row cursor-pointer gap-2 items-center group text-[13px] flex-wrap w-full
z-0 group relative" z-0 group relative"
>
<div
class="absolute opacity-0 -z-10 inset-0 group-hover:block group-hover:opacity-100
bg-slate-100 dark:bg-zinc-900 group-hover:-inset-1 group-hover:-inset-x-2 rounded-full transition-all
"
> >
<div <div
class="h-full flex items-center justify-center gap-1 ml-auto w-max mr-2" class="absolute opacity-0 -z-10 inset-0 group-hover:block group-hover:opacity-100
bg-slate-100 dark:bg-zinc-900 group-hover:-inset-1 group-hover:-inset-x-2 rounded-full transition-all
"
> >
{#if node.children.length > 0} <div
<FormattedNumber number={node.comment_view.counts.child_count} class="h-full flex items-center justify-center gap-1 ml-auto w-max mr-2"
></FormattedNumber> >
{/if} {#if node.children.length > 0}
<Icon <FormattedNumber number={node.comment_view.counts.child_count}
src={open ? Minus : Plus} ></FormattedNumber>
size="16" {/if}
micro <Icon
class="transition-transform duration-[400ms] ease-out {open src={open ? Minus : Plus}
? '' size="16"
: 'rotate-90'} text-primary-900 dark:text-primary-100" micro
/> class="transition-transform duration-[400ms] ease-out {open
? ''
: 'rotate-90'} text-primary-900 dark:text-primary-100"
/>
</div>
</div> </div>
</div> <span class:font-bold={op} class="flex flex-row gap-1 items-center">
<span class:font-bold={op} class="flex flex-row gap-1 items-center"> <UserLink
<UserLink inComment
inComment avatarSize={22}
avatarSize={22} avatar
avatar user={node.comment_view.creator}
user={node.comment_view.creator} >
> <svelte:fragment slot="badges">
<svelte:fragment slot="badges"> {#if node.comment_view.creator_is_moderator}
{#if node.comment_view.creator_is_moderator} <ShieldIcon filled width={14} class="text-green-500" />
<ShieldIcon filled width={14} class="text-green-500" /> {/if}
{/if} {#if node.comment_view.creator_is_admin}
{#if node.comment_view.creator_is_admin} <ShieldIcon filled width={14} class="text-red-500" />
<ShieldIcon filled width={14} class="text-red-500" /> {/if}
{/if} </svelte:fragment>
</svelte:fragment> </UserLink>
</UserLink> {#if op}
{#if op} <Icon mini size="16" src={Microphone} class="text-sky-600" />
<Icon mini size="16" src={Microphone} class="text-sky-600" /> {/if}
{/if} </span>
</span> <RelativeDate
<RelativeDate class="text-slate-600 dark:text-zinc-400"
class="text-slate-600 dark:text-zinc-400" date={publishedToDate(node.comment_view.comment.published)}
date={publishedToDate(node.comment_view.comment.published)} />
/> <span class="text-slate-600 dark:text-zinc-400 flex flex-row gap-2 ml-1">
<span class="text-slate-600 dark:text-zinc-400 flex flex-row gap-2 ml-1"> {#if node.comment_view.comment.updated}
{#if node.comment_view.comment.updated} <Icon src={Pencil} solid size="12" title="Edited" />
<Icon src={Pencil} solid size="12" title="Edited" /> {/if}
{/if} {#if node.comment_view.comment.deleted || node.comment_view.comment.removed}
{#if node.comment_view.comment.deleted || node.comment_view.comment.removed} <Icon
<Icon src={Trash}
src={Trash} solid
solid size="12"
size="12" title={$t('post.badges.deleted')}
title={$t('post.badges.deleted')} class="text-red-600 dark:text-red-500"
class="text-red-600 dark:text-red-500" />
/> {/if}
{/if} {#if node.comment_view.saved}
{#if node.comment_view.saved} <Icon
<Icon src={Bookmark}
src={Bookmark} solid
solid size="12"
size="12" title={$t('post.badges.saved')}
title={$t('post.badges.saved')} class="text-yellow-600 dark:text-yellow-500"
class="text-yellow-600 dark:text-yellow-500" />
/> {/if}
{/if} </span>
</span> </button>
</button> {/if}
{#if open} {#if open}
<div transition:slide={{ duration: 400, easing: expoOut }}> <div transition:slide={{ duration: 400, easing: expoOut }}>
<div <div
@@ -10,6 +10,7 @@
import { Button } from 'mono-svelte' import { Button } from 'mono-svelte'
import { t } from '$lib/translations' import { t } from '$lib/translations'
import { errorMessage } from '$lib/lemmy/error' import { errorMessage } from '$lib/lemmy/error'
import { Icon, XMark } from 'svelte-hero-icons'
export let postId: number export let postId: number
export let parentId: number | undefined = undefined export let parentId: number | undefined = undefined
@@ -90,20 +91,21 @@
<div class="flex-1" /> <div class="flex-1" />
{#if actions} {#if actions}
<Button <Button
size="custom"
title={$t('common.cancel')}
on:click={() => dispatch('cancel', true)} on:click={() => dispatch('cancel', true)}
color="tertiary" color="tertiary"
size="lg" class="w-8 h-8"
class=" w-28" rounding="xl"
> >
{$t('common.cancel')} <Icon src={XMark} size="16" micro />
</Button> </Button>
<Button <Button
on:click={submit} on:click={submit}
color="primary" color="primary"
size="lg"
class=" w-28"
{loading} {loading}
disabled={locked || loading || banned} disabled={locked || loading || banned}
size="lg"
> >
{$t('form.submit')} {$t('form.submit')}
</Button> </Button>
@@ -12,51 +12,61 @@
export let comment: CommentView export let comment: CommentView
export let view = $userSettings.view export let view = $userSettings.view
export let community = false export let community = false
export let meta: boolean = true
</script> </script>
<Material <Material
class="flex flex-col flex-1 {view != 'card' class="flex flex-col flex-1 {view != 'card'
? '!bg-transparent !border-0 rounded-none' ? '!bg-transparent !border-0 rounded-none'
: 'p-5'} {view == 'list' ? 'py-5' : view == 'compact' ? 'py-4' : 'py-5'}" : 'p-5'} {view == 'list'
? 'py-5'
: view == 'compact'
? 'py-4'
: 'py-5'} {$$props.class}"
color="distinct" color="distinct"
padding="none" padding="none"
> >
<div class="flex flex-row justify-between items-center gap-2"> {#if meta}
<div class="flex flex-col gap-2"> <div class="flex flex-row justify-between items-center gap-2">
<PostMeta <div class="flex flex-col gap-2">
badges={{ <PostMeta
nsfw: comment.post.nsfw, badges={{
removed: comment.post.removed, nsfw: comment.post.nsfw,
admin: false, removed: comment.post.removed,
moderator: false, admin: false,
saved: false, moderator: false,
deleted: comment.post.deleted, saved: false,
featured: deleted: comment.post.deleted,
comment.post.featured_community || comment.post.featured_local, featured:
locked: comment.post.locked, comment.post.featured_community || comment.post.featured_local,
}} locked: comment.post.locked,
published={publishedToDate(comment.comment.published)} }}
community={community ? comment.community : undefined} published={publishedToDate(comment.comment.published)}
title={comment.post.name} community={community ? comment.community : undefined}
id={comment.post.id} title={comment.post.name}
titleClass="text-sm" id={comment.post.id}
/> titleClass="text-sm"
/>
</div>
<Button
color="primary"
href="/post/{comment.post.id}?thread={comment.comment.path}#{comment
.comment.id}"
class="self-start"
>
{$t('common.jump')}
<Icon src={ArrowUturnUp} size="16" micro />
</Button>
</div> </div>
<Button {/if}
color="primary"
href="/post/{comment.post.id}?thread={comment.comment.path}#{comment
.comment.id}"
class="self-start"
>
{$t('common.jump')}
<Icon src={ArrowUturnUp} size="16" micro />
</Button>
</div>
<div class="list-none"> <div class="list-none">
<Comment <Comment
postId={comment.post.id} postId={comment.post.id}
node={{ children: [], comment_view: comment, depth: 1 }} node={{ children: [], comment_view: comment, depth: 1, ui: {} }}
replying={false} replying={false}
{meta}
{...$$restProps}
/> />
</div> </div>
</Material> </Material>
@@ -5,26 +5,29 @@
import type { PrivateMessageView } from 'lemmy-js-client' import type { PrivateMessageView } from 'lemmy-js-client'
export let message: PrivateMessageView export let message: PrivateMessageView
export let meta: boolean = true
</script> </script>
<div class="flex flex-col gap-2" style={$$props.style ?? ''}> <div class="flex flex-col gap-2 text-sm" style={$$props.style ?? ''}>
<div class="flex flex-row gap-2 items-center flex-wrap"> {#if meta}
<span class="font-medium text-xs">From</span> <div class="flex flex-row gap-2 items-center flex-wrap">
<UserLink <span class="font-medium text-xs">From</span>
showInstance={false}
user={message.creator}
avatar
avatarSize={20}
/>
{#if $profile?.user?.local_user_view.person.id != message.recipient.id}
to
<UserLink <UserLink
showInstance={false} showInstance={false}
user={message.recipient} user={message.creator}
avatar avatar
avatarSize={20} avatarSize={20}
/> />
{/if} {#if $profile?.user?.local_user_view.person.id != message.recipient.id}
</div> to
<UserLink
showInstance={false}
user={message.recipient}
avatar
avatarSize={20}
/>
{/if}
</div>
{/if}
<Markdown source={message.private_message.content} /> <Markdown source={message.private_message.content} />
</div> </div>
@@ -381,7 +381,8 @@
data.url = url.toString() data.url = url.toString()
} catch (e) {} } catch (e) {}
}} }}
size="lg" size="sm"
rounding="pill"
> >
<Icon src={Link} size="16" micro /> <Icon src={Link} size="16" micro />
{$t('form.post.addUrl')} {$t('form.post.addUrl')}
@@ -391,14 +392,15 @@
data.url = '' data.url = ''
uploadingImage = true uploadingImage = true
}} }}
size="lg" size="sm"
rounding="pill"
> >
<Icon src={Photo} size="16" micro /> <Icon src={Photo} size="16" micro />
{$t('form.post.uploadImage')} {$t('form.post.uploadImage')}
</Button> </Button>
{/if} {/if}
{#if data.language_id === undefined} {#if data.language_id === undefined}
<Button size="lg" on:click={() => (data.language_id = 0)}> <Button size="sm" rounding="pill" on:click={() => (data.language_id = 0)}>
<Icon src={Language} size="16" micro /> <Icon src={Language} size="16" micro />
{$t('form.post.setLanguage')} {$t('form.post.setLanguage')}
</Button> </Button>
+12 -8
View File
@@ -2,6 +2,7 @@
import { Disclosure } from 'mono-svelte' import { Disclosure } from 'mono-svelte'
import { Minus, Plus, Icon } from 'svelte-hero-icons' import { Minus, Plus, Icon } from 'svelte-hero-icons'
export let open: boolean = false export let open: boolean = false
export let icon: boolean = true
</script> </script>
<Disclosure <Disclosure
@@ -16,19 +17,22 @@
<div class="flex flex-row gap-1 items-center w-full"> <div class="flex flex-row gap-1 items-center w-full">
<slot name="title" /> <slot name="title" />
</div> </div>
<Icon {#if icon}
src={open ? Minus : Plus} <Icon
size="16" src={open ? Minus : Plus}
micro size="16"
class="{open micro
? '' class="{open
: 'rotate-90'} transition-transform duration-300 ease-out" ? ''
/> : 'rotate-90'} transition-transform duration-300 ease-out"
/>
{/if}
<div <div
class="inset-0 -z-10 opacity-0 absolute bg-slate-100 dark:bg-zinc-900 rounded-full class="inset-0 -z-10 opacity-0 absolute bg-slate-100 dark:bg-zinc-900 rounded-full
group-hover:opacity-100 group-hover:-inset-1 group-hover:-inset-x-2 transition-all" group-hover:opacity-100 group-hover:-inset-1 group-hover:-inset-x-2 transition-all"
/> />
</div> </div>
<slot name="extended" slot="extended" />
<slot name="content"> <slot name="content">
<div class="pt-2 text-slate-900 dark:text-zinc-100"> <div class="pt-2 text-slate-900 dark:text-zinc-100">
<slot /> <slot />
+2 -1
View File
@@ -37,6 +37,7 @@
import CommandsWrapper from './commands/CommandsWrapper.svelte' import CommandsWrapper from './commands/CommandsWrapper.svelte'
import { optimizeImageURL } from '$lib/components/lemmy/post/helpers' import { optimizeImageURL } from '$lib/components/lemmy/post/helpers'
import { userSettings } from '$lib/settings' import { userSettings } from '$lib/settings'
import { dockProps } from '../layout/Shell.svelte'
let promptOpen: boolean = false let promptOpen: boolean = false
</script> </script>
@@ -153,7 +154,7 @@
</span> </span>
{/if} {/if}
</Menu> </Menu>
{#if $profile?.user?.local_user_view.person.avatar} {#if $profile?.user?.local_user_view.person.avatar && !$dockProps.noGap}
<div <div
class="absolute right-0 -z-10 h-full class="absolute right-0 -z-10 h-full
overflow-hidden w-full ml-auto" overflow-hidden w-full ml-auto"
+5
View File
@@ -277,6 +277,11 @@
"empty": { "empty": {
"title": "No new notifications", "title": "No new notifications",
"description": "Messages, replies, and mentions will appear here." "description": "Messages, replies, and mentions will appear here."
},
"item": {
"reply": "{{user}} replied to you in {{post}}",
"mention": "{{user}} mentioned you in {{post}}",
"message": "{{user}} messaged {{recipient}}"
} }
}, },
"moderation": { "moderation": {
+4 -4
View File
@@ -14,11 +14,11 @@
dark:bg-primary-100 dark:text-black hover:brightness-125 dark:hover:brightness-90 active:brightness-90 dark:bg-primary-100 dark:text-black hover:brightness-125 dark:hover:brightness-90 active:brightness-90
active:dark:brightness-75`, active:dark:brightness-75`,
secondary: `border border-slate-200 border-b-slate-300 dark:border-zinc-800 dark:border-t-zinc-700/70 bg-white dark:bg-zinc-900 secondary: `border border-slate-200 border-b-slate-300 dark:border-zinc-800 bg-white dark:bg-zinc-900
hover:bg-slate-100 hover:dark:bg-zinc-800 hover:dark:border-zinc-700 hover:dark:border-zinc-700 active:dark:bg-zinc-900 active:bg-slate-200`, hover:bg-slate-100 hover:dark:bg-zinc-800 hover:dark:border-zinc-700 hover:dark:border-zinc-700 active:dark:bg-zinc-900 active:bg-slate-200`,
tertiary: tertiary:
'border border-transparent bg-transparent hover:bg-slate-100 hover:dark:bg-zinc-800 dark:text-zinc-200', 'border border-transparent bg-transparent hover:bg-slate-100 hover:dark: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',
@@ -51,7 +51,7 @@
export type ButtonSize = keyof typeof buttonSize export type ButtonSize = keyof typeof buttonSize
export const buttonSize = { export const buttonSize = {
sm: 'px-2 py-1', sm: 'px-3 py-1.5 text-xs',
md: 'px-3 py-1.5', md: 'px-3 py-1.5',
lg: 'px-4 py-2', lg: 'px-4 py-2',
xl: 'px-6 py-3', xl: 'px-6 py-3',
@@ -147,7 +147,7 @@
{buttonSize[size]} {buttonSize[size]}
{buttonRounding[rounding][roundingSide]} {buttonRounding[rounding][roundingSide]}
{buttonShadow[shadow]} {buttonShadow[shadow]}
text-sm transition-all font-medium cursor-pointer duration-100 text-sm transition-all font-medium cursor-pointer duration-75
disabled:opacity-50 disabled:pointer-events-none disabled:opacity-50 disabled:pointer-events-none
{alignment == 'center' {alignment == 'center'
? 'origin-center' ? 'origin-center'
+12 -11
View File
@@ -1,17 +1,18 @@
<script lang="ts"> <script lang="ts">
import { backOut, expoOut } from 'svelte/easing' import { backOut, expoOut } from 'svelte/easing'
import { slide } from 'svelte/transition' import { slide } from 'svelte/transition'
export let open: boolean = false export let open: boolean = false
</script> </script>
<div {...$$restProps} class={$$props.class}> <div {...$$restProps} class={$$props.class}>
<button on:click={() => (open = !open)} class="w-full"> <button on:click={() => (open = !open)} class="w-full">
<slot name="summary" {open} /> <slot name="summary" {open} />
</button> </button>
{#if open} <slot name="extended" />
<div transition:slide={{ axis: 'y', easing: expoOut, duration: 300 }}> {#if open}
<slot {open} /> <div transition:slide={{ axis: 'y', easing: expoOut, duration: 300 }}>
</div> <slot {open} />
{/if} </div>
{/if}
</div> </div>
+1 -1
View File
@@ -149,7 +149,7 @@
{#each sliced as community, index (community.community.id)} {#each sliced as community, index (community.community.id)}
<div <div
class="px-6 hover:bg-slate-50 hover:dark:bg-zinc-900 transition-colors @container class="px-6 hover:bg-slate-50 hover:dark:bg-zinc-900 transition-colors @container
border-b border-slate-100 dark:border-zinc-800" border-b border-slate-100 dark:border-zinc-900"
in:fly|global={{ in:fly|global={{
duration: 1000, duration: 1000,
easing: expoOut, easing: expoOut,
+72 -58
View File
@@ -23,6 +23,7 @@
import { t } from '$lib/translations' import { t } from '$lib/translations'
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte' import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
import { contentPadding } from '$lib/components/ui/layout/Shell.svelte' import { contentPadding } from '$lib/components/ui/layout/Shell.svelte'
import { expoOut } from 'svelte/easing'
export let data export let data
@@ -97,67 +98,70 @@
{$t('routes.inbox.markAsRead')} {$t('routes.inbox.markAsRead')}
</Button> </Button>
</div> </div>
<div
class="mt-4 mb-0 sticky z-30 mx-auto max-w-full flex gap-2 md:flex-row flex-col
items-center px-2 w-max"
style="top: max(1.5rem, {$contentPadding.top}px);"
slot="extended"
>
<Tabs
routes={[
{
href: '?type=all',
name: $t('filter.location.all'),
},
{
href: '?type=replies',
name: $t('filter.inbox.replies'),
},
{
href: '?type=mentions',
name: $t('filter.inbox.mentions'),
},
{
href: '/inbox/messages',
name: $t('filter.inbox.messages'),
},
]}
currentRoute={$page.url.search}
isSelected={(url, current, route, def) =>
$page.url.search == route ||
($page.url.pathname == route && $page.url.search == '') ||
$page.url.searchParams.toString().includes(route.slice(1)) ||
($page.url.search == '' && route == def)}
class="overflow-auto w-full"
buildUrl={(route, href) =>
href.includes('?')
? '?' + addSearchParam($page.url.searchParams, href).toString()
: `${href}${$page.url.search}`}
defaultRoute="?type=All"
/>
<Tabs
routes={[
{
href: '?unreadOnly=false',
name: $t('filter.location.all'),
},
{
href: '?unreadOnly=true',
name: $t('filter.unread'),
},
]}
isSelected={(url, current, route, def) =>
$page.url.searchParams.toString().includes(route.slice(1)) ||
($page.url.search == '' && route == def)}
buildUrl={(route, href) =>
'?' + addSearchParam($page.url.searchParams, href).toString()}
defaultRoute="?unreadOnly=true"
/>
</div>
</Header> </Header>
</div> </div>
<div class="mt-4" /> <div class="mt-4" />
<div <div
class="mt-4 mb-0 sticky z-30 mx-auto max-w-full flex gap-2 md:flex-row flex-col class="flex flex-col list-none flex-1 h-full mt-4 divide-y divide-slate-200 dark:divide-zinc-900 *:py-4"
items-center px-2"
style="top: max(1.5rem, {$contentPadding.top}px);"
> >
<Tabs
routes={[
{
href: '?type=All',
name: $t('filter.location.all'),
},
{
href: '?type=Replies',
name: $t('filter.inbox.replies'),
},
{
href: '?type=Mentions',
name: $t('filter.inbox.mentions'),
},
{
href: '/inbox/messages',
name: $t('filter.inbox.messages'),
},
]}
currentRoute={$page.url.search}
isSelected={(url, current, route, def) =>
$page.url.search == route ||
($page.url.pathname == route && $page.url.search == '') ||
$page.url.searchParams.toString().includes(route.slice(1)) ||
($page.url.search == '' && route == def)}
class="overflow-auto w-full"
buildUrl={(route, href) =>
href.includes('?')
? '?' + addSearchParam($page.url.searchParams, href).toString()
: `${href}${$page.url.search}`}
defaultRoute="?type=All"
/>
<Tabs
routes={[
{
href: '?unreadOnly=false',
name: $t('filter.location.all'),
},
{
href: '?unreadOnly=true',
name: $t('filter.unread'),
},
]}
isSelected={(url, current, route, def) =>
$page.url.searchParams.toString().includes(route.slice(1)) ||
($page.url.search == '' && route == def)}
buildUrl={(route, href) =>
'?' + addSearchParam($page.url.searchParams, href).toString()}
defaultRoute="?unreadOnly=true"
/>
</div>
<div class="flex flex-col gap-4 list-none flex-1 h-full mt-4">
{#if !data.data || (data.data?.length ?? 0) == 0} {#if !data.data || (data.data?.length ?? 0) == 0}
<Placeholder <Placeholder
icon={Inbox} icon={Inbox}
@@ -165,9 +169,19 @@
description={$t('routes.inbox.empty.description')} description={$t('routes.inbox.empty.description')}
/> />
{:else} {:else}
{#each data.data as item} {#each data.data as item, index (item.id)}
<div in:fly={{ duration: 500, y: -6, opacity: 0 }}> <div
<InboxItem {item} /> class="-mx-4 sm:-mx-6 px-4 sm:px-6
{item.read ? '' : 'bg-yellow-50/50 dark:bg-blue-500/5'}"
in:fly|global={{
duration: 1000,
y: 16,
opacity: 0,
easing: expoOut,
delay: index * 50,
}}
>
<InboxItem bind:item />
</div> </div>
{/each} {/each}
{/if} {/if}
+108 -74
View File
@@ -11,6 +11,8 @@
Check, Check,
Envelope, Envelope,
Icon, Icon,
Eye,
EyeSlash,
} from 'svelte-hero-icons' } from 'svelte-hero-icons'
import { Material } from 'mono-svelte' import { Material } from 'mono-svelte'
import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte' import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte'
@@ -22,6 +24,9 @@
import PrivateMessage from '$lib/components/lemmy/inbox/PrivateMessage.svelte' import PrivateMessage from '$lib/components/lemmy/inbox/PrivateMessage.svelte'
import PrivateMessageModal from '$lib/components/lemmy/modal/PrivateMessageModal.svelte' import PrivateMessageModal from '$lib/components/lemmy/modal/PrivateMessageModal.svelte'
import { t } from '$lib/translations' import { t } from '$lib/translations'
import Expandable from '$lib/components/ui/Expandable.svelte'
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
import Avatar from '$lib/components/ui/Avatar.svelte'
export let item: InboxItem export let item: InboxItem
@@ -68,91 +73,120 @@
<PrivateMessageModal bind:open={replying} user={item.item.creator} /> <PrivateMessageModal bind:open={replying} user={item.item.creator} />
{/if} {/if}
<Material <Expandable open icon={false}>
class="flex flex-col max-w-full gap-4" <div class="flex flex-row gap-2 items-center w-full" slot="title">
color="transparent" <Avatar
rounding="xl" url={item.creator.avatar}
> circle={false}
<div class="meta w-full"> width={28}
<div alt={item.creator.name}
class="rounded-full p-1 h-10 w-10 border border-slate-200 dark:border-zinc-800 grid place-items-center"
style="grid-area: a;"
>
<Icon
src={item.type == 'private_message'
? Envelope
: item.type == 'comment_reply'
? ChatBubbleOvalLeft
: AtSymbol}
size="24"
/>
</div>
<RelativeDate
class="text-xs text-slate-600 dark:text-zinc-400"
date={publishedToDate(item.published)}
style="grid-area: b;"
/> />
{#if item.type != 'private_message'} <!-- <div class="rounded-full p-1 border border-slate-200 dark:border-zinc-800">
<PostMeta title={item.item.post.name} id={item.item.post.id} /> <Icon
{:else} src={item.type == 'comment_reply'
<PrivateMessage message={item.item} style="grid-area: title;" /> ? ChatBubbleOvalLeft
{/if} : item.type == 'private_message'
<div class="flex flex-row gap-2 h-8" style="grid-area: actions;"> ? Envelope
{#if !(item.type == 'private_message' && item.item.creator.id == $profile?.user?.local_user_view.person.id)} : item.type == 'person_mention'
<Button ? AtSymbol
class={item.read ? '!text-green-500' : ''} : AtSymbol}
size="square-md" size="20"
{loading} mini
disabled={loading} class="text-slate-600 dark:text-zinc-400"
on:click={() => markAsRead(!item.read)} />
title={$t('post.actions.more.markRead')} </div> -->
> <div class="flex flex-col">
<Icon slot="prefix" src={Check} micro size="16" /> <div class="text-sm font-normal">
</Button> {#if item.type == 'comment_reply'}
{/if} {@html $t('routes.inbox.item.reply', {
// @ts-ignore
{#if item.type == 'private_message'} user: `<span class="font-medium">${item.creator.name}</span>`,
{#if item.item.creator.id != $profile?.user?.local_user_view.person.id} post: `<span class="font-medium">${item.item.post.name}</span>`,
<Button size="square-md" on:click={() => (replying = !replying)}> })}
<Icon src={ArrowUturnLeft} size="16" micro /> {:else if item.type == 'person_mention'}
</Button> {@html $t('routes.inbox.item.mention', {
// @ts-ignore
user: `<span class="font-medium">${item.creator.name}</span>`,
post: `<span class="font-medium">${item.item.post.name}</span>`,
})}
{:else if item.type == 'private_message'}
{@html $t('routes.inbox.item.message', {
// @ts-ignore
user: `<span class="font-medium">${item.item.creator.name}</span>`,
recipient: `<span class="font-medium">${item.item.recipient.name}</span>`,
})}
{/if} {/if}
{:else} </div>
<div class="text-xs text-slate-600 dark:text-zinc-400">
<RelativeDate date={publishedToDate(item.published)} />
</div>
</div>
<div class="flex-1" />
<div class="flex gap-2 max-md:hidden flex-shrink-0">
<Button
color={item.read ? 'secondary' : 'primary'}
{loading}
disabled={loading}
on:click={(e) => {
e.stopPropagation()
markAsRead(!item.read)
}}
size="sm"
rounding="pill"
class="flex-shrink-0"
>
<Icon src={item.read ? EyeSlash : Eye} size="16" micro slot="prefix" />
{item.read
? $t('post.actions.more.markUnread')
: $t('post.actions.more.markRead')}
</Button>
{#if item.type == 'comment_reply' || item.type == 'person_mention'}
<Button <Button
title={$t('common.jump')}
href="/comment/{item.item.comment.id}" href="/comment/{item.item.comment.id}"
size="square-md" size="sm"
rounding="pill"
class="flex-shrink-0"
> >
<Icon src={ArrowUturnUp} micro size="16" /> {$t('common.jump')}
</Button> </Button>
{/if} {/if}
</div> </div>
</div> </div>
<div class="flex flex-col"> <div slot="extended" class="flex gap-2 w-full md:hidden">
{#if item.type != 'private_message' && $profile?.user && item.item.post.creator_id != $profile.user.local_user_view.person.id} <Button
<div class="flex flex-row text-xs items-center gap-2"> color={item.read ? 'secondary' : 'primary'}
<div {loading}
class="border-t w-8 rounded-tl h-2 border-l ml-2 border-zinc-700" disabled={loading}
/> on:click={(e) => {
<div> e.stopPropagation()
<UserLink markAsRead(!item.read)
avatar }}
avatarSize={16} size="sm"
user={$profile.user.local_user_view.person} rounding="pill"
/> >
</div> <Icon src={item.read ? EyeSlash : Eye} size="16" micro slot="prefix" />
</div> {$t('routes.inbox.item.markRead')}
{/if} </Button>
{#if item.type != 'private_message'} {#if item.type == 'comment_reply' || item.type == 'person_mention'}
<Comment <Button href="/comment/{item.item.comment.id}" size="sm" rounding="pill">
postId={item.item.post.id} {$t('common.jump')}
node={{ children: [], comment_view: item.item, depth: 1 }} </Button>
replying={false}
class="!p-0"
/>
{/if} {/if}
</div> </div>
</Material> <svelte:fragment slot="content">
{#if item.type == 'comment_reply' || item.type == 'person_mention'}
<CommentItem
comment={item.item}
community={false}
view="cozy"
meta={false}
class="pt-0 pb-0"
/>
{:else}
<PrivateMessage message={item.item} meta={false} />
{/if}
</svelte:fragment>
</Expandable>
<style> <style>
.meta { .meta {