Add image uploads to classifieds

src/app/components/ClassifiedCreate.svelte

@@ -1,25 +1,25 @@
 <script lang="ts">
-  import {writable} from "svelte/store"
   import {makeEvent, CLASSIFIED} from "@welshman/util"
   import {publishThunk} from "@welshman/app"
   import {isMobile, preventDefault} from "@lib/html"
-  import Paperclip from "@assets/icons/paperclip-2.svg?dataurl"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Field from "@lib/components/Field.svelte"
   import Button from "@lib/components/Button.svelte"
+  import Spinner from "@lib/components/Spinner.svelte"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
+  import ImagesInput from "@lib/components/ImagesInput.svelte"
   import CurrencyInput from "@app/components/CurrencyInput.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
   import {pushToast} from "@app/util/toast"
   import {PROTECTED} from "@app/core/state"
   import {makeEditor} from "@app/editor"
-  import {canEnforceNip70} from "@app/core/commands"
+  import {canEnforceNip70, uploadFile} from "@app/core/commands"
 
   type Props = {
     url: string
@@ -30,14 +30,10 @@
 
   const shouldProtect = canEnforceNip70(url)
 
-  const uploading = writable(false)
-
   const back = () => history.back()
 
-  const selectFiles = () => editor.then(ed => ed.commands.selectFiles())
-
   const submit = async () => {
-    if ($uploading) return
+    loading = true
 
     if (!title) {
       return pushToast({
@@ -52,33 +48,62 @@
     if (!content.trim()) {
       return pushToast({
         theme: "error",
-        message: "Please provide a message for your listing.",
+        message: "Please provide a description for your listing.",
       })
     }
 
-    const tags = [...ed.storage.nostr.getEditorTags(), ["title", title]]
+    const tags = [...ed.storage.nostr.getEditorTags(), ["summary", content], ["title", title]]
 
-    if (await shouldProtect) {
-      tags.push(PROTECTED)
+    try {
+      if (await shouldProtect) {
+        tags.push(PROTECTED)
+      }
+
+      if (h) {
+        tags.push(["h", h])
+      }
+
+      for (const image of images) {
+        if (typeof image === "string") {
+          tags.push(["image", image])
+        } else {
+          const {result, error} = await uploadFile(image, {url})
+
+          if (error) {
+            return pushToast({
+              theme: "error",
+              message: `Failed to upload file ${image.name}`,
+            })
+          }
+
+          if (result) {
+            tags.push(["image", result.url])
+          }
+        }
+      }
+
+      publishThunk({
+        relays: [url],
+        event: makeEvent(CLASSIFIED, {content, tags}),
+      })
+
+      history.back()
+    } finally {
+      loading = false
     }
-
-    if (h) {
-      tags.push(["h", h])
-    }
-
-    publishThunk({
-      relays: [url],
-      event: makeEvent(CLASSIFIED, {content, tags}),
-    })
-
-    history.back()
   }
 
-  const editor = makeEditor({url, submit, uploading, placeholder: "What's on your mind?"})
+  const editor = makeEditor({
+    url,
+    submit,
+    placeholder: "Provide a detailed description for your listing.",
+  })
 
   let title = $state("")
+  let loading = $state(false)
   let currencyCode = $state("SAT")
   let currencyAmount = $state(0)
+  let images = $state<(string | File)[]>([])
 </script>
 
 <Modal tag="form" onsubmit={preventDefault(submit)}>
@@ -129,29 +154,21 @@
       </Field>
       <Field>
         {#snippet label()}
-          <p>Images</p>
+          <p>Images (optional)</p>
         {/snippet}
         {#snippet input()}
-          todo: attach multiple images
+          <ImagesInput bind:value={images} />
         {/snippet}
       </Field>
-      <Button
-        data-tip="Add an image"
-        class="tooltip tooltip-left absolute bottom-1 right-2"
-        onclick={selectFiles}>
-        {#if $uploading}
-          <span class="loading loading-spinner loading-xs"></span>
-        {:else}
-          <Icon icon={Paperclip} size={3} />
-        {/if}
-      </Button>
     </div>
   </ModalBody>
   <ModalFooter>
-    <Button class="btn btn-link" onclick={back}>
+    <Button class="btn btn-link" onclick={back} disabled={loading}>
       <Icon icon={AltArrowLeft} />
       Go back
     </Button>
-    <Button type="submit" class="btn btn-primary">Create Listing</Button>
+    <Button type="submit" class="btn btn-primary" disabled={loading}>
+      <Spinner {loading}>Create Listing</Spinner>
+    </Button>
   </ModalFooter>
 </Modal>

src/app/components/ClassifiedItem.svelte

@@ -1,8 +1,9 @@
 <script lang="ts">
   import {formatTimestamp} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
-  import {getTagValue} from "@welshman/util"
+  import {getTagValue, getTagValues} from "@welshman/util"
   import Link from "@lib/components/Link.svelte"
+  import ContentLinkBlock from "@app/components/ContentLinkBlock.svelte"
   import Content from "@app/components/Content.svelte"
   import ProfileLink from "@app/components/ProfileLink.svelte"
   import ClassifiedActions from "@app/components/ClassifiedActions.svelte"
@@ -18,6 +19,7 @@
 
   const title = getTagValue("title", event.tags)
   const h = getTagValue("h", event.tags)
+  const images = getTagValues("image", event.tags)
 </script>
 
 <Link
@@ -36,6 +38,11 @@
     </p>
   {/if}
   <Content {event} {url} expandMode="inline" />
+  <div class="grid grid-cols-3 sm:grid-cols-5">
+    {#each images as image (image)}
+      <ContentLinkBlock {event} value={{url: image}} />
+    {/each}
+  </div>
   <div class="flex w-full flex-col items-end justify-between gap-2 sm:flex-row">
     <span class="whitespace-nowrap py-1 text-sm opacity-75">
       Posted by

src/app/components/Content.svelte

@@ -186,7 +186,12 @@
           {/if}
         {:else if isEllipsis(parsed) && expandInline}
           {@html renderAsHtml(parsed)}
-          <button type="button" class="text-sm underline"> Read more </button>
+          <button
+            type="button"
+            class="text-sm underline"
+            onclick={stopPropagation(preventDefault(expand))}>
+            Read more
+          </button>
         {:else}
           {@html renderAsHtml(parsed)}
         {/if}

src/app/components/CurrencyInput.svelte

@@ -3,7 +3,7 @@
   import {writable} from "svelte/store"
   import type {Writable} from "svelte/store"
   import type {Instance} from "tippy.js"
-  import {preventDefault} from '@lib/html'
+  import {preventDefault} from "@lib/html"
   import {createSearch} from "@welshman/app"
   import {currencyOptions, displayCurrency} from "@lib/currency"
   import Suggestions from "@lib/components/Suggestions.svelte"

src/app/components/EventReply.svelte

@@ -6,7 +6,6 @@
   import Paperclip from "@assets/icons/paperclip-2.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
-  import ModalFooter from "@lib/components/ModalFooter.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
   import {publishComment, canEnforceNip70} from "@app/core/commands"
   import {PROTECTED} from "@app/core/state"
@@ -65,12 +64,8 @@
 </script>
 
 <div bind:this={spacer}></div>
-<form
-  in:fly
-  bind:this={form}
-  onsubmit={preventDefault(submit)}
-  class="cb cw fixed z-feature -mx-2 pt-3">
-  <div class="card2 mx-2 my-2 bg-neutral">
+<form in:fly bind:this={form} onsubmit={preventDefault(submit)} class="cb cw fixed z-feature pt-3">
+  <div class="card2 mx-2 my-2 bg-alt shadow-md">
     <div class="relative">
       <div class="note-editor flex-grow overflow-hidden">
         <EditorContent {editor} />
@@ -86,9 +81,9 @@
         {/if}
       </Button>
     </div>
-    <ModalFooter>
+    <div class="flex justify-between pt-3">
       <Button class="btn btn-link" onclick={onClose}>Cancel</Button>
       <Button type="submit" class="btn btn-primary">Post Reply</Button>
-    </ModalFooter>
+    </div>
   </div>
 </form>

src/app/components/MenuSettings.svelte

@@ -10,6 +10,8 @@
   import Icon from "@lib/components/Icon.svelte"
   import Link from "@lib/components/Link.svelte"
   import Button from "@lib/components/Button.svelte"
+  import Modal from "@lib/components/Modal.svelte"
+  import ModalBody from "@lib/components/ModalBody.svelte"
   import CardButton from "@lib/components/CardButton.svelte"
   import LogOut from "@app/components/LogOut.svelte"
   import {PLATFORM_NAME} from "@app/core/state"
@@ -21,99 +23,101 @@
   const toggleTheme = () => theme.set($theme === "dark" ? "light" : "dark")
 </script>
 
-<div class="column menu gap-2">
-  <Link replaceState href="/settings/profile">
-    <CardButton class="btn-neutral">
-      {#snippet icon()}
-        <div><Icon icon={UserRounded} size={7} /></div>
-      {/snippet}
-      {#snippet title()}
-        <div>Profile</div>
-      {/snippet}
-      {#snippet info()}
-        <div>Customize your user profile</div>
-      {/snippet}
-    </CardButton>
-  </Link>
-  <Link replaceState href="/settings/alerts">
-    <CardButton class="btn-neutral">
-      {#snippet icon()}
-        <div><Icon icon={Bell} size={7} /></div>
-      {/snippet}
-      {#snippet title()}
-        <div>Alerts</div>
-      {/snippet}
-      {#snippet info()}
-        <div>Set up email digests and push notifications</div>
-      {/snippet}
-    </CardButton>
-  </Link>
-  <Link replaceState href="/settings/wallet">
-    <CardButton class="btn-neutral">
-      {#snippet icon()}
-        <div><Icon icon={Wallet} size={7} /></div>
-      {/snippet}
-      {#snippet title()}
-        <div>Wallet</div>
-      {/snippet}
-      {#snippet info()}
-        <div>Connect a bitcoin wallet for sending social tips</div>
-      {/snippet}
-    </CardButton>
-  </Link>
-  <Link replaceState href="/settings/relays">
-    <CardButton class="btn-neutral">
-      {#snippet icon()}
-        <div><Icon icon={Server} size={7} /></div>
-      {/snippet}
-      {#snippet title()}
-        <div>Relays</div>
-      {/snippet}
-      {#snippet info()}
-        <div>Control how {PLATFORM_NAME} talks to the network</div>
-      {/snippet}
-    </CardButton>
-  </Link>
-  <Link replaceState href="/settings/content">
-    <CardButton class="btn-neutral">
-      {#snippet icon()}
-        <div><Icon icon={Settings} size={7} /></div>
-      {/snippet}
-      {#snippet title()}
-        <div>Settings</div>
-      {/snippet}
-      {#snippet info()}
-        <div>Get into the details about how {PLATFORM_NAME} works</div>
-      {/snippet}
-    </CardButton>
-  </Link>
-  <Button onclick={toggleTheme}>
-    <CardButton class="btn-neutral">
-      {#snippet icon()}
-        <div><Icon icon={Moon} size={7} /></div>
-      {/snippet}
-      {#snippet title()}
-        <div>Theme</div>
-      {/snippet}
-      {#snippet info()}
-        <div>Switch between light and dark mode</div>
-      {/snippet}
-    </CardButton>
-  </Button>
-  <Link replaceState href="/settings/about">
-    <CardButton class="btn-neutral">
-      {#snippet icon()}
-        <div><Icon icon={Code2} size={7} /></div>
-      {/snippet}
-      {#snippet title()}
-        <div>About</div>
-      {/snippet}
-      {#snippet info()}
-        <div>Learn about {PLATFORM_NAME} and support the developer</div>
-      {/snippet}
-    </CardButton>
-  </Link>
-  <Button onclick={logout} class="btn btn-neutral">
-    <Icon icon={Exit} /> Log Out
-  </Button>
-</div>
+<Modal>
+  <ModalBody>
+    <Link replaceState href="/settings/profile">
+      <CardButton class="btn-neutral">
+        {#snippet icon()}
+          <div><Icon icon={UserRounded} size={7} /></div>
+        {/snippet}
+        {#snippet title()}
+          <div>Profile</div>
+        {/snippet}
+        {#snippet info()}
+          <div>Customize your user profile</div>
+        {/snippet}
+      </CardButton>
+    </Link>
+    <Link replaceState href="/settings/alerts">
+      <CardButton class="btn-neutral">
+        {#snippet icon()}
+          <div><Icon icon={Bell} size={7} /></div>
+        {/snippet}
+        {#snippet title()}
+          <div>Alerts</div>
+        {/snippet}
+        {#snippet info()}
+          <div>Set up email digests and push notifications</div>
+        {/snippet}
+      </CardButton>
+    </Link>
+    <Link replaceState href="/settings/wallet">
+      <CardButton class="btn-neutral">
+        {#snippet icon()}
+          <div><Icon icon={Wallet} size={7} /></div>
+        {/snippet}
+        {#snippet title()}
+          <div>Wallet</div>
+        {/snippet}
+        {#snippet info()}
+          <div>Connect a bitcoin wallet for sending social tips</div>
+        {/snippet}
+      </CardButton>
+    </Link>
+    <Link replaceState href="/settings/relays">
+      <CardButton class="btn-neutral">
+        {#snippet icon()}
+          <div><Icon icon={Server} size={7} /></div>
+        {/snippet}
+        {#snippet title()}
+          <div>Relays</div>
+        {/snippet}
+        {#snippet info()}
+          <div>Control how {PLATFORM_NAME} talks to the network</div>
+        {/snippet}
+      </CardButton>
+    </Link>
+    <Link replaceState href="/settings/content">
+      <CardButton class="btn-neutral">
+        {#snippet icon()}
+          <div><Icon icon={Settings} size={7} /></div>
+        {/snippet}
+        {#snippet title()}
+          <div>Settings</div>
+        {/snippet}
+        {#snippet info()}
+          <div>Get into the details about how {PLATFORM_NAME} works</div>
+        {/snippet}
+      </CardButton>
+    </Link>
+    <Button onclick={toggleTheme}>
+      <CardButton class="btn-neutral">
+        {#snippet icon()}
+          <div><Icon icon={Moon} size={7} /></div>
+        {/snippet}
+        {#snippet title()}
+          <div>Theme</div>
+        {/snippet}
+        {#snippet info()}
+          <div>Switch between light and dark mode</div>
+        {/snippet}
+      </CardButton>
+    </Button>
+    <Link replaceState href="/settings/about">
+      <CardButton class="btn-neutral">
+        {#snippet icon()}
+          <div><Icon icon={Code2} size={7} /></div>
+        {/snippet}
+        {#snippet title()}
+          <div>About</div>
+        {/snippet}
+        {#snippet info()}
+          <div>Learn about {PLATFORM_NAME} and support the developer</div>
+        {/snippet}
+      </CardButton>
+    </Link>
+    <Button onclick={logout} class="btn btn-neutral">
+      <Icon icon={Exit} /> Log Out
+    </Button>
+  </ModalBody>
+</Modal>

src/app/components/NoteContentClassified.svelte

@@ -1,11 +1,13 @@
 <script lang="ts">
   import type {ComponentProps} from "svelte"
-  import {getTagValue} from "@welshman/util"
+  import {getTagValue, getTagValues} from "@welshman/util"
   import Content from "@app/components/Content.svelte"
+  import ContentLinkBlock from "@app/components/ContentLinkBlock.svelte"
 
   const props: ComponentProps<typeof Content> = $props()
 
   const title = getTagValue("title", props.event.tags)
+  const images = getTagValues("image", props.event.tags)
 </script>
 
 <div class="flex flex-col gap-2">
@@ -15,4 +17,9 @@
   {#if props.event.content}
     <Content {...props} />
   {/if}
+  <div class="grid grid-cols-3 sm:grid-cols-5">
+    {#each images as image (image)}
+      <ContentLinkBlock event={props.event} value={{url: image}} />
+    {/each}
+  </div>
 </div>