diff --git a/package.json b/package.json index 2ba12ee8..3c8fd984 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "0.7.1", + "version": "0.7.2", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/components/input/Checkbox.svelte b/src/lib/components/input/Checkbox.svelte index 0e99f373..83b8b307 100644 --- a/src/lib/components/input/Checkbox.svelte +++ b/src/lib/components/input/Checkbox.svelte @@ -1,7 +1,8 @@ diff --git a/src/routes/admin/config/+page.svelte b/src/routes/admin/config/+page.svelte index 29345f21..c951eff2 100644 --- a/src/routes/admin/config/+page.svelte +++ b/src/routes/admin/config/+page.svelte @@ -14,16 +14,12 @@ export let data: PageData - const site = { - ...data.site?.site_view.site, - } - - const local_site = { - ...data.site?.site_view.local_site, - } - const h = { - fart: 'hey', - } + const formData: Omit | undefined = data.site + ? { + ...data.site.site_view.local_site, + ...data.site.site_view.site, + } + : undefined async function save() { if (!$profile?.jwt) return @@ -34,21 +30,7 @@ try { await getClient().editSite({ auth: jwt, - name: site.name, - description: site.description, - sidebar: site.sidebar, - legal_information: local_site.legal_information, - enable_downvotes: local_site.enable_downvotes, - enable_nsfw: local_site.enable_nsfw, - registration_mode: local_site.registration_mode, - community_creation_admin_only: local_site.community_creation_admin_only, - require_email_verification: local_site.require_email_verification, - application_email_admins: local_site.application_email_admins, - reports_email_admins: local_site.reports_email_admins, - private_instance: local_site.private_instance, - hide_modlog_mod_names: local_site.hide_modlog_mod_names, - slur_filter_regex: local_site.slur_filter_regex, - federation_enabled: local_site.federation_enabled, + ...formData, }) toast({ content: 'Updated your site.', @@ -73,31 +55,23 @@

Site configuration

- {#if site} - - - - {/if} - {#if local_site} + {#if formData} + + + - { - local_site.enable_downvotes = !local_site.enable_downvotes - }} - > + Enable downvotes - { - local_site.enable_nsfw = !local_site.enable_nsfw - }} - > + Enable NSFW { // @ts-ignore - local_site.registration_mode = e.detail + formData.registration_mode = e.detail }} /> { - local_site.community_creation_admin_only = - !local_site.community_creation_admin_only - }} + bind:checked={formData.community_creation_admin_only} + defaultValue={true} > Only admins can create communities { - local_site.require_email_verification = - !local_site.require_email_verification - }} + bind:checked={formData.require_email_verification} + defaultValue={true} > Require email verification { - local_site.application_email_admins = - !local_site.application_email_admins - }} + bind:checked={formData.application_email_admins} + defaultValue={true} > Email admins on receiving new applications - { - local_site.reports_email_admins = !local_site.reports_email_admins - }} - > + Email admins on receiving new reports - { - local_site.private_instance = !local_site.private_instance - }} - > + Private instance - { - local_site.hide_modlog_mod_names = !local_site.hide_modlog_mod_names - }} - > + Hide modlog mod names - { - local_site.federation_enabled = !local_site.federation_enabled - }} - > + Federation enabled {/if}