From fcc0894a702e57af316d1fd4f1729449c3b42ad6 Mon Sep 17 00:00:00 2001 From: Neshura Date: Tue, 28 Nov 2023 12:36:43 +0000 Subject: [PATCH 1/6] Add Comment Also tests push mirror --- src/routes/admin/applications/Application.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/admin/applications/Application.svelte b/src/routes/admin/applications/Application.svelte index 147011c5..06a431d2 100644 --- a/src/routes/admin/applications/Application.svelte +++ b/src/routes/admin/applications/Application.svelte @@ -88,7 +88,7 @@ ? '!text-red-500' : ''}" aria-label="Deny" - on:click={() => review(false)} + on:click={() => review(false)/* Instead of finishing the review add a Textbox and transform the X into a "Deny"*/} loading={denying} disabled={approving || denying} > From 4aa5761378ea8d0bd52dc7cc3c460e7c9d37d3ff Mon Sep 17 00:00:00 2001 From: Neshura Date: Tue, 28 Nov 2023 20:54:22 +0100 Subject: [PATCH 2/6] Application Denial Reason Modal + Inclusion in Denial Process --- .../lemmy/modal/ApplicationDenyModal.svelte | 40 ++++++++ .../admin/applications/Application.svelte | 99 +++++++++++++------ 2 files changed, 107 insertions(+), 32 deletions(-) create mode 100644 src/lib/components/lemmy/modal/ApplicationDenyModal.svelte diff --git a/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte b/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte new file mode 100644 index 00000000..eddafaf6 --- /dev/null +++ b/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte @@ -0,0 +1,40 @@ + + + +

Deny Application

+
deny()} class="flex flex-col gap-4"> +

+ Denying 's Application +

+ + + +
diff --git a/src/routes/admin/applications/Application.svelte b/src/routes/admin/applications/Application.svelte index 06a431d2..bc5928d6 100644 --- a/src/routes/admin/applications/Application.svelte +++ b/src/routes/admin/applications/Application.svelte @@ -4,31 +4,45 @@ import SectionTitle from '$lib/components/ui/SectionTitle.svelte' import { Material, toast } from 'mono-svelte' import { getClient } from '$lib/lemmy.js' - import type { RegistrationApplicationView } from 'lemmy-js-client' + import type {ApproveRegistrationApplication, RegistrationApplicationView} from 'lemmy-js-client' import { Button } from 'mono-svelte' import { Check, Icon, 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"; export let application: RegistrationApplicationView let approving = false let denying = false + let denyReason = '' + let reviewing = false async function review(approve: boolean) { if (!$profile?.jwt) return + let registrationApplicationAnswer: ApproveRegistrationApplication = { + approve: approve, + id: application.registration_application.id, + } + if (approve) { approving = true } else { - denying = true + reviewing = true + while (reviewing) { + await new Promise(res => setTimeout(res, 1000)) + } + if (!denying) return + if (denyReason != "") { + registrationApplicationAnswer.deny_reason = denyReason + } } + + try { - await getClient().approveRegistrationApplication({ - approve: approve, - id: application.registration_application.id, - }) + await getClient().approveRegistrationApplication(registrationApplicationAnswer) toast({ content: `Successfully ${ approve ? 'approved' : 'denied' @@ -37,6 +51,7 @@ }) application.creator_local_user.accepted_application = approve application.admin = $profile.user!.local_user_view.person + application.registration_application.deny_reason = denyReason $profile.user!.notifications.applications -= 1 } catch (err) { @@ -48,9 +63,13 @@ approving = false denying = false + denyReason = '' } +{#if reviewing} + +{/if}
@@ -70,40 +89,56 @@
{#if application.admin} -
- + {#if typeof application.registration_application.deny_reason !== 'undefined' && application.registration_application.deny_reason !== ''} +
+
+ + {application.creator_local_user.accepted_application + ? 'Approved' + : 'Denied'} by + + + : +
+

{application.registration_application.deny_reason}

+
+
+ {:else} +
+ {application.creator_local_user.accepted_application - ? 'Approved' - : 'Denied'} by - - -
-
+ ? 'Approved' + : 'Denied'} by + + +
+
+ {/if} {/if}
From 6c1cf5e64f355574e8b7d2fdfb8fc343ba170f25 Mon Sep 17 00:00:00 2001 From: Neshura Date: Tue, 28 Nov 2023 20:57:33 +0100 Subject: [PATCH 3/6] Add string type on modal export let for better uniformity --- src/lib/components/lemmy/modal/ApplicationDenyModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte b/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte index eddafaf6..fed10f5c 100644 --- a/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte +++ b/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte @@ -11,7 +11,7 @@ export let denying: boolean - export let denyReason = '' + export let denyReason: string = '' let loading = false From aeb17dfc0902ea181d3b1825218cdb183d977ab1 Mon Sep 17 00:00:00 2001 From: Neshura Date: Tue, 28 Nov 2023 21:11:24 +0100 Subject: [PATCH 4/6] Fixing WebStorm's aggressive Whitespacing --- .../lemmy/modal/ApplicationDenyModal.svelte | 12 ++--- .../admin/applications/Application.svelte | 44 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte b/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte index fed10f5c..c574bfab 100644 --- a/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte +++ b/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte @@ -25,16 +25,16 @@

Deny Application

deny()} class="flex flex-col gap-4">

- Denying 's Application + Denying 's Application

diff --git a/src/routes/admin/applications/Application.svelte b/src/routes/admin/applications/Application.svelte index bc5928d6..c82a62df 100644 --- a/src/routes/admin/applications/Application.svelte +++ b/src/routes/admin/applications/Application.svelte @@ -94,8 +94,8 @@
{application.creator_local_user.accepted_application - ? 'Approved' - : 'Denied'} by + ? 'Approved' + : 'Denied'} by : @@ -107,8 +107,8 @@
{application.creator_local_user.accepted_application - ? 'Approved' - : 'Denied'} by + ? 'Approved' + : 'Denied'} by
@@ -117,28 +117,28 @@ {/if}
From b2bd6fd43cfa3c7ee4ec62a9c7116cf8fae02f8e Mon Sep 17 00:00:00 2001 From: Neshura Date: Tue, 28 Nov 2023 21:14:32 +0100 Subject: [PATCH 5/6] Make sure Buttons are always in the same position --- src/routes/admin/applications/Application.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/admin/applications/Application.svelte b/src/routes/admin/applications/Application.svelte index c82a62df..5dba4fe6 100644 --- a/src/routes/admin/applications/Application.svelte +++ b/src/routes/admin/applications/Application.svelte @@ -115,7 +115,7 @@
{/if} {/if} -
+