From 7617102b14e5254c9675b7db34f12ff6906a0086 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam@coinos.io>
Date: Fri, 11 Jul 2025 10:51:59 -0700
Subject: qr update

---
 .../(app)/[username]/(profile)/+layout.svelte      |  2 +-
 .../[username]/accepted/[text]/+page.server.ts     |  7 +++
 .../(app)/[username]/accepted/[text]/+page.svelte  | 51 +++++++++++++++++
 .../[username]/accepted/[text]/raw/+server.ts      | 16 ++++++
 .../(app)/[username]/accepted/create/+page.svelte  | 64 ++++++++++++++++++++++
 src/routes/(app)/accepted/[text]/+page.server.ts   |  4 --
 src/routes/(app)/accepted/[text]/+page.svelte      | 27 ---------
 src/routes/(app)/accepted/[text]/raw/+server.ts    | 16 ------
 src/routes/(app)/accepted/create/+page.svelte      | 64 ----------------------
 9 files changed, 139 insertions(+), 112 deletions(-)
 create mode 100644 src/routes/(app)/[username]/accepted/[text]/+page.server.ts
 create mode 100644 src/routes/(app)/[username]/accepted/[text]/+page.svelte
 create mode 100644 src/routes/(app)/[username]/accepted/[text]/raw/+server.ts
 create mode 100644 src/routes/(app)/[username]/accepted/create/+page.svelte
 delete mode 100644 src/routes/(app)/accepted/[text]/+page.server.ts
 delete mode 100644 src/routes/(app)/accepted/[text]/+page.svelte
 delete mode 100644 src/routes/(app)/accepted/[text]/raw/+server.ts
 delete mode 100644 src/routes/(app)/accepted/create/+page.svelte

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 2b31d41d..b384344e 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -241,7 +241,7 @@
                 ></iconify-icon></button
               >
               <a
-                href={`/accepted/${encodeURIComponent(`lightning:${lnurl}`)}`}
+                href={`/${n}/accepted/${encodeURIComponent(`lightning:${lnurl}`)}`}
                 class="my-auto"
               >
                 <iconify-icon noobserver icon="ph:qr-code-bold" width="32"
