From 95e2dec1390f140cab91c4abbcd50ca5ddcb1b00 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Wed, 5 Feb 2025 19:38:58 -0800 Subject: [PATCH] cleanup: remove editable list --- src/lib/components/ui/SectionTitle.svelte | 2 +- src/routes/admin/federation/+page.svelte | 2 +- .../(local_user)/blocks/+layout.svelte | 15 -- .../profile/(local_user)/blocks/+page.svelte | 165 ++++++++++-------- 4 files changed, 93 insertions(+), 91 deletions(-) delete mode 100644 src/routes/profile/(local_user)/blocks/+layout.svelte diff --git a/src/lib/components/ui/SectionTitle.svelte b/src/lib/components/ui/SectionTitle.svelte index 4b44474a..d6c64519 100644 --- a/src/lib/components/ui/SectionTitle.svelte +++ b/src/lib/components/ui/SectionTitle.svelte @@ -9,6 +9,6 @@ let { small = false, class: clazz = '', children, ...rest }: Props = $props() - + {@render children?.()} diff --git a/src/routes/admin/federation/+page.svelte b/src/routes/admin/federation/+page.svelte index b6748b79..09417d0c 100644 --- a/src/routes/admin/federation/+page.svelte +++ b/src/routes/admin/federation/+page.svelte @@ -118,7 +118,7 @@ saving = false } - let csv: FileList | null = $state() + let csv = $state() async function parseCsv(files: FileList) { if (!(files.length > 0)) return diff --git a/src/routes/profile/(local_user)/blocks/+layout.svelte b/src/routes/profile/(local_user)/blocks/+layout.svelte deleted file mode 100644 index 56b27f31..00000000 --- a/src/routes/profile/(local_user)/blocks/+layout.svelte +++ /dev/null @@ -1,15 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/routes/profile/(local_user)/blocks/+page.svelte b/src/routes/profile/(local_user)/blocks/+page.svelte index 43b0dbfc..dd091e9d 100644 --- a/src/routes/profile/(local_user)/blocks/+page.svelte +++ b/src/routes/profile/(local_user)/blocks/+page.svelte @@ -20,6 +20,8 @@ import Switch from '$lib/components/input/Switch.svelte' import UserAutocomplete from '$lib/components/lemmy/user/UserAutocomplete.svelte' import { expoOut } from 'svelte/easing' + import Material from 'mono-svelte/materials/Material.svelte' + import Header from '$lib/components/ui/layout/pages/Header.svelte' interface Props { // sveltekit doesn't feel like making types work right now @@ -85,87 +87,102 @@ } +
+ {$t('routes.profile.blocks.title')} +
+ {#if data.community_blocks?.length > 0 || data.person_blocks?.length > 0 || (data.my_user?.instance_blocks?.length ?? 0) > 0} - {#if data.my_user?.instance_blocks && (data.my_user?.instance_blocks?.length ?? 0) > 0} -
- {$t('content.instances')} -
    - {#each data.my_user?.instance_blocks as block (block.instance.id)} -
    - - -
    - {/each} -
-
- {/if} {#if data.community_blocks?.length > 0} -
+
{$t('content.communities')} -
    - {#each data.community_blocks as block (block.community.id)} -
    - - -
    - {/each} -
+ +
    + {#each data.community_blocks as block (block.community.id)} +
    + + +
    + {/each} +
+
{/if} {#if data.person_blocks?.length > 0} -
+
{$t('content.users')} -
    - {#each data.person_blocks as block (block.target.id)} -
    - - -
    - {/each} -
+ +
    + {#each data.person_blocks as block (block.target.id)} +
    + + +
    + {/each} +
+
+
+ {/if} + {#if data.my_user?.instance_blocks && (data.my_user?.instance_blocks?.length ?? 0) > 0} +
+ + {$t('content.instances')} + + +
    + {#each data.my_user?.instance_blocks as block (block.instance.id)} +
    + + +
    + {/each} +
+
{/if} {:else}