qr update

8 files changed, 59 insertions, 32 deletions

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)/accepted/[text]/raw/+server.ts b/src/routes/(app)/[username]/accepted/[text]/raw/+server.ts
index a24d3a3c..a24d3a3c 100644
--- a/src/routes/(app)/accepted/[text]/raw/+server.ts
+++ b/src/routes/(app)/[username]/accepted/[text]/raw/+server.ts
diff --git a/src/routes/(app)/accepted/create/+page.svelte b/src/routes/(app)/[username]/accepted/create/+page.svelte
index 74316ba9..74316ba9 100644
--- a/src/routes/(app)/accepted/create/+page.svelte
+++ b/src/routes/(app)/[username]/accepted/create/+page.svelte
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/static/images/tap.png b/static/images/tap.png
new file mode 100644
index 00000000..ae59d00d
--- /dev/null
+++ b/static/images/tap.png