impr: automatically mark as read inbox items when clicked
This commit is contained in:
7 files changed
+93
-26
No files matched your search
@@ -0,0 +1,50 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { Snippet } from 'svelte'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
orientation: 'horizontal'
|
||||||
|
class?: string
|
||||||
|
children?: Snippet
|
||||||
|
}
|
||||||
|
|
||||||
|
let {
|
||||||
|
orientation = 'horizontal',
|
||||||
|
children,
|
||||||
|
class: clazz,
|
||||||
|
...rest
|
||||||
|
}: Props = $props()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div
|
||||||
|
{...rest}
|
||||||
|
role="group"
|
||||||
|
class={[
|
||||||
|
'btn-group',
|
||||||
|
orientation == 'horizontal' ? 'btn-group-horizontal' : 'btn-group-vertical',
|
||||||
|
clazz,
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
{@render children?.()}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.btn-group {
|
||||||
|
gap: var(--spacing);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-group.btn-group-horizontal {
|
||||||
|
flex-direction: row;
|
||||||
|
|
||||||
|
:global(*) {
|
||||||
|
position: relative;
|
||||||
|
&:first-child {
|
||||||
|
border-radius: 24px 8px 8px 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:last-child {
|
||||||
|
border-radius: 8px 24px 24px 8px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
+17
-12
@@ -1,33 +1,38 @@
|
|||||||
// Reexport your entry components here
|
// Reexport your entry components here
|
||||||
|
|
||||||
export { default as Button } from './button/Button.svelte'
|
export {
|
||||||
export { buttonColor, buttonSize, buttonShadow } from './button/Button.svelte'
|
default as Button,
|
||||||
|
buttonColor,
|
||||||
|
buttonShadow,
|
||||||
|
buttonSize,
|
||||||
|
} from './button/Button.svelte'
|
||||||
|
export { default as ButtonGroup } from './button/ButtonGroup.svelte'
|
||||||
export { default as Spinner } from './loader/Spinner.svelte'
|
export { default as Spinner } from './loader/Spinner.svelte'
|
||||||
export { default as TextLoader } from './loader/TextLoader.svelte'
|
export { default as TextLoader } from './loader/TextLoader.svelte'
|
||||||
export { default as Material } from './materials/Material.svelte'
|
export { default as Material } from './materials/Material.svelte'
|
||||||
|
|
||||||
export { default as Label } from './forms/Label.svelte'
|
|
||||||
export { default as FileInput } from './forms/FileInput.svelte'
|
export { default as FileInput } from './forms/FileInput.svelte'
|
||||||
export { default as TextInput } from './forms/TextInput.svelte'
|
export { default as Label } from './forms/Label.svelte'
|
||||||
export { default as TextArea } from './forms/TextArea.svelte'
|
export { default as TextArea } from './forms/TextArea.svelte'
|
||||||
export { default as Select } from './forms/select/Select.svelte'
|
export { default as TextInput } from './forms/TextInput.svelte'
|
||||||
export { default as Option } from './forms/select/Option.svelte'
|
export { default as Option } from './forms/select/Option.svelte'
|
||||||
|
export { default as Select } from './forms/select/Select.svelte'
|
||||||
|
|
||||||
export { default as Switch } from './forms/Switch.svelte'
|
export { default as Switch } from './forms/Switch.svelte'
|
||||||
|
|
||||||
export { default as Popover } from './popover/Popover.svelte'
|
|
||||||
export { default as Menu } from './popover/Menu.svelte'
|
|
||||||
export { default as MenuDivider } from './popover/MenuDivider.svelte'
|
|
||||||
export { default as MenuButton } from './popover/MenuButton.svelte'
|
|
||||||
export { default as Disclosure } from './disclosure/Disclosure.svelte'
|
export { default as Disclosure } from './disclosure/Disclosure.svelte'
|
||||||
export { default as Expandable } from './disclosure/Expandable.svelte'
|
export { default as Expandable } from './disclosure/Expandable.svelte'
|
||||||
export { default as Modal } from './modal/Modal.svelte'
|
export { default as Modal } from './modal/Modal.svelte'
|
||||||
export { modal, action } from './modal/modal.js'
|
|
||||||
export { default as ModalContainer } from './modal/ModalContainer.svelte'
|
export { default as ModalContainer } from './modal/ModalContainer.svelte'
|
||||||
|
export { action, modal } from './modal/modal.js'
|
||||||
|
export { default as Menu } from './popover/Menu.svelte'
|
||||||
|
export { default as MenuButton } from './popover/MenuButton.svelte'
|
||||||
|
export { default as MenuDivider } from './popover/MenuDivider.svelte'
|
||||||
|
export { default as Popover } from './popover/Popover.svelte'
|
||||||
|
|
||||||
export { toast, removeToast, toasts, toastColors } from './toast/toasts.js'
|
|
||||||
export { default as ToastContainer } from './toast/ToastContainer.svelte'
|
export { default as ToastContainer } from './toast/ToastContainer.svelte'
|
||||||
|
export { removeToast, toast, toastColors, toasts } from './toast/toasts.js'
|
||||||
|
|
||||||
export { default as Note } from './note/Note.svelte'
|
|
||||||
export { default as Badge } from './badge/Badge.svelte'
|
export { default as Badge } from './badge/Badge.svelte'
|
||||||
|
export { default as Note } from './note/Note.svelte'
|
||||||
export { default as Search } from './search/Search.svelte'
|
export { default as Search } from './search/Search.svelte'
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
import Portal from 'mono-svelte/popover/Portal.svelte'
|
import Portal from 'mono-svelte/popover/Portal.svelte'
|
||||||
import type { Snippet } from 'svelte'
|
import type { Snippet } from 'svelte'
|
||||||
import { XMark } from 'svelte-hero-icons/dist'
|
import { XMark } from 'svelte-hero-icons/dist'
|
||||||
import { backOut } from 'svelte/easing'
|
import { expoOut } from 'svelte/easing'
|
||||||
import type { ClassValue } from 'svelte/elements'
|
import type { ClassValue } from 'svelte/elements'
|
||||||
import { fade, scale } from 'svelte/transition'
|
import { fade, scale } from 'svelte/transition'
|
||||||
import { trapFocus } from 'trap-focus-svelte'
|
import { trapFocus } from 'trap-focus-svelte'
|
||||||
@@ -97,7 +97,7 @@
|
|||||||
use:trapFocus={true}
|
use:trapFocus={true}
|
||||||
transition:scale|global={{
|
transition:scale|global={{
|
||||||
start: 0.97,
|
start: 0.97,
|
||||||
easing: backOut,
|
easing: expoOut,
|
||||||
duration: 300,
|
duration: 300,
|
||||||
}}
|
}}
|
||||||
class={[
|
class={[
|
||||||
|
|||||||
@@ -102,10 +102,17 @@
|
|||||||
class="self-center justify-self-center my-auto"
|
class="self-center justify-self-center my-auto"
|
||||||
/>
|
/>
|
||||||
{:else}
|
{:else}
|
||||||
<CommonList items={data.inbox.value} size="md">
|
<CommonList size="md">
|
||||||
{#snippet item(item)}
|
{#each data.inbox.value as item}
|
||||||
<InboxItem {item} />
|
<li
|
||||||
{/snippet}
|
class={[
|
||||||
|
'lg:px-2.5 lg:py-1.5',
|
||||||
|
!item.read && 'bg-blue-300/10! dark:bg-blue-500/5!',
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<InboxItem {item} />
|
||||||
|
</li>
|
||||||
|
{/each}
|
||||||
</CommonList>
|
</CommonList>
|
||||||
{/if}
|
{/if}
|
||||||
{#if !(data.page == 1 && (data?.inbox?.value.length ?? 0) == 0)}
|
{#if !(data.page == 1 && (data?.inbox?.value.length ?? 0) == 0)}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export async function load({ url, fetch }) {
|
|||||||
const client = getClient(undefined, fetch)
|
const client = getClient(undefined, fetch)
|
||||||
const page = Number(url.searchParams.get('page')) || 1
|
const page = Number(url.searchParams.get('page')) || 1
|
||||||
const unreadOnly: boolean =
|
const unreadOnly: boolean =
|
||||||
(url.searchParams.get('unreadOnly') || 'true') == 'true'
|
(url.searchParams.get('unreadOnly') || 'false') == 'true'
|
||||||
|
|
||||||
const params = {
|
const params = {
|
||||||
limit: 20,
|
limit: 20,
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
import PrivateMessage from '$lib/feature/inbox/PrivateMessage.svelte'
|
import PrivateMessage from '$lib/feature/inbox/PrivateMessage.svelte'
|
||||||
import Avatar from '$lib/ui/generic/Avatar.svelte'
|
import Avatar from '$lib/ui/generic/Avatar.svelte'
|
||||||
import { publishedToDate } from '$lib/ui/util/date'
|
import { publishedToDate } from '$lib/ui/util/date'
|
||||||
import { Button, Expandable } from 'mono-svelte'
|
import { Button, ButtonGroup, Expandable } from 'mono-svelte'
|
||||||
import RelativeDate from 'mono-svelte/util/RelativeDate.svelte'
|
import RelativeDate from 'mono-svelte/util/RelativeDate.svelte'
|
||||||
import { Eye, EyeSlash } from 'svelte-hero-icons/dist'
|
import { Eye, EyeSlash } from 'svelte-hero-icons/dist'
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
let loading = $state(false)
|
let loading = $state(false)
|
||||||
|
|
||||||
async function markAsRead(isRead: boolean) {
|
async function markAsRead(isRead: boolean) {
|
||||||
if (!profile.current?.jwt) return
|
if (isRead && item.read) return
|
||||||
|
|
||||||
loading = true
|
loading = true
|
||||||
|
|
||||||
@@ -96,7 +96,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
<div class="flex gap-2 max-md:hidden shrink-0">
|
<ButtonGroup orientation="horizontal" class="md:flex hidden shrink-0">
|
||||||
<Button
|
<Button
|
||||||
color={item.read ? 'secondary' : 'primary'}
|
color={item.read ? 'secondary' : 'primary'}
|
||||||
{loading}
|
{loading}
|
||||||
@@ -121,14 +121,15 @@
|
|||||||
size="sm"
|
size="sm"
|
||||||
rounding="pill"
|
rounding="pill"
|
||||||
class="shrink-0"
|
class="shrink-0"
|
||||||
|
onclick={() => markAsRead(true)}
|
||||||
>
|
>
|
||||||
{$t('common.jump')}
|
{$t('common.jump')}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</ButtonGroup>
|
||||||
</div>
|
</div>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
{#snippet extended()}
|
{#snippet extended()}
|
||||||
<div class="flex gap-2 w-full md:hidden mt-1 flex-wrap">
|
<ButtonGroup orientation="horizontal" class="flex md:hidden">
|
||||||
<Button
|
<Button
|
||||||
color={item.read ? 'secondary' : 'primary'}
|
color={item.read ? 'secondary' : 'primary'}
|
||||||
{loading}
|
{loading}
|
||||||
@@ -151,10 +152,11 @@
|
|||||||
: `/comment/${item.item.comment.id}`}
|
: `/comment/${item.item.comment.id}`}
|
||||||
size="sm"
|
size="sm"
|
||||||
rounding="pill"
|
rounding="pill"
|
||||||
|
onclick={() => markAsRead(true)}
|
||||||
>
|
>
|
||||||
{$t('common.jump')}
|
{$t('common.jump')}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</ButtonGroup>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
{#snippet content()}
|
{#snippet content()}
|
||||||
{#if item.type == 'comment_reply' || item.type == 'person_mention'}
|
{#if item.type == 'comment_reply' || item.type == 'person_mention'}
|
||||||
|
|||||||
@@ -137,7 +137,10 @@
|
|||||||
{/if}
|
{/if}
|
||||||
<CommonList items={previews}>
|
<CommonList items={previews}>
|
||||||
{#snippet item(preview)}
|
{#snippet item(preview)}
|
||||||
<a href="/inbox/messages/{preview.user.id}" class="flex flex-row gap-2">
|
<a
|
||||||
|
href="/inbox/messages/{preview.user.id}"
|
||||||
|
class="flex flex-row items-center gap-2"
|
||||||
|
>
|
||||||
<Avatar url={preview.user.avatar} alt={preview.user.name} width={32} />
|
<Avatar url={preview.user.avatar} alt={preview.user.name} width={32} />
|
||||||
<div class="flex flex-col w-full overflow-hidden">
|
<div class="flex flex-col w-full overflow-hidden">
|
||||||
<div class="font-medium">{preview.user.name}</div>
|
<div class="font-medium">{preview.user.name}</div>
|
||||||
|
|||||||
Reference in new issue
Block a user