event formatting

3 files changed, 38 insertions, 10 deletions

diff --git a/src/routes/(app)/e/[id]/+page.svelte b/src/routes/(app)/e/[id]/+page.svelte
index 15e2be72..53a73ef4 100644
--- a/src/routes/(app)/e/[id]/+page.svelte
+++ b/src/routes/(app)/e/[id]/+page.svelte
@@ -12,17 +12,35 @@
   <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
     Event
   </h1>
-  <div class="flex gap-2 text-2xl">
-    <Avatar user={author} size={16} />
 
-    <div class="space-y-5">
+  <div class="space-y-5">
+    <div class="flex gap-2 items-center">
+      <Avatar user={author} size={16} />
+      <a href={`/${author.pubkey}`} class="contents">
+        <div>
+          <div class="font-bold">{author.display} &mdash; {author.username}</div>
+          <div class="flex items-center">
+            <iconify-icon
+              noobserver
+              icon="ph:lightning-fill"
+              class="text-yellow-300"
+            ></iconify-icon>
+            {author.lud16}
+          </div>
+        </div>
+      </a>
+    </div>
+
+    <div class="text-2xl space-y-5">
       {#each parts as { type, value }, i}
         {#if type === "text"}
           {value}
         {:else if type === "link"}
           <Media {value} />
         {:else if type.match(/^nostr:np(rofile|ub)$/)}
-          <a href={`/${value.pubkey}`} class="font-bold">@{names[value.pubkey]}</a>
+          <a href={`/${value.pubkey}`} class="font-bold"
+            >@{names[value.pubkey]}</a
+          >
         {/if}
       {/each}
     </div>
diff --git a/src/routes/(app)/send/+layout.server.ts b/src/routes/(app)/send/+layout.server.ts
new file mode 100644
index 00000000..dbb3efad
--- /dev/null
+++ b/src/routes/(app)/send/+layout.server.ts
@@ -0,0 +1,6 @@
+import { redirect } from "@sveltejs/kit";
+
+export async function load({ cookies, url }) {
+	if (!cookies.get("token"))
+		redirect(307, `/register?redirect=${url.pathname}`);
+}
diff --git a/src/routes/(app)/send/zap/[pubkey]/[...id]/+page.svelte b/src/routes/(app)/send/zap/[pubkey]/[...id]/+page.svelte
index 6637cb47..eb0be4c8 100644
--- a/src/routes/(app)/send/zap/[pubkey]/[...id]/+page.svelte
+++ b/src/routes/(app)/send/zap/[pubkey]/[...id]/+page.svelte
@@ -7,7 +7,7 @@
   import Numpad from "$comp/Numpad.svelte";
   import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
-  import { loc, back, post, toFiat, f, s, focus } from "$lib/utils";
+  import { loc, back, fail, post, toFiat, f, s, focus } from "$lib/utils";
   import { sign, send } from "$lib/nostr";
   import { rate, pin } from "$lib/store";
 
@@ -22,11 +22,15 @@
   $effect(() => ($rate ||= data.rate));
   $effect(async () => {
     if (form) {
-      loading = false;
-      event = await sign(request);
-      let { pr: payreq } = await post("/post/zap", { event });
-      await post("/post/payments", { amount, payreq, pin: $pin });
-      goto(`/e/${id}`);
+      try {
+        loading = false;
+        event = await sign(request);
+        let { pr: payreq } = await post("/post/zap", { event });
+        await post("/post/payments", { amount, payreq, pin: $pin });
+        goto(`/e/${id}`);
+      } catch (e) {
+        fail(e.message);
+      }
     }
   });