migrate: switch to svelte 5 events system for everything

This commit is contained in:
James Xylight committed 2025-02-05 19:29:54 -08:00
1 parent 43a857ed66
commit 53cb0e4f20
27 files changed
+248 -303

No files matched your search

-1
View File
@@ -8,7 +8,6 @@
type Profile,
profile,
} from '$lib/auth.svelte.js'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import { Menu, MenuButton, Modal } from 'mono-svelte'
import DebugObject from '$lib/components/util/debug/DebugObject.svelte'
import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance.js'
+4 -4
View File
@@ -104,9 +104,9 @@
<ImageUploadModal
bind:open={uploading.icon}
multiple={false}
on:upload={(uploaded) => {
onupload={(uploaded) => {
uploading.icon = false
formData.icon = uploaded.detail[0]
formData.icon = uploaded[0]
}}
/>
{/if}
@@ -132,9 +132,9 @@
<ImageUploadModal
bind:open={uploading.banner}
multiple={false}
on:upload={(uploaded) => {
onupload={(uploaded) => {
uploading.banner = false
formData.banner = uploaded.detail[0]
formData.banner = uploaded[0]
}}
/>
{/if}
+4 -5
View File
@@ -4,7 +4,6 @@
import { profile } from '$lib/auth.svelte.js'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
import { publishedToDate } from '$lib/components/util/date.js'
import { getClient } from '$lib/lemmy.js'
@@ -216,7 +215,7 @@
</Button>
</form>
<Material class="h-full overflow-auto" color="distinct">
<EditableList
<ul
class="[&>*]:py-3 dark:!divide-zinc-800 {allowInstance.instance != ''
? 'opacity-50'
: ''}"
@@ -262,7 +261,7 @@
description={$t('routes.admin.federation.emptyBlock.description')}
/>
{/if}
</EditableList>
</ul>
</Material>
</div>
<div class="md:flex-1 w-full max-h-[42rem] flex flex-col gap-2">
@@ -304,7 +303,7 @@
</Button>
</form>
<Material class="h-full overflow-auto" color="distinct">
<EditableList class="[&>*]:py-3 dark:!divide-zinc-800 ">
<ul class="[&>*]:py-3 dark:!divide-zinc-800">
{#if data.federated_instances.federated_instances.allowed.length > 0}
{#each data.federated_instances.federated_instances.allowed.sort( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)}
<div
@@ -350,7 +349,7 @@
/>
</div>
{/if}
</EditableList>
</ul>
</Material>
</div>
</div>
+21 -23
View File
@@ -5,7 +5,6 @@
import Markdown from '$lib/components/markdown/Markdown.svelte'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import { toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
import type { Tagline } from 'lemmy-js-client'
@@ -61,31 +60,30 @@
</Button>
</Header>
<EditableList
on:action={(e) => {
taglines.splice(
taglines.findIndex((i) => i == e.detail),
1,
)
<ul>
{#each taglines as tagline}
<div class="flex py-3">
<Markdown source={tagline} inline />
// hack for reactivity
taglines = taglines
}}
>
{#snippet children({ action })}
{#each taglines as tagline}
<div class="flex py-3">
<Markdown source={tagline} inline />
<div class="flex gap-2 ml-auto">
<Button
onclick={() => {
taglines.splice(
taglines.findIndex((i) => i == tagline),
1,
)
<div class="flex gap-2 ml-auto">
<Button onclick={() => action(tagline)} size="square-md">
<Icon src={Trash} mini size="16" />
</Button>
</div>
// hack for reactivity
taglines = taglines
}}
size="square-md"
>
<Icon src={Trash} mini size="16" />
</Button>
</div>
{/each}
{/snippet}
</EditableList>
</div>
{/each}
</ul>
<form
class="flex flex-col mt-auto gap-2 w-full"
onsubmit={preventDefault(() => {
+23 -21
View File
@@ -4,7 +4,6 @@
import { profile } from '$lib/auth.svelte.js'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import { toast } from 'mono-svelte'
import { instance } from '$lib/instance.js'
import { getClient } from '$lib/lemmy.js'
@@ -48,26 +47,29 @@
<Header pageHeader>{$t('routes.admin.team.title')}</Header>
{#if data.site}
<EditableList on:action={(e) => removeAdmin(e.detail, false)}>
{#snippet children({ action })}
{#if data.site.admins.length <= 0}
<Placeholder
icon={QuestionMarkCircle}
title={$t('routes.admin.team.empty.title')}
description={$t('routes.admin.team.empty.description')}
/>
{:else}
{#each data.site?.admins ?? [] as admin}
<div class="py-3 flex items-center justify-between">
<UserLink avatar showInstance={false} user={admin.person} />
<Button onclick={() => action(admin.person.id)} size="square-md">
<Icon src={Trash} mini size="16" />
</Button>
</div>
{/each}
{/if}
{/snippet}
</EditableList>
<ul>
{#if data.site.admins.length <= 0}
<Placeholder
icon={QuestionMarkCircle}
title={$t('routes.admin.team.empty.title')}
description={$t('routes.admin.team.empty.description')}
/>
{:else}
{#each data.site?.admins ?? [] as admin}
<div class="py-3 flex items-center justify-between">
<UserLink avatar showInstance={false} user={admin.person} />
<Button
onclick={() => {
removeAdmin(admin.person.id, false)
}}
size="square-md"
>
<Icon src={Trash} mini size="16" />
</Button>
</div>
{/each}
{/if}
</ul>
<form
class="flex flex-row items-center gap-2 mt-auto w-full"
onsubmit={preventDefault(() => {
+38 -36
View File
@@ -1,9 +1,6 @@
<script lang="ts">
import { preventDefault } from 'svelte/legacy'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import Avatar from '$lib/components/ui/Avatar.svelte'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import { Icon, Plus, Trash } from 'svelte-hero-icons'
import type { PageData } from './$types.js'
import { profile } from '$lib/auth.svelte.js'
@@ -108,41 +105,46 @@
</script>
<Header pageHeader>Moderators</Header>
<EditableList
on:action={(e) => {
toast({
content: `Are you sure you want to remove ${e.detail.name} as a moderator?`,
action: () => removeMod(e.detail.id),
})
}}
>
{#snippet children({ action })}
{#each data.community.moderators as moderator (moderator.moderator.id)}
<div
class="py-4 flex items-center gap-2 justify-between"
animate:flip={{ duration: 300 }}
>
<div class="flex gap-2 items-center">
<Avatar
width={28}
url={moderator.moderator.avatar}
alt={moderator.moderator.name}
/>
<div class="flex flex-col gap-0">
<UserLink user={moderator.moderator} showInstance={false} />
<span class="text-xs text-slate-600 dark:text-zinc-400">
{new URL(moderator.moderator.actor_id).hostname}
</span>
</div>
<ul class="divide-y divide-slate-200 dark:divide-zinc-800">
{#each data.community.moderators as moderator (moderator.moderator.id)}
<div
class="py-4 flex items-center gap-2 justify-between"
animate:flip={{ duration: 300 }}
>
<div class="flex gap-2 items-center">
<Avatar
width={28}
url={moderator.moderator.avatar}
alt={moderator.moderator.name}
/>
<div class="flex flex-col gap-0">
<UserLink user={moderator.moderator} showInstance={false} />
<span class="text-xs text-slate-600 dark:text-zinc-400">
{new URL(moderator.moderator.actor_id).hostname}
</span>
</div>
<Button size="square-md" onclick={() => action(moderator.moderator)}>
<Icon src={Trash} mini size="16" />
</Button>
</div>
{/each}
{/snippet}
</EditableList>
<form onsubmit={preventDefault(addModerator)} class="mt-auto flex gap-2 w-full">
<Button
size="square-md"
onclick={() => {
toast({
content: `Are you sure you want to remove ${moderator.moderator.name} as a moderator?`,
action: () => removeMod(moderator.moderator.id),
})
}}
>
<Icon src={Trash} mini size="16" />
</Button>
</div>
{/each}
</ul>
<form
onsubmit={(e) => {
e.preventDefault()
addModerator()
}}
class="mt-auto flex gap-2 w-full"
>
<TextInput
bind:value={formData.newModerator}
class="w-full"
+8 -18
View File
@@ -96,11 +96,11 @@
label="Instance"
class="flex-1"
q={page.url.searchParams.get('instance') || ''}
on:select={(e) =>
onselect={(e) =>
searchParam(
page.url,
'instance',
e.detail?.domain.toString() ?? '',
e?.domain.toString() ?? '',
'page',
'community',
'user',
@@ -115,13 +115,8 @@
label="Community"
class="flex-1"
q={page.url.searchParams.get('community') ? 'Selected' : ''}
on:select={(e) =>
searchParam(
page.url,
'community',
e.detail?.id.toString() ?? '',
'page',
)}
onselect={(e) =>
searchParam(page.url, 'community', e?.id.toString() ?? '', 'page')}
/>
<UserAutocomplete
instance={page.url.searchParams.get('instance') || undefined}
@@ -134,8 +129,8 @@
q={page.url.searchParams.get('user')
? (data.filters.user ?? 'Selected')
: ''}
on:select={(e) =>
searchParam(page.url, 'user', e.detail?.id.toString() ?? '', 'page')}
onselect={(e) =>
searchParam(page.url, 'user', e?.id.toString() ?? '', 'page')}
/>
{#if $profile?.user && isAdmin($profile?.user)}
<UserAutocomplete
@@ -148,13 +143,8 @@
q={page.url.searchParams.get('mod_id')
? (data.filters.moderator ?? 'Selected')
: ''}
on:select={(e) =>
searchParam(
page.url,
'mod_id',
e.detail?.id.toString() ?? '',
'page',
)}
onselect={(e) =>
searchParam(page.url, 'mod_id', e?.id.toString() ?? '', 'page')}
/>
{/if}
<Button
@@ -5,7 +5,6 @@
PersonBlockView,
} from 'lemmy-js-client'
import type { PageData } from './$types.js'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import { getClient } from '$lib/lemmy.js'
@@ -90,89 +89,83 @@
{#if data.my_user?.instance_blocks && (data.my_user?.instance_blocks?.length ?? 0) > 0}
<div>
<SectionTitle>{$t('content.instances')}</SectionTitle>
<EditableList on:action={(i) => unblockInstances(i.detail)}>
{#snippet children({ action })}
{#each data.my_user?.instance_blocks as block (block.instance.id)}
<div
class="flex flex-row gap-2 items-center py-4"
animate:flip={{ duration: 250 }}
out:slide|local={{ axis: 'y' }}
<ul>
{#each data.my_user?.instance_blocks as block (block.instance.id)}
<div
class="flex flex-row gap-2 items-center py-4"
animate:flip={{ duration: 250 }}
out:slide|local={{ axis: 'y' }}
>
<Button
title="Unblock"
size="square-md"
rounding="pill"
onclick={() => unblockInstances(block)}
>
<Button
title="Unblock"
size="square-md"
rounding="pill"
onclick={() => action(block)}
>
{#snippet prefix()}
<Icon src={XMark} mini size="16" />
{/snippet}
</Button>
<Entity
icon={block.site?.icon}
name={block.site?.name ?? block.instance.domain}
label={block.instance.domain}
/>
</div>
{/each}
{/snippet}
</EditableList>
{#snippet prefix()}
<Icon src={XMark} mini size="16" />
{/snippet}
</Button>
<Entity
icon={block.site?.icon}
name={block.site?.name ?? block.instance.domain}
label={block.instance.domain}
/>
</div>
{/each}
</ul>
</div>
{/if}
{#if data.community_blocks?.length > 0}
<div>
<SectionTitle>{$t('content.communities')}</SectionTitle>
<EditableList on:action={(i) => unblockCommunity(i.detail)}>
{#snippet children({ action })}
{#each data.community_blocks as block (block.community.id)}
<div
class="flex flex-row gap-2 items-center py-2"
animate:flip={{ duration: 250 }}
out:slide|global={{ axis: 'y', easing: expoOut, duration: 300 }}
<ul>
{#each data.community_blocks as block (block.community.id)}
<div
class="flex flex-row gap-2 items-center py-2"
animate:flip={{ duration: 250 }}
out:slide|global={{ axis: 'y', easing: expoOut, duration: 300 }}
>
<Button
title="Unblock"
size="square-md"
rounding="pill"
onclick={() => unblockCommunity(block)}
>
<Button
title="Unblock"
size="square-md"
rounding="pill"
onclick={() => action(block)}
>
{#snippet prefix()}
<Icon src={XMark} mini size="16" />
{/snippet}
</Button>
<CommunityLink community={block.community} avatar />
</div>
{/each}
{/snippet}
</EditableList>
{#snippet prefix()}
<Icon src={XMark} mini size="16" />
{/snippet}
</Button>
<CommunityLink community={block.community} avatar />
</div>
{/each}
</ul>
</div>
{/if}
{#if data.person_blocks?.length > 0}
<div>
<SectionTitle>{$t('content.users')}</SectionTitle>
<EditableList on:action={(i) => unblockUser(i.detail)}>
{#snippet children({ action })}
{#each data.person_blocks as block (block.target.id)}
<div
class="flex flex-row gap-2 items-center py-2"
animate:flip={{ duration: 250 }}
out:slide|global={{ axis: 'y', easing: expoOut, duration: 300 }}
<ul>
{#each data.person_blocks as block (block.target.id)}
<div
class="flex flex-row gap-2 items-center py-2"
animate:flip={{ duration: 250 }}
out:slide|global={{ axis: 'y', easing: expoOut, duration: 300 }}
>
<Button
title="Unblock"
size="square-md"
rounding="pill"
onclick={() => unblockUser(block)}
>
<Button
title="Unblock"
size="square-md"
rounding="pill"
onclick={() => action(block)}
>
{#snippet prefix()}
<Icon src={XMark} mini size="16" />
{/snippet}
</Button>
<UserLink user={block.target} avatar badges />
</div>
{/each}
{/snippet}
</EditableList>
{#snippet prefix()}
<Icon src={XMark} mini size="16" />
{/snippet}
</Button>
<UserLink user={block.target} avatar badges />
</div>
{/each}
</ul>
</div>
{/if}
{:else}
@@ -99,9 +99,9 @@
<Modal
bind:open={deletion.modal}
action="Submit"
on:action={() => deleteAccount(4)}
onaction={() => deleteAccount(4)}
>
{#snippet title()}
{#snippet customTitle()}
<span>{$t('form.profile.deleteAccount.label')}</span>
{/snippet}
<TextInput
+1 -1
View File
@@ -17,7 +17,7 @@
<div animate:flip={{ duration: 500, easing: expoInOut }}>
<PictrsImage
image={image.local_image}
on:delete={() => {
ondelete={() => {
data.images = data.images.toSpliced(
data.images.findIndex(
(i) =>
+3 -4
View File
@@ -11,8 +11,6 @@
import { createEventDispatcher } from 'svelte'
import { ArrowDown, ArrowDownTray, Icon, Trash } from 'svelte-hero-icons'
const dispatch = createEventDispatcher<{ delete: boolean }>()
let loading = $state(false)
async function deleteImage(image: LocalImage) {
@@ -25,7 +23,7 @@
filename: image.pictrs_alias,
})
dispatch('delete', res)
ondelete?.(res)
} catch (e) {
toast({ content: e as any, type: 'error' })
}
@@ -34,9 +32,10 @@
interface Props {
image: LocalImage
ondelete?: (res: boolean) => void
}
let { image }: Props = $props()
let { image, ondelete }: Props = $props()
</script>
<div class="flex flex-col gap-1">
+2 -2
View File
@@ -139,8 +139,8 @@
jwt={$profile?.jwt}
listing_type={'All'}
showWhenEmpty={true}
on:select={(c) =>
searchParam(page.url, 'community', c.detail?.id || undefined, 'page')}
onselect={(c) =>
searchParam(page.url, 'community', c?.id || undefined, 'page')}
/>
</div>
{/if}
+1 -1
View File
@@ -91,7 +91,7 @@
{#if importing}
<Modal
bind:open={importing}
on:action={() => {
onaction={() => {
try {
if (importText == '') {
throw new Error('Import is empty')
+1 -1
View File
@@ -34,7 +34,7 @@
{#if importing}
<Modal
bind:open={importing}
on:action={() => {
onaction={() => {
try {
if (importText == '') {
throw new Error('Import is empty')