From 7fa3b60bd43371af708db936de3cf14790a53b94 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 23 Aug 2025 11:32:59 -0700 Subject: [PATCH 01/20] impr: rewrite image upload handling --- .../ImageAttachForm.svelte} | 125 ++++++++---------- .../components/form/ImageInputModal.svelte | 69 ++++++++++ .../components/form/ImageInputUpload.svelte | 26 ++-- .../lemmy/post/form/PostForm.svelte | 8 +- .../components/markdown/MarkdownEditor.svelte | 23 ++-- src/lib/i18n/en.json | 3 +- src/lib/mono/modal/Modal.svelte | 8 +- src/routes/admin/config/+page.svelte | 97 +++----------- .../(local_user)/settings/+page.svelte | 50 +++---- src/routes/profile/+layout.svelte | 5 +- src/routes/profile/+page.svelte | 72 +--------- 11 files changed, 200 insertions(+), 286 deletions(-) rename src/lib/components/{lemmy/modal/ImageUploadModal.svelte => form/ImageAttachForm.svelte} (55%) create mode 100644 src/lib/components/form/ImageInputModal.svelte diff --git a/src/lib/components/lemmy/modal/ImageUploadModal.svelte b/src/lib/components/form/ImageAttachForm.svelte similarity index 55% rename from src/lib/components/lemmy/modal/ImageUploadModal.svelte rename to src/lib/components/form/ImageAttachForm.svelte index acf2c09c..7547917b 100644 --- a/src/lib/components/lemmy/modal/ImageUploadModal.svelte +++ b/src/lib/components/form/ImageAttachForm.svelte @@ -1,17 +1,15 @@ - - {#snippet customTitle()} - Upload image - {/snippet} - {#if progress != 1} - - - - {/if} - { - e.preventDefault() - upload() - }} - > - + + +{/if} + { + e.preventDefault() + upload() + }} +> + - {#if previewURLs} - - {#each previewURLs as file} - URL.revokeObjectURL(file)} - alt={file} - class="w-full rounded-md h-full object-cover transition-all + > + {#each previewURLs as file} + URL.revokeObjectURL(file)} + alt={file} + class="w-full rounded-md h-full object-cover transition-all border border-slate-200 dark:border-zinc-800 ring-1 ring-slate-50 dark:ring-zinc-950 bg-white dark:bg-zinc-950" - /> - {/each} - - {:else} - - - {$t('form.post.selectFile')} - - {/if} - - - - Upload - - - + > + + {$t('form.post.selectFile')} + + {/if} + + + + Upload + + diff --git a/src/lib/components/form/ImageInputModal.svelte b/src/lib/components/form/ImageInputModal.svelte new file mode 100644 index 00000000..d93b1456 --- /dev/null +++ b/src/lib/components/form/ImageInputModal.svelte @@ -0,0 +1,69 @@ + + + + + + + { + passedImageUrl = undefined + open = false + }} + size="xs" + rounding="xl" + > + {$t('common.remove')} + + + + {#if customUrl} + { + e.preventDefault() + if (!imageUrl) throw new Error('missing imageurl') + + if (URL.canParse != undefined) { + if (!URL.canParse(imageUrl)) throw new Error('invalid URL') + } + + passedImageUrl = imageUrl + open = false + }} + class="contents" + > + + + {$t('form.submit')} + + + {:else} + { + open = false + passedImageUrl = uploaded[0] + }} + /> + {/if} + diff --git a/src/lib/components/form/ImageInputUpload.svelte b/src/lib/components/form/ImageInputUpload.svelte index cf4d1b1e..1218d718 100644 --- a/src/lib/components/form/ImageInputUpload.svelte +++ b/src/lib/components/form/ImageInputUpload.svelte @@ -1,11 +1,18 @@ @@ -43,15 +50,6 @@ {$t('common.attach')}
- {JSON.stringify(my_user, undefined, 4)} -
- - {totpEnabled ? $t('common.enabled') : $t('common.disabled')} - -
- {$t('routes.profile.delete.warning')} -
- {$t('settings.app.lang.description')} - - {$t('settings.app.lang.credits')} - -
- {#if settings.view == 'cozy'} - {$t('settings.app.view.cozy')} - {:else if settings.view == 'compact'} - {$t('settings.app.view.compact')} - {/if} -
{$t('settings.lemmy.hideSubmissions.description')}
{$t('settings.moderation.replyPresets.description')}
{'{{reason}}'}
{'{{post}}'}
{'{{community}}'}
{'{{username}}'}
+ {$t('settings.app.lang.description')} + + {$t('settings.app.lang.credits')} + +
+ {#if settings.view == 'cozy'} + {$t('settings.app.view.cozy')} + {:else if settings.view == 'compact'} + {$t('settings.app.view.compact')} + {/if} +
+
{@render children?.()}