diff --git a/src/routes/admin/applications/+page.svelte b/src/routes/admin/applications/+page.svelte index 132aa8ec..0f9d4756 100644 --- a/src/routes/admin/applications/+page.svelte +++ b/src/routes/admin/applications/+page.svelte @@ -8,24 +8,37 @@ import MultiSelect from '$lib/components/input/Switch.svelte' import { t } from '$lib/translations' import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { Option, Select } from 'mono-svelte' let { data } = $props() + + let selectForm = $state()
{$t('routes.admin.applications.title')}
- searchParam(page.url, 'unreadOnly', e.toString(), 'page')} -/> -{#if data.applications && data.applications.length > 0} +/> --> +
+ +
+{#if data.applications?.value && data.applications?.value.length > 0}
- {#each data.applications as application (application.registration_application.id)} + {#each data.applications?.value as application (application.registration_application.id)} {/each}
- {#if data.applications.length >= 40} + {#if data.applications?.value.length >= 40}
`?page=${page}`} />
diff --git a/src/routes/admin/applications/+page.ts b/src/routes/admin/applications/+page.ts index 6b730aa4..ae49b35c 100644 --- a/src/routes/admin/applications/+page.ts +++ b/src/routes/admin/applications/+page.ts @@ -1,5 +1,6 @@ import { profile } from '$lib/auth.svelte' import { getClient } from '$lib/lemmy.svelte.js' +import { ReactiveState } from '$lib/promise.svelte.js' import { get } from 'svelte/store' export async function load({ data, fetch, url }) { @@ -20,6 +21,6 @@ export async function load({ data, fetch, url }) { return { unreadOnly: unreadOnly, page: page, - applications: res.registration_applications, + applications: new ReactiveState(res.registration_applications), } } diff --git a/src/routes/admin/applications/Application.svelte b/src/routes/admin/applications/Application.svelte index 34f63460..1389ac65 100644 --- a/src/routes/admin/applications/Application.svelte +++ b/src/routes/admin/applications/Application.svelte @@ -9,11 +9,19 @@ RegistrationApplicationView, } from 'lemmy-js-client' import { Button } from 'mono-svelte' - import { Check, Icon, XMark } from 'svelte-hero-icons' + import { + Check, + Icon, + ShieldCheck, + ShieldExclamation, + XMark, + } from 'svelte-hero-icons' import RelativeDate from '$lib/components/util/RelativeDate.svelte' import { publishedToDate } from '$lib/components/util/date' import ApplicationDenyModal from '$lib/components/lemmy/modal/ApplicationDenyModal.svelte' import { t } from '$lib/translations' + import { removalTemplate } from '$lib/components/lemmy/moderation/moderation' + import { fullCommunityName } from '$lib/util.svelte' interface Props { application: RegistrationApplicationView @@ -86,82 +94,101 @@ user={application.creator} /> {/if} - -
- + +
+ - {$t('routes.admin.applications.user')}
- Application -

{application.registration_application.answer}

+ +

{application.registration_application.answer}

+
-
- {#if application.admin} - {#if typeof application.registration_application.deny_reason !== 'undefined' && application.registration_application.deny_reason !== ''} -
+
+
+ {#if application.admin} + {@const accepted = application.creator_local_user.accepted_application} + {#if typeof application.registration_application.deny_reason !== 'undefined' && application.registration_application.deny_reason !== ''} +
+
+ + + + {accepted + ? $t('routes.admin.applications.approved') + : $t('routes.admin.applications.denied')} + + : +
+

{application.registration_application.deny_reason}

+
+
+ {:else}
+ - {application.creator_local_user.accepted_application + {accepted ? $t('routes.admin.applications.approved') : $t('routes.admin.applications.denied')} - :
-

{application.registration_application.deny_reason}

-
-
- {:else} -
- - - {application.creator_local_user.accepted_application - ? $t('routes.admin.applications.approved') - : $t('routes.admin.applications.denied')} - -
-
+
+ {/if} {/if} - {/if} -
- -
+
+ +
diff --git a/src/routes/admin/team/+page.svelte b/src/routes/admin/team/+page.svelte index 824b0236..5e878099 100644 --- a/src/routes/admin/team/+page.svelte +++ b/src/routes/admin/team/+page.svelte @@ -103,9 +103,16 @@ class="flex-1" pattern={'@[^ |]{1,}'} /> -