diff --git a/src/routes/(app)/[username]/accepted/[text]/+page.server.ts b/src/routes/(app)/[username]/accepted/[text]/+page.server.ts
new file mode 100644
index 00000000..ca23ae53
--- /dev/null
+++ b/src/routes/(app)/[username]/accepted/[text]/+page.server.ts
@@ -0,0 +1,7 @@
+export async function load({ params, url }) {
+	const { text } = params;
+	const query = new URLSearchParams(url.search);
+	const nfc = !!query.get("nfc");
+	console.log("NFC", nfc);
+	return { nfc, text };
+}
diff --git a/src/routes/(app)/[username]/accepted/[text]/+page.svelte b/src/routes/(app)/[username]/accepted/[text]/+page.svelte
new file mode 100644
index 00000000..cfd9961f
--- /dev/null
+++ b/src/routes/(app)/[username]/accepted/[text]/+page.svelte
@@ -0,0 +1,51 @@
+<script>
+  import Icon from "$comp/Icon.svelte";
+  import Qr from "$comp/Qr.svelte";
+  import { back, copy } from "$lib/utils";
+  let { data } = $props();
+  let { nfc, text } = $derived(data);
+  let { username } = $derived(data.subject);
+  let url = `https://coinos.io/p/${username}`;
+</script>
+
+<div class="px-2">
+  <div class="border-8 border-black p-8 max-w-[710px] mx-auto mt-20 space-y-5">
+    <div class="flex gap-2 mx-auto justify-center">
+      <img src="/images/bitcoin.png" class="w-16 h-16 my-auto" />
+      <h3 class="text-5xl font-bold text-center my-auto">Bitcoin Accepted Here</h3>
+    </div>
+    <Qr {text} />
+    <div class="text-center text-4xl font-bold">coinos.io/{username}</div>
+    {#if nfc}
+      <div class="flex w-full justify-center gap-4 mt-10 text-2xl">
+        <div class="gap-1">
+          <div class="flex items-center gap-2">
+            <img
+              src="/images/tap.png"
+              class="mx-auto my-auto"
+              style="width: 120px"
+            />
+            <img src="/images/icon.svg" class="my-auto w-12" />
+            <div>Coinos</div>
+          </div>
+        </div>
+        <div class="ml-auto gap-1">
+          <div class="flex items-center gap-1">
+            <iconify-icon
+              noobserver
+              icon="ph:lightning-fill"
+              class="text-yellow-300"
+              width={48}
+            ></iconify-icon>
+            <div>Other</div>
+            <img
+              src="/images/tap.png"
+              class="ml-auto my-auto"
+              style="width: 120px"
+            />
+          </div>
+        </div>
+      </div>
+    {/if}
+  </div>
+</div>
diff --git a/src/routes/(app)/[username]/accepted/[text]/raw/+server.ts b/src/routes/(app)/[username]/accepted/[text]/raw/+server.ts
new file mode 100644
index 00000000..a24d3a3c
--- /dev/null
+++ b/src/routes/(app)/[username]/accepted/[text]/raw/+server.ts
@@ -0,0 +1,16 @@
+import Qr from "qrcode-base64";
+
+export async function GET({ params }) {
+	const { text } = params;
+
+	const dataUri = Qr.drawImg(text, { size: 600 });
+	const base64Data = dataUri.split(",")[1];
+	const binaryData = Buffer.from(base64Data, "base64");
+
+	return new Response(binaryData, {
+		headers: {
+			"Content-Type": "image/gif",
+			"Cache-Control": "public, max-age=31536000, immutable",
+		},
+	});
+}
diff --git a/src/routes/(app)/[username]/accepted/create/+page.svelte b/src/routes/(app)/[username]/accepted/create/+page.svelte
new file mode 100644
index 00000000..74316ba9
--- /dev/null
+++ b/src/routes/(app)/[username]/accepted/create/+page.svelte
@@ -0,0 +1,64 @@
+<script>
+  import { run, preventDefault } from 'svelte/legacy';
+
+  import { goto } from "$app/navigation";
+  import { browser } from "$app/environment";
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+  let el = $state(), text = $state(), pasted = $state();
+
+  let keypress = (e) =>
+    e.key === "Enter" ? e.preventDefault() || el.click() : (pasted = false);
+
+  let paste = async () => {
+    text = await navigator.clipboard.readText();
+    pasted = true;
+  };
+
+  let submit = () => goto(`/qr/${encodeURIComponent(text)}`);
+
+  run(() => {
+    if (browser && pasted && text) el.click() && (pasted = false);
+  });
+</script>
+
+<div class="container px-4 max-w-lg mx-auto space-y-5 mt-20">
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
+    Create QR
+  </h1>
+
+  <form onsubmit={preventDefault(submit)} class="space-y-2 text-xl">
+    <div class="mb-2">
+      <textarea
+        use:focus
+        name="text"
+        placeholder="Enter some text or a URL to put in a QR"
+        onkeypress={keypress}
+        class="w-full p-4 border rounded-xl h-32 text-xl"
+        bind:value={text}
+        onpaste={() => (pasted = true)}
+        autocapitalize="none"
+></textarea>
+    </div>
+
+    <div class="flex gap-2">
+      <button
+        type="button"
+        class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center gap-2"
+        onclick={paste}
+      >
+        <Icon icon="paste" style="w-8 my-auto" />
+        <div class="my-auto">{$t("user.send.paste")}</div>
+      </button>
+
+      <button
+        bind:this={el}
+        type="submit"
+        class="flex bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold gap-2 justify-center"
+      >
+        <Icon icon="send" style="w-8 my-auto invert" />
+        <div class="my-auto">{$t("user.dashboard.go")}</div>
+      </button>
+    </div>
+  </form>
+</div>
diff --git a/src/routes/(app)/accepted/[text]/+page.server.ts b/src/routes/(app)/accepted/[text]/+page.server.ts
deleted file mode 100644
index 210c3c45..00000000
--- a/src/routes/(app)/accepted/[text]/+page.server.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export async function load({ params }) {
-	const { text } = params;
-	return { text };
-}
diff --git a/src/routes/(app)/accepted/[text]/+page.svelte b/src/routes/(app)/accepted/[text]/+page.svelte
deleted file mode 100644
index 07bf5a1d..00000000
--- a/src/routes/(app)/accepted/[text]/+page.svelte
+++ /dev/null
@@ -1,27 +0,0 @@
-<script>
-  import Icon from "$comp/Icon.svelte";
-  import Qr from "$comp/Qr.svelte";
-  import { back, copy } from "$lib/utils";
-  let { data } = $props();
-  let { text } = $derived(data);
-  let { username } = $derived(data.user);
-  let url = `https://coinos.io/p/${username}`;
-</script>
-
-<div class="px-2">
-<div class="border-8 border-black p-2 max-w-[710px] mx-auto mt-20 space-y-5">
-  <div class="flex gap-2 mx-auto justify-center">
-    <img src="/images/bitcoin.png" class="w-16 h-16 my-auto" />
-    <h3 class="text-4xl font-bold text-center my-auto">Bitcoin Accepted</h3>
-  </div>
-  <Qr {text} />
-  <div class="text-center text-5xl font-bold">coinos.io/{username}</div>
-  <div class="flex w-full justify-center gap-4 mt-10">
-    <img
-       src="/images/logo.png"
-       class="ml-auto my-auto"
-       style="width: 180px"
-       />
-  </div>
-</div>
-</div>
diff --git a/src/routes/(app)/accepted/[text]/raw/+server.ts b/src/routes/(app)/accepted/[text]/raw/+server.ts
deleted file mode 100644
index a24d3a3c..00000000
--- a/src/routes/(app)/accepted/[text]/raw/+server.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qr from "qrcode-base64";
-
-export async function GET({ params }) {
-	const { text } = params;
-
-	const dataUri = Qr.drawImg(text, { size: 600 });
-	const base64Data = dataUri.split(",")[1];
-	const binaryData = Buffer.from(base64Data, "base64");
-
-	return new Response(binaryData, {
-		headers: {
-			"Content-Type": "image/gif",
-			"Cache-Control": "public, max-age=31536000, immutable",
-		},
-	});
-}
diff --git a/src/routes/(app)/accepted/create/+page.svelte b/src/routes/(app)/accepted/create/+page.svelte
deleted file mode 100644
index 74316ba9..00000000
--- a/src/routes/(app)/accepted/create/+page.svelte
+++ /dev/null
@@ -1,64 +0,0 @@
-<script>
-  import { run, preventDefault } from 'svelte/legacy';
-
-  import { goto } from "$app/navigation";
-  import { browser } from "$app/environment";
-  import { t } from "$lib/translations";
-  import Icon from "$comp/Icon.svelte";
-  let el = $state(), text = $state(), pasted = $state();
-
-  let keypress = (e) =>
-    e.key === "Enter" ? e.preventDefault() || el.click() : (pasted = false);
-
-  let paste = async () => {
-    text = await navigator.clipboard.readText();
-    pasted = true;
-  };
-
-  let submit = () => goto(`/qr/${encodeURIComponent(text)}`);
-
-  run(() => {
-    if (browser && pasted && text) el.click() && (pasted = false);
-  });
-</script>
-
-<div class="container px-4 max-w-lg mx-auto space-y-5 mt-20">
-  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-    Create QR
-  </h1>
-
-  <form onsubmit={preventDefault(submit)} class="space-y-2 text-xl">
-    <div class="mb-2">
-      <textarea
-        use:focus
-        name="text"
-        placeholder="Enter some text or a URL to put in a QR"
-        onkeypress={keypress}
-        class="w-full p-4 border rounded-xl h-32 text-xl"
-        bind:value={text}
-        onpaste={() => (pasted = true)}
-        autocapitalize="none"
-></textarea>
-    </div>
-
-    <div class="flex gap-2">
-      <button
-        type="button"
-        class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center gap-2"
-        onclick={paste}
-      >
-        <Icon icon="paste" style="w-8 my-auto" />
-        <div class="my-auto">{$t("user.send.paste")}</div>
-      </button>
-
-      <button
-        bind:this={el}
-        type="submit"
-        class="flex bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold gap-2 justify-center"
-      >
-        <Icon icon="send" style="w-8 my-auto invert" />
-        <div class="my-auto">{$t("user.dashboard.go")}</div>
-      </button>
-    </div>
-  </form>
-</div>
-- 
cgit v1.2.3