From 6e7a39a81455f633a0c1479524e4fdb06a722914 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 9 Nov 2022 15:49:10 -0800
Subject: rename lnurl route

---
 .../(app)/[username]/dashboard/+page.server.js     |  3 --
 src/routes/(app)/ln/[lnurl]/+page.server.js        | 23 +++++++++++
 src/routes/(app)/ln/[lnurl]/+page.svelte           | 46 ++++++++++++++++++++++
 src/routes/(app)/lnurl/[lnurl]/+page.server.js     | 19 ---------
 src/routes/(app)/lnurl/[lnurl]/+page.svelte        | 46 ----------------------
 src/routes/(app)/send/[...text]/+page.server.js    |  2 +-
 6 files changed, 70 insertions(+), 69 deletions(-)
 delete mode 100644 src/routes/(app)/[username]/dashboard/+page.server.js
 create mode 100644 src/routes/(app)/ln/[lnurl]/+page.server.js
 create mode 100644 src/routes/(app)/ln/[lnurl]/+page.svelte
 delete mode 100644 src/routes/(app)/lnurl/[lnurl]/+page.server.js
 delete mode 100644 src/routes/(app)/lnurl/[lnurl]/+page.svelte

(limited to 'src')

diff --git a/src/routes/(app)/[username]/dashboard/+page.server.js b/src/routes/(app)/[username]/dashboard/+page.server.js
deleted file mode 100644
index 46058038..00000000
--- a/src/routes/(app)/[username]/dashboard/+page.server.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const load = ({ parent }) => {
-  throw new Error("BOOM")
-} 
diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.js b/src/routes/(app)/ln/[lnurl]/+page.server.js
new file mode 100644
index 00000000..b3d76041
--- /dev/null
+++ b/src/routes/(app)/ln/[lnurl]/+page.server.js
@@ -0,0 +1,23 @@
+import { auth, get, post } from '$lib/utils';
+import { error, redirect } from '@sveltejs/kit';
+
+export async function load({ locals, params }) {
+  try {
+	if (!locals.user) throw redirect(307, '/login');
+	let { lnurl } = params;
+	lnurl = await get(`/decode?text=${lnurl}`);
+	if (lnurl.tag !== 'payRequest') throw error(500, 'We can only handle lnurl pay requests');
+
+	return lnurl;
+  } catch(e) {
+    throw error(500, e.message);
+  } 
+}
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let { callback, ...form } = Object.fromEntries(await request.formData());
+		form.params = { callback };
+		await post('/pay', form, auth(cookies));
+	}
+};
diff --git a/src/routes/(app)/ln/[lnurl]/+page.svelte b/src/routes/(app)/ln/[lnurl]/+page.svelte
new file mode 100644
index 00000000..92eca3e0
--- /dev/null
+++ b/src/routes/(app)/ln/[lnurl]/+page.svelte
@@ -0,0 +1,46 @@
+<script>
+	import { enhance } from '$app/forms';
+	import { Numpad, Spinner } from '$comp';
+	import { pin } from '$lib/store';
+
+	export let data;
+	let { currency } = data.user;
+	let { minSendable, maxSendable, callback, metadata } = data;
+	let amount, loading;
+	let submit = () => (loading = true);
+</script>
+
+<div class="container px-4 mt-20 max-w-xl mx-auto">
+	<div class="text-center mb-8">
+		{#each JSON.parse(metadata) as m}
+			<div>
+				{#if m[0] === 'text/plain'}
+					<h1 class="text-3xl md:text-4xl font-semibold mb-2">{m[1]}</h1>
+				{/if}
+				{#if m[0].includes('image')}
+					<img src={`data:image/png;base64,${m[1]}`} alt="Recipient" />
+				{/if}
+			</div>
+		{/each}
+	</div>
+	<Numpad bind:amount {currency} />
+
+	<form method="POST" use:enhance on:submit={submit}>
+		<input name="amount" value={amount} type="hidden" />
+		<input name="callback" value={callback} type="hidden" />
+		<input name="pin" value={$pin} type="hidden" />
+
+		<div class="flex w-full">
+			<button
+				type="submit"
+				class="opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold mx-auto mt-2 bg-black text-white px-4 w-24"
+			>
+				{#if loading}
+					<Spinner />
+				{:else}
+					Send
+				{/if}
+			</button>
+		</div>
+	</form>
+</div>
diff --git a/src/routes/(app)/lnurl/[lnurl]/+page.server.js b/src/routes/(app)/lnurl/[lnurl]/+page.server.js
deleted file mode 100644
index 51ceeb39..00000000
--- a/src/routes/(app)/lnurl/[lnurl]/+page.server.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { auth, get, post } from '$lib/utils';
-import { error, redirect } from '@sveltejs/kit';
-
-export async function load({ locals, params }) {
-	if (!locals.user) throw redirect(307, '/login');
-	let { lnurl } = params;
-	lnurl = await get(`/decode?text=${lnurl}`);
-	if (lnurl.tag !== 'payRequest') throw error(500, 'We can only handle lnurl pay requests');
-
-	return lnurl;
-}
-
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let { callback, ...form } = Object.fromEntries(await request.formData());
-		form.params = { callback };
-		await post('/pay', form, auth(cookies));
-	}
-};
diff --git a/src/routes/(app)/lnurl/[lnurl]/+page.svelte b/src/routes/(app)/lnurl/[lnurl]/+page.svelte
deleted file mode 100644
index 92eca3e0..00000000
--- a/src/routes/(app)/lnurl/[lnurl]/+page.svelte
+++ /dev/null
@@ -1,46 +0,0 @@
-<script>
-	import { enhance } from '$app/forms';
-	import { Numpad, Spinner } from '$comp';
-	import { pin } from '$lib/store';
-
-	export let data;
-	let { currency } = data.user;
-	let { minSendable, maxSendable, callback, metadata } = data;
-	let amount, loading;
-	let submit = () => (loading = true);
-</script>
-
-<div class="container px-4 mt-20 max-w-xl mx-auto">
-	<div class="text-center mb-8">
-		{#each JSON.parse(metadata) as m}
-			<div>
-				{#if m[0] === 'text/plain'}
-					<h1 class="text-3xl md:text-4xl font-semibold mb-2">{m[1]}</h1>
-				{/if}
-				{#if m[0].includes('image')}
-					<img src={`data:image/png;base64,${m[1]}`} alt="Recipient" />
-				{/if}
-			</div>
-		{/each}
-	</div>
-	<Numpad bind:amount {currency} />
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="amount" value={amount} type="hidden" />
-		<input name="callback" value={callback} type="hidden" />
-		<input name="pin" value={$pin} type="hidden" />
-
-		<div class="flex w-full">
-			<button
-				type="submit"
-				class="opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold mx-auto mt-2 bg-black text-white px-4 w-24"
-			>
-				{#if loading}
-					<Spinner />
-				{:else}
-					Send
-				{/if}
-			</button>
-		</div>
-	</form>
-</div>
diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js
index 77eea61f..761f27dc 100644
--- a/src/routes/(app)/send/[...text]/+page.server.js
+++ b/src/routes/(app)/send/[...text]/+page.server.js
@@ -25,7 +25,7 @@ let parse = async (t, r) => {
 		}
 	}
 
-	if (t.toLowerCase().startsWith('lnurl')) throw redirect(307, `/lnurl/${t}`);
+	if (t.toLowerCase().startsWith('lnurl')) throw redirect(307, `/ln/${t}`);
 	if (t.includes(':')) t = t.split(':')[1];
 
 	// lightning
-- 
cgit v1.2.3