migrate: change settings from a store to a state

This commit is contained in:
Xylight committed 2024-10-25 21:09:32 -07:00
1 parent ffcd9faa96
commit d597349887
128 files changed
+1010 -1144

No files matched your search

+2 -2
View File
@@ -1,5 +1,5 @@
<script>
import { notifications } from '$lib/auth'
import { notifications } from '$lib/auth.svelte'
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
import { contentPadding } from '$lib/components/ui/layout/Shell.svelte'
import { t } from '$lib/translations'
@@ -10,7 +10,7 @@
*/
/** @type {Props} */
let { children } = $props();
let { children } = $props()
</script>
{#if $notifications.applications > 0}
+1 -1
View File
@@ -1,4 +1,4 @@
import { profile } from '$lib/auth.js'
import { profile } from '$lib/auth.svelte'
import { get } from 'svelte/store'
import { getClient } from '$lib/lemmy.js'
import { site as siteStore } from '$lib/lemmy'
+2 -2
View File
@@ -2,14 +2,14 @@
import { page } from '$app/stores'
import Pageination from '$lib/components/ui/Pageination.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import { searchParam } from '$lib/util.js'
import { searchParam } from '$lib/util.svelte.js'
import { ClipboardDocumentCheck, Icon } from 'svelte-hero-icons'
import Application from './Application.svelte'
import MultiSelect from '$lib/components/input/Switch.svelte'
import { t } from '$lib/translations'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
let { data } = $props();
let { data } = $props()
</script>
<Header pageHeader>{$t('routes.admin.applications.title')}</Header>
+1 -1
View File
@@ -1,4 +1,4 @@
import { profile } from '$lib/auth.js'
import { profile } from '$lib/auth.svelte'
import { getClient } from '$lib/lemmy.js'
import { get } from 'svelte/store'
@@ -1,5 +1,5 @@
<script lang="ts">
import { notifications, profile } from '$lib/auth.js'
import { notifications, profile } from '$lib/auth.svelte.js'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import { Material, toast } from 'mono-svelte'
@@ -16,10 +16,10 @@
import { t } from '$lib/translations'
interface Props {
application: RegistrationApplicationView;
application: RegistrationApplicationView
}
let { application = $bindable() }: Props = $props();
let { application = $bindable() }: Props = $props()
let approving = $state(false)
let denying = $state(false)
@@ -52,7 +52,7 @@
try {
await getClient().approveRegistrationApplication(
registrationApplicationAnswer
registrationApplicationAnswer,
)
toast({
content: approve
@@ -144,8 +144,8 @@
disabled={approving || denying || reviewing}
>
{#snippet prefix()}
<Icon src={XMark} mini size="16" />
{/snippet}
<Icon src={XMark} mini size="16" />
{/snippet}
</Button>
<Button
size="square-md"
@@ -159,8 +159,8 @@
disabled={approving || denying || reviewing}
>
{#snippet prefix()}
<Icon src={Check} mini size="16" />
{/snippet}
<Icon src={Check} mini size="16" />
{/snippet}
</Button>
</div>
</div>
+12 -10
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { preventDefault } from 'svelte/legacy';
import { preventDefault } from 'svelte/legacy'
import { profile } from '$lib/auth.js'
import { profile } from '$lib/auth.svelte.js'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import { Label, Switch, toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
@@ -14,17 +14,19 @@
import Header from '$lib/components/ui/layout/pages/Header.svelte'
interface Props {
data: PageData;
data: PageData
}
let { data }: Props = $props();
let { data }: Props = $props()
const formData: Omit<EditSite, 'auth'> | undefined = $state(data.site
? {
...data.site.site_view.local_site,
...data.site.site_view.site,
}
: undefined)
const formData: Omit<EditSite, 'auth'> | undefined = $state(
data.site
? {
...data.site.site_view.local_site,
...data.site.site_view.site,
}
: undefined,
)
async function save() {
if (!$profile?.jwt) return
+30 -31
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { run, preventDefault } from 'svelte/legacy';
import { run, preventDefault } from 'svelte/legacy'
import { profile } from '$lib/auth.js'
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'
@@ -9,7 +9,7 @@
import { publishedToDate } from '$lib/components/util/date.js'
import { getClient } from '$lib/lemmy.js'
import { t } from '$lib/translations.js'
import { trycatch } from '$lib/util.js'
import { trycatch } from '$lib/util.svelte.js'
import type { Instance } from 'lemmy-js-client'
import {
Button,
@@ -31,7 +31,7 @@
import { expoInOut, expoOut } from 'svelte/easing'
import { slide } from 'svelte/transition'
let { data = $bindable() } = $props();
let { data = $bindable() } = $props()
let blockInstance = $state({
instance: '',
@@ -58,12 +58,12 @@
const blockedInstances =
data.federated_instances.federated_instances.blocked.map(
(i) => i.domain
(i) => i.domain,
)
const allowedInstances =
data.federated_instances.federated_instances.allowed.map(
(i) => i.domain
(i) => i.domain,
)
if (blocked) blockedInstances.push(instance)
@@ -97,11 +97,11 @@
const blockedInstances =
data.federated_instances.federated_instances.blocked.map(
(i) => i.domain
(i) => i.domain,
)
const allowedInstances =
data.federated_instances.federated_instances.allowed.map(
(i) => i.domain
(i) => i.domain,
)
return await getClient().editSite({
@@ -166,7 +166,7 @@
run(() => {
if (csv) parseCsv(csv)
});
})
</script>
<svelte:head>
@@ -182,25 +182,24 @@
{#if data.site && data.federated_instances?.federated_instances?.blocked}
<FileInput preview={false} bind:files={csv}>
{#snippet button()}
<Button class="w-max" >
<Button class="w-max">
{#snippet prefix()}
<Icon src={Plus} mini size="18" />
{/snippet}
<Icon src={Plus} mini size="18" />
{/snippet}
{$t('routes.admin.federation.csv')}
</Button>
{/snippet}
{/snippet}
{#snippet choose()}
{''}
{/snippet}
{''}
{/snippet}
</FileInput>
<div class="flex flex-col md:flex-row gap-4">
<div class="flex-1 w-full max-h-[42rem] h-full flex flex-col gap-2">
<h2 class="font-bold text-lg">{$t('routes.admin.federation.blocked')}</h2>
<form
onsubmit={preventDefault(() =>
moderateInstance(blockInstance.instance, true))}
moderateInstance(blockInstance.instance, true),
)}
class="flex flex-row gap-2"
>
<TextInput
@@ -223,7 +222,7 @@
: ''}"
>
{#if data.federated_instances.federated_instances.blocked.length > 0}
{#each data.federated_instances.federated_instances.blocked.sort( (b, a) => b.domain.localeCompare(a.domain) ) as instance (instance.id)}
{#each data.federated_instances.federated_instances.blocked.sort( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)}
<div
animate:flip={{ duration: 300, easing: expoOut }}
class="flex justify-between items-center first:pt-0 last:pb-0"
@@ -246,13 +245,13 @@
data.federated_instances.federated_instances.blocked =
data.federated_instances?.federated_instances?.blocked.filter(
(i) => i.id != instance.id
(i) => i.id != instance.id,
)
}}
>
{#snippet prefix()}
<Icon src={XMark} size="16" mini />
{/snippet}
<Icon src={XMark} size="16" mini />
{/snippet}
</Button>
</div>
{/each}
@@ -272,14 +271,13 @@
{#if allowInstance.instance || !(data.federated_instances.federated_instances.allowed?.length == 0)}
<Popover openOnHover placement="bottom-end">
{#snippet target()}
<Icon
<Icon
src={ExclamationTriangle}
solid
class="text-yellow-500"
size="20"
/>
{/snippet}
{/snippet}
<p class="font-normal">
{$t('routes.admin.federation.emptyAllow.description')}
</p>
@@ -288,7 +286,8 @@
</h2>
<form
onsubmit={preventDefault(() =>
moderateInstance(allowInstance.instance, false))}
moderateInstance(allowInstance.instance, false),
)}
class="flex flex-row gap-2"
>
<TextInput
@@ -307,7 +306,7 @@
<Material class="h-full overflow-auto" color="distinct">
<EditableList 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)}
{#each data.federated_instances.federated_instances.allowed.sort( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)}
<div
animate:flip={{ duration: 300, easing: expoOut }}
class="flex justify-between items-center first:pt-0 last:pb-0"
@@ -330,13 +329,13 @@
data.federated_instances.federated_instances.allowed =
data.federated_instances?.federated_instances?.allowed.filter(
(i) => i.id != instance.id
(i) => i.id != instance.id,
)
}}
>
{#snippet prefix()}
<Icon src={XMark} size="16" mini />
{/snippet}
<Icon src={XMark} size="16" mini />
{/snippet}
</Button>
</div>
{/each}
@@ -346,7 +345,7 @@
icon={Check}
title={$t('routes.admin.federation.emptyAllow.title')}
description={$t(
'routes.admin.federation.emptyAllow.description'
'routes.admin.federation.emptyAllow.description',
)}
/>
</div>
+1 -1
View File
@@ -1,4 +1,4 @@
import { profile } from '$lib/auth.js'
import { profile } from '$lib/auth.svelte'
import { getClient } from '$lib/lemmy.js'
import { get } from 'svelte/store'
+14 -13
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { preventDefault } from 'svelte/legacy';
import { preventDefault } from 'svelte/legacy'
import { profile } from '$lib/auth.js'
import { profile } from '$lib/auth.svelte.js'
import Markdown from '$lib/components/markdown/Markdown.svelte'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
@@ -14,9 +14,11 @@
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { t } from '$lib/translations.js'
let { data } = $props();
let { data } = $props()
let taglines = $state([...(data.site?.taglines.map((t: Tagline) => t.content) ?? [])])
let taglines = $state([
...(data.site?.taglines.map((t: Tagline) => t.content) ?? []),
])
let newTagline = $state('')
let saving = $state(false)
@@ -60,11 +62,10 @@
</Header>
<EditableList
on:action={(e) => {
taglines.splice(
taglines.findIndex((i) => i == e.detail),
1
1,
)
// hack for reactivity
@@ -72,7 +73,7 @@
}}
>
{#snippet children({ action })}
{#each taglines as tagline}
{#each taglines as tagline}
<div class="flex py-3">
<Markdown source={tagline} inline />
@@ -83,8 +84,8 @@
</div>
</div>
{/each}
{/snippet}
</EditableList>
{/snippet}
</EditableList>
<form
class="flex flex-col mt-auto gap-2 w-full"
onsubmit={preventDefault(() => {
@@ -99,8 +100,8 @@
<Button size="lg" submit>
{#snippet prefix()}
<Icon src={Plus} size="16" mini />
{/snippet}
<Icon src={Plus} size="16" mini />
{/snippet}
{$t('common.add')}
</Button>
</form>
@@ -130,8 +131,8 @@
<Button size="lg" submit>
{#snippet prefix()}
<Icon src={Plus} size="16" mini />
{/snippet}
<Icon src={Plus} size="16" mini />
{/snippet}
{$t('common.add')}
</Button>
</form>
+11 -11
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { preventDefault } from 'svelte/legacy';
import { preventDefault } from 'svelte/legacy'
import { profile } from '$lib/auth.js'
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'
@@ -9,13 +9,13 @@
import { instance } from '$lib/instance.js'
import { getClient } from '$lib/lemmy.js'
import { addAdmin } from '$lib/lemmy/user.js'
import { removeItem, trycatch } from '$lib/util.js'
import { removeItem, trycatch } from '$lib/util.svelte.js'
import { Button, TextInput } from 'mono-svelte'
import { Icon, Plus, QuestionMarkCircle, Trash } from 'svelte-hero-icons'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { t } from '$lib/translations.js'
let { data = $bindable() } = $props();
let { data = $bindable() } = $props()
let newAdmin: string = $state(''),
adding: boolean = $state(false)
@@ -33,7 +33,7 @@
getClient().addAdmin({
added: false,
person_id: id,
})
}),
)
if (result) {
@@ -48,9 +48,9 @@
<Header pageHeader>{$t('routes.admin.team.title')}</Header>
{#if data.site}
<EditableList on:action={(e) => removeAdmin(e.detail, false)}>
<EditableList on:action={(e) => removeAdmin(e.detail, false)}>
{#snippet children({ action })}
{#if data.site.admins.length <= 0}
{#if data.site.admins.length <= 0}
<Placeholder
icon={QuestionMarkCircle}
title={$t('routes.admin.team.empty.title')}
@@ -66,8 +66,8 @@
</div>
{/each}
{/if}
{/snippet}
</EditableList>
{/snippet}
</EditableList>
<form
class="flex flex-row items-center gap-2 mt-auto w-full"
onsubmit={preventDefault(() => {
@@ -98,8 +98,8 @@
/>
<Button loading={adding} disabled={adding} size="md" class="h-full" submit>
{#snippet prefix()}
<Icon src={Plus} mini size="16" />
{/snippet}
<Icon src={Plus} mini size="16" />
{/snippet}
{$t('common.add')}
</Button>
</form>