diff --git a/src/lib/components/lemmy/modal/ImageUploadModal.svelte b/src/lib/components/lemmy/modal/ImageUploadModal.svelte index dc22146d..fe9fb164 100644 --- a/src/lib/components/lemmy/modal/ImageUploadModal.svelte +++ b/src/lib/components/lemmy/modal/ImageUploadModal.svelte @@ -1,51 +1,117 @@ - Upload image +
Upload image
+ {#if progress != 1} +
+ +
+ {/if}
- - diff --git a/src/lib/components/lemmy/post/PostForm.svelte b/src/lib/components/lemmy/post/PostForm.svelte index e4b8c2e7..f5a79185 100644 --- a/src/lib/components/lemmy/post/PostForm.svelte +++ b/src/lib/components/lemmy/post/PostForm.svelte @@ -219,8 +219,9 @@ {#await import('$lib/components/lemmy/modal/ImageUploadModal.svelte') then { default: UploadModal }} { - if (e.detail) data.url = e.detail + if (e.detail) data.url = e.detail[0] uploadingImage = false }} /> diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index ed7f976f..56219cc2 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -16,6 +16,7 @@ ListBullet, Photo, } from 'svelte-hero-icons' + import ImageUploadModal from '../lemmy/modal/ImageUploadModal.svelte' export let images: boolean = true export let value: string = '' @@ -62,40 +63,7 @@ } let uploadingImage = false - let loading = false let image: any - $: previewURL = image?.length - ? URL.createObjectURL(image[0]) - : image - ? URL.createObjectURL(image) - : '' - - async function upload() { - if (!$profile?.jwt || !image) return - - loading = true - - try { - const uploaded = await uploadImage( - image instanceof FileList ? image[0] : image, - $profile.instance, - $profile.jwt - ) - - if (!uploaded) throw new Error('Image upload returned undefined') - - wrapSelection(`![](${uploaded})`, '') - - uploadingImage = false - } catch (err) { - toast({ - content: err as any, - type: 'error', - }) - } - - loading = false - } export let previewing = false @@ -114,49 +82,15 @@ {#if uploadingImage && images} - - Upload image -
-
- -
- -
-
+ { + e.detail.forEach((i) => { + wrapSelection(`![](${i})\n\n`, '') + }) + }} + /> {/if}
diff --git a/src/lib/components/ui/ProgressBar.svelte b/src/lib/components/ui/ProgressBar.svelte new file mode 100644 index 00000000..203a7391 --- /dev/null +++ b/src/lib/components/ui/ProgressBar.svelte @@ -0,0 +1,15 @@ + + +
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 2a0799fb..140c7d4a 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -135,6 +135,7 @@ "nsfw": "NSFW", "generateTitle": "Generate Title", "uploadImage": "Upload Image", + "selectFile": "Select a file", "altText": "Alt Text" }, "profile": { diff --git a/src/routes/admin/config/+page.svelte b/src/routes/admin/config/+page.svelte index d4386b65..bbda68f1 100644 --- a/src/routes/admin/config/+page.svelte +++ b/src/routes/admin/config/+page.svelte @@ -82,7 +82,7 @@ class="flex flex-col gap-4 bg-white dark:bg-black border border-slate-300 dark:border-zinc-800 p-4 w-full h-32 rounded-xl" > {#if formData.icon} - + {:else} (uploading.icon = false)} + multiple={false} + on:upload={(uploaded) => { + uploading.icon = false + formData.icon = uploaded.detail[0] + }} /> {/if}
@@ -107,7 +110,7 @@ class="flex flex-col gap-4 bg-white dark:bg-black border border-slate-300 dark:border-zinc-800 p-4 w-full h-32 rounded-xl" > {#if formData.banner} - + {:else} (uploading.banner = false)} + multiple={false} + on:upload={(uploaded) => { + uploading.banner = false + formData.banner = uploaded.detail[0] + }} /> {/if}