Release 202505281348

2025-05-28 13:48:27 +00:00
parent 7e0d41cc7a
commit ea40f17d3c
10 changed files with 134 additions and 142 deletions
--- a/web/src/pages/admin/services/[slug]/edit.astro
+++ b/web/src/pages/admin/services/[slug]/edit.astro
@@ -233,16 +233,30 @@ if (!service) return Astro.rewrite('/404')
        enctype="multipart/form-data"
      >
        <input type="hidden" name="id" value={service.id} />
-        <InputText
-          label="Name"
-          name="name"
-          inputProps={{
-            required: true,
-            value: service.name,
-          }}
-          error={serviceInputErrors.name}
-        />

+        <div class="grid grid-cols-1 gap-x-4 gap-y-6 md:grid-cols-2">
+          <InputText
+            label="Name"
+            name="name"
+            inputProps={{
+              required: true,
+              value: service.name,
+            }}
+            error={serviceInputErrors.name}
+          />
+
+          <InputText
+            label="Slug"
+            description="Auto-generated if empty"
+            name="slug"
+            inputProps={{
+              value: service.slug,
+              class: 'font-title',
+            }}
+            error={serviceInputErrors.slug}
+            class="font-title"
+          />
+        </div>
        <InputTextArea
          label="Description"
          name="description"
@@ -254,76 +268,44 @@ if (!service) return Astro.rewrite('/404')
          error={serviceInputErrors.description}
        />

-        <InputText
-          label="Slug"
-          description="Auto-generated if empty"
-          name="slug"
-          inputProps={{
-            value: service.slug,
-            class: 'font-title',
-          }}
-          error={serviceInputErrors.slug}
-          class="font-title"
-        />
-
-        <div class="grid grid-cols-1 gap-x-4 gap-y-6 md:grid-cols-2">
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
          <InputTextArea
            label="Service URLs"
-            description="One per line"
-            name="serviceUrls"
+            description="One per line. Accepts **Web**, **Onion**, and **I2P** URLs."
+            name="allServiceUrls"
            inputProps={{
-              rows: 3,
-              placeholder: 'https://example1.com\nhttps://example2.com',
+              placeholder: 'https://example1.com\nhttps://example2.onion\nhttps://example3.b32.i2p',
+              class: 'grow min-h-24',
+              required: true,
            }}
-            value={service.serviceUrls.join('\n')}
-            error={serviceInputErrors.serviceUrls}
+            class="row-span-2 flex flex-col self-stretch"
+            value={[...service.serviceUrls, ...service.onionUrls, ...service.i2pUrls].join('\n\n')}
+            error={serviceInputErrors.allServiceUrls}
          />
          <InputTextArea
            label="ToS URLs"
            description="One per line"
            name="tosUrls"
            inputProps={{
-              rows: 3,
              placeholder: 'https://example1.com/tos\nhttps://example2.com/tos',
              required: true,
            }}
            value={service.tosUrls.join('\n')}
            error={serviceInputErrors.tosUrls}
          />
-          <InputTextArea
-            label="Onion URLs"
-            description="One per line"
-            name="onionUrls"
+          <InputText
+            label="Referral link path"
+            name="referral"
            inputProps={{
-              rows: 3,
-              placeholder: 'http://example1.onion\nhttp://example2.onion',
+              value: service.referral,
+              placeholder: 'e.g. ?ref=123 or /ref/123',
            }}
-            value={service.onionUrls.join('\n')}
-            error={serviceInputErrors.onionUrls}
-          />
-          <InputTextArea
-            label="I2P URLs"
-            description="One per line"
-            name="i2pUrls"
-            inputProps={{
-              rows: 3,
-              placeholder: 'http://example1.b32.i2p\nhttp://example2.b32.i2p',
-            }}
-            value={service.i2pUrls.join('\n')}
+            error={serviceInputErrors.referral}
+            class="self-end"
+            description="Will be appended to the service URL"
          />
        </div>

-        <InputText
-          label="Referral link path"
-          name="referral"
-          inputProps={{
-            value: service.referral,
-            placeholder: 'e.g. ?ref=123 or /ref/123',
-          }}
-          error={serviceInputErrors.referral}
-          description="Will be appended to the service URL"
-        />
-
        <div class="flex items-center justify-between gap-2">
          <InputImageFile
            label="Image"
