cleanup: tweak some designs in admin (#500)
* fix: application route constantly reloading * misc: tweak applications designs * misc: tweak team designs
This commit is contained in:
1 parent
81662e6f6d
commit
ced6d62934
4 files changed
+68
-20
No files matched your search
@@ -8,24 +8,37 @@
|
|||||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||||
import { t } from '$lib/translations'
|
import { t } from '$lib/translations'
|
||||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||||
|
import { Option, Select } from 'mono-svelte'
|
||||||
|
|
||||||
let { data } = $props()
|
let { data } = $props()
|
||||||
|
|
||||||
|
let selectForm = $state<HTMLFormElement>()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<Header pageHeader>{$t('routes.admin.applications.title')}</Header>
|
<Header pageHeader>{$t('routes.admin.applications.title')}</Header>
|
||||||
<MultiSelect
|
<!-- <MultiSelect
|
||||||
options={[false, true]}
|
options={[false, true]}
|
||||||
selected={data.unreadOnly ?? true}
|
selected={data.unreadOnly ?? true}
|
||||||
optionNames={[$t('filter.location.all'), $t('filter.unread')]}
|
optionNames={[$t('filter.location.all'), $t('filter.unread')]}
|
||||||
onselect={(e) => searchParam(page.url, 'unreadOnly', e.toString(), 'page')}
|
onselect={(e) => searchParam(page.url, 'unreadOnly', e.toString(), 'page')}
|
||||||
/>
|
/> -->
|
||||||
{#if data.applications && data.applications.length > 0}
|
<form bind:this={selectForm} action="/admin/applications" class="w-max">
|
||||||
|
<Select
|
||||||
|
name="unreadOnly"
|
||||||
|
onchange={() => selectForm?.requestSubmit?.()}
|
||||||
|
label={$t('filter.filter')}
|
||||||
|
>
|
||||||
|
<Option value="false">{$t('filter.location.all')}</Option>
|
||||||
|
<Option value="true">{$t('filter.unread')}</Option>
|
||||||
|
</Select>
|
||||||
|
</form>
|
||||||
|
{#if data.applications?.value && data.applications?.value.length > 0}
|
||||||
<div class="flex flex-col gap-4">
|
<div class="flex flex-col gap-4">
|
||||||
{#each data.applications as application (application.registration_application.id)}
|
{#each data.applications?.value as application (application.registration_application.id)}
|
||||||
<Application {application} />
|
<Application {application} />
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
{#if data.applications.length >= 40}
|
{#if data.applications?.value.length >= 40}
|
||||||
<div class="mt-auto">
|
<div class="mt-auto">
|
||||||
<Pageination page={data.page} href={(page) => `?page=${page}`} />
|
<Pageination page={data.page} href={(page) => `?page=${page}`} />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { profile } from '$lib/auth.svelte'
|
import { profile } from '$lib/auth.svelte'
|
||||||
import { getClient } from '$lib/lemmy.svelte.js'
|
import { getClient } from '$lib/lemmy.svelte.js'
|
||||||
|
import { ReactiveState } from '$lib/promise.svelte.js'
|
||||||
import { get } from 'svelte/store'
|
import { get } from 'svelte/store'
|
||||||
|
|
||||||
export async function load({ data, fetch, url }) {
|
export async function load({ data, fetch, url }) {
|
||||||
@@ -20,6 +21,6 @@ export async function load({ data, fetch, url }) {
|
|||||||
return {
|
return {
|
||||||
unreadOnly: unreadOnly,
|
unreadOnly: unreadOnly,
|
||||||
page: page,
|
page: page,
|
||||||
applications: res.registration_applications,
|
applications: new ReactiveState(res.registration_applications),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,11 +9,19 @@
|
|||||||
RegistrationApplicationView,
|
RegistrationApplicationView,
|
||||||
} from 'lemmy-js-client'
|
} from 'lemmy-js-client'
|
||||||
import { Button } from 'mono-svelte'
|
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 RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||||
import { publishedToDate } from '$lib/components/util/date'
|
import { publishedToDate } from '$lib/components/util/date'
|
||||||
import ApplicationDenyModal from '$lib/components/lemmy/modal/ApplicationDenyModal.svelte'
|
import ApplicationDenyModal from '$lib/components/lemmy/modal/ApplicationDenyModal.svelte'
|
||||||
import { t } from '$lib/translations'
|
import { t } from '$lib/translations'
|
||||||
|
import { removalTemplate } from '$lib/components/lemmy/moderation/moderation'
|
||||||
|
import { fullCommunityName } from '$lib/util.svelte'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
application: RegistrationApplicationView
|
application: RegistrationApplicationView
|
||||||
@@ -86,31 +94,44 @@
|
|||||||
user={application.creator}
|
user={application.creator}
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
<Material class="flex flex-col gap-2">
|
<Material color="uniform" rounding="xl" class="flex flex-col gap-2">
|
||||||
<div class="flex flex-col gap-1">
|
<div class="flex flex-col gap-2">
|
||||||
<span class="text-slate-600 dark:text-zinc-400">
|
<span class="text-slate-600 dark:text-zinc-400 text-xs">
|
||||||
<RelativeDate
|
<RelativeDate
|
||||||
date={publishedToDate(application.registration_application.published)}
|
date={publishedToDate(application.registration_application.published)}
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<SectionTitle>{$t('routes.admin.applications.user')}</SectionTitle>
|
|
||||||
<span class="text-sm">
|
<span class="text-sm">
|
||||||
<UserLink user={application.creator} avatar avatarSize={20} />
|
<UserLink user={application.creator} avatar avatarSize={20} />
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<SectionTitle>Application</SectionTitle>
|
<Material
|
||||||
|
color="uniform"
|
||||||
|
rounding="xl"
|
||||||
|
padding="none"
|
||||||
|
class="dark:bg-zinc-925 p-3 py-2"
|
||||||
|
>
|
||||||
<p>{application.registration_application.answer}</p>
|
<p>{application.registration_application.answer}</p>
|
||||||
|
</Material>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="flex flex-row gap-1">
|
||||||
<div class="flex flex-col md:flex-row gap-2 md:items-center">
|
<div class="flex flex-col md:flex-row gap-2 md:items-center">
|
||||||
{#if application.admin}
|
{#if application.admin}
|
||||||
|
{@const accepted = application.creator_local_user.accepted_application}
|
||||||
{#if typeof application.registration_application.deny_reason !== 'undefined' && application.registration_application.deny_reason !== ''}
|
{#if typeof application.registration_application.deny_reason !== 'undefined' && application.registration_application.deny_reason !== ''}
|
||||||
<div>
|
<div>
|
||||||
<div class="flex items-center gap-1 text-sm">
|
<div class="flex items-center gap-1 text-sm">
|
||||||
|
<Icon
|
||||||
|
src={accepted ? ShieldCheck : ShieldExclamation}
|
||||||
|
mini
|
||||||
|
size="20"
|
||||||
|
class={accepted ? 'text-green-400' : 'text-red-400'}
|
||||||
|
/>
|
||||||
<UserLink avatar user={application.admin} />
|
<UserLink avatar user={application.admin} />
|
||||||
<SectionTitle>
|
<SectionTitle>
|
||||||
{application.creator_local_user.accepted_application
|
{accepted
|
||||||
? $t('routes.admin.applications.approved')
|
? $t('routes.admin.applications.approved')
|
||||||
: $t('routes.admin.applications.denied')}
|
: $t('routes.admin.applications.denied')}
|
||||||
</SectionTitle>
|
</SectionTitle>
|
||||||
@@ -121,9 +142,15 @@
|
|||||||
<div class="md:ml-auto"></div>
|
<div class="md:ml-auto"></div>
|
||||||
{:else}
|
{:else}
|
||||||
<div class="flex items-center gap-1 text-sm">
|
<div class="flex items-center gap-1 text-sm">
|
||||||
|
<Icon
|
||||||
|
src={accepted ? ShieldCheck : ShieldExclamation}
|
||||||
|
mini
|
||||||
|
size="20"
|
||||||
|
class={accepted ? 'text-green-400' : 'text-red-400'}
|
||||||
|
/>
|
||||||
<UserLink avatar user={application.admin} />
|
<UserLink avatar user={application.admin} />
|
||||||
<SectionTitle>
|
<SectionTitle>
|
||||||
{application.creator_local_user.accepted_application
|
{accepted
|
||||||
? $t('routes.admin.applications.approved')
|
? $t('routes.admin.applications.approved')
|
||||||
: $t('routes.admin.applications.denied')}
|
: $t('routes.admin.applications.denied')}
|
||||||
</SectionTitle>
|
</SectionTitle>
|
||||||
@@ -131,7 +158,8 @@
|
|||||||
<div class="md:ml-auto"></div>
|
<div class="md:ml-auto"></div>
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
<div class="ml-auto self-end">
|
</div>
|
||||||
|
<div class="flex-1"></div>
|
||||||
<Button
|
<Button
|
||||||
size="square-md"
|
size="square-md"
|
||||||
class="hover:bg-slate-200 {application.creator_local_user
|
class="hover:bg-slate-200 {application.creator_local_user
|
||||||
@@ -144,7 +172,7 @@
|
|||||||
disabled={approving || denying || reviewing}
|
disabled={approving || denying || reviewing}
|
||||||
>
|
>
|
||||||
{#snippet prefix()}
|
{#snippet prefix()}
|
||||||
<Icon src={XMark} mini size="16" />
|
<Icon src={XMark} micro size="16" />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
@@ -159,9 +187,8 @@
|
|||||||
disabled={approving || denying || reviewing}
|
disabled={approving || denying || reviewing}
|
||||||
>
|
>
|
||||||
{#snippet prefix()}
|
{#snippet prefix()}
|
||||||
<Icon src={Check} mini size="16" />
|
<Icon src={Check} micro size="16" />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</Material>
|
</Material>
|
||||||
@@ -103,9 +103,16 @@
|
|||||||
class="flex-1"
|
class="flex-1"
|
||||||
pattern={'@[^ |]{1,}'}
|
pattern={'@[^ |]{1,}'}
|
||||||
/>
|
/>
|
||||||
<Button loading={adding} disabled={adding} size="md" class="h-full" submit>
|
<Button
|
||||||
|
loading={adding}
|
||||||
|
disabled={adding}
|
||||||
|
rounding="xl"
|
||||||
|
color="primary"
|
||||||
|
class="h-full"
|
||||||
|
submit
|
||||||
|
>
|
||||||
{#snippet prefix()}
|
{#snippet prefix()}
|
||||||
<Icon src={Plus} mini size="16" />
|
<Icon src={Plus} micro size="16" />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
{$t('common.add')}
|
{$t('common.add')}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
Reference in new issue
Block a user