--- a/web/src/pages/admin/services/new.astro
+++ b/web/src/pages/admin/services/new.astro
@@ -74,19 +74,19 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
      </div>

      <div>
-        <label for="serviceUrls" class="font-title mb-2 block text-sm text-green-500">serviceUrls</label>
+        <label for="allServiceUrls" class="font-title mb-2 block text-sm text-green-500">Service URLs</label>
        <textarea
          transition:persist
          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
-          name="serviceUrls"
-          id="serviceUrls"
+          name="allServiceUrls"
+          id="allServiceUrls"
          rows={3}
-          placeholder="https://example1.com https://example2.com"
+          placeholder="https://example1.com\nhttps://example2.onion\nhttps://example3.b32.i2p"
          set:text=""
        />
        {
-          inputErrors.serviceUrls && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.serviceUrls.join(', ')}</p>
+          inputErrors.allServiceUrls && (
+            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.allServiceUrls.join(', ')}</p>
          )
        }
      </div>
@@ -109,24 +109,6 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
        }
      </div>

-      <div>
-        <label for="onionUrls" class="font-title mb-2 block text-sm text-green-500">onionUrls</label>
-        <textarea
-          transition:persist
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
-          name="onionUrls"
-          id="onionUrls"
-          rows={3}
-          placeholder="http://example.onion"
-          set:text=""
-        />
-        {
-          inputErrors.onionUrls && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.onionUrls.join(', ')}</p>
-          )
-        }
-      </div>
-
      <div>
        <label for="imageFile" class="font-title mb-2 block text-sm text-green-500">serviceImage</label>
        <div class="space-y-2">
--- a/web/src/pages/index.astro
+++ b/web/src/pages/index.astro
@@ -712,7 +712,6 @@ const showFiltersId = 'show-filters'
      pageSize={PAGE_SIZE}
      sortSeed={filters['sort-seed']}
      filters={filters}
-      includeScams={includeScams}
      countCommunityOnly={countCommunityOnly}
      inlineIcons
    />
--- a/web/src/pages/service-suggestion/new.astro
+++ b/web/src/pages/service-suggestion/new.astro
@@ -201,34 +201,31 @@ const [categories, attributes] = await Astro.locals.banners.tryMany([
      error={inputErrors.description}
    />

-    <InputTextArea
-      label="Service URLs"
-      name="serviceUrls"
-      inputProps={{
-        required: true,
-        placeholder: 'https://example1.com\nhttps://example2.org',
-      }}
-      error={inputErrors.serviceUrls}
-    />
-
-    <InputTextArea
-      label="Terms of Service URLs"
-      name="tosUrls"
-      inputProps={{
-        required: true,
-        placeholder: 'https://example1.com/tos\nhttps://example2.org/terms',
-      }}
-      error={inputErrors.tosUrls}
-    />
-
-    <InputTextArea
-      label="Onion URLs"
-      name="onionUrls"
-      inputProps={{
-        placeholder: 'http://example1.onion\nhttp://example2.onion',
-      }}
-      error={inputErrors.onionUrls}
-    />
+    <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+      <InputTextArea
+        label="Service URLs"
+        description="One per line. Accepts **Web**, **Onion**, and **I2P** URLs."
+        name="allServiceUrls"
+        inputProps={{
+          placeholder: 'https://example1.com\nhttps://example2.onion\nhttps://example3.b32.i2p',
+          class: 'min-h-24',
+          required: true,
+        }}
+        class="row-span-2 flex flex-col self-stretch"
+        error={inputErrors.allServiceUrls}
+      />
+      <InputTextArea
+        label="ToS URLs"
+        description="One per line"
+        name="tosUrls"
+        inputProps={{
+          placeholder: 'https://example1.com/tos\nhttps://example2.com/tos',
+          class: 'md:min-h-24',
+          required: true,
+        }}
+        error={inputErrors.tosUrls}
+      />
+    </div>

    <InputCardGroup
      name="kycLevel"