From 681e307d00e38ee9bc336e547660f56e71b646c6 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 20 Jan 2023 11:39:55 -0800
Subject: rename endpoints

---
 src/routes/(app)/[username]/dashboard/+page.svelte        |  4 ++--
 .../(app)/[username]/payments/[...page]/+page.svelte      | 15 +++++++++++----
 src/routes/(app)/launch/purchase/+page.server.js          |  2 +-
 src/routes/(app)/login/+page.server.js                    |  2 +-
 src/routes/(app)/pot/[name]/+page.svelte                  |  2 +-
 src/routes/(app)/register/+page.server.js                 |  2 +-
 src/routes/(app)/send/[uuid=uuid]/+page.server.js         |  2 +-
 src/routes/(app)/send/lightning/[payreq]/+page.server.js  |  2 +-
 .../send/user/[username]/[...amount]/+page.server.js      |  2 +-
 .../(app)/send/user/[username]/[...amount]/+page.svelte   |  3 ++-
 10 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte
index 262a7348..feb49c65 100644
--- a/src/routes/(app)/[username]/dashboard/+page.svelte
+++ b/src/routes/(app)/[username]/dashboard/+page.svelte
@@ -7,7 +7,7 @@
 	import { goto } from '$app/navigation';
 	import { t } from '$lib/translations';
 	import { events } from '$lib/store';
-  import { v4 } from "uuid";
+	import { v4 } from 'uuid';
 
 	export let data;
 	$: ({ invoices, requests } = data);
@@ -86,7 +86,7 @@
 				>{$t('user.dashboard.deposit')}</button
 			>
 		</a>
-        <a href={`/send/pot/${v4()}`}>
+		<a href={`/send/pot/${v4()}`}>
 			<button class="rounded-full border py-4 px-5 font-bold hover:opacity-80 w-full"
 				>{$t('user.dashboard.voucher')}</button
 			>
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
index f6de4c27..24f7cf6e 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
@@ -11,6 +11,13 @@
 
 	export let data;
 
+	const types = {
+		internal: 'internal',
+		bitcoin: 'bitcoin',
+		lightning: 'lightning',
+		pot: 'pot'
+	};
+
 	let { start, end, user } = data;
 	let change = ({ target: { value } }) => goto(value);
 	let link = (tx) => {
@@ -131,17 +138,17 @@
 						</div>
 
 						<div class="flex my-auto">
-							{#if tx.redeemcode}
-								<a href={`/voucher/${tx.redeemcode}`}>
+							{#if tx.type === types.pot}
+								<a href={`/pot/${tx.pot}`}>
 									<div class="text-secondary flex">
 										<div class="my-auto mr-1">
 											<img src="/icons/logo-symbol.svg" class="w-12 border-4 border-transparent" />
 										</div>
 
-										<div class="my-auto">Voucher</div>
+										<div class="my-auto">Pot</div>
 									</div>
 								</a>
-							{:else if tx.with}
+							{:else if tx.type === types.internal}
 								<a href={`/${tx.with.username}`}>
 									<div class="flex">
 										<div class="my-auto">
diff --git a/src/routes/(app)/launch/purchase/+page.server.js b/src/routes/(app)/launch/purchase/+page.server.js
index 63bad702..ad5cb039 100644
--- a/src/routes/(app)/launch/purchase/+page.server.js
+++ b/src/routes/(app)/launch/purchase/+page.server.js
@@ -18,7 +18,7 @@ export const actions = {
 	internal: async ({ cookies, request }) => {
 		let form = await request.formData();
 		let asset = await createTicket(cookies, form.get('username'));
-		await post('/send', { amount: 22000, username: 'launch' }, auth(cookies));
+		await post('/payments', { amount: 22000, username: 'launch' }, auth(cookies));
 
 		throw redirect(307, `/launch/thanks/${asset}`);
 	},
diff --git a/src/routes/(app)/login/+page.server.js b/src/routes/(app)/login/+page.server.js
index 824e7b09..52c887bf 100644
--- a/src/routes/(app)/login/+page.server.js
+++ b/src/routes/(app)/login/+page.server.js
@@ -12,7 +12,7 @@ export const actions = {
 		let { username, password, token, loginRedirect } = form;
 		let user = { username, password, token };
 
-    if (loginRedirect === 'undefined') loginRedirect = undefined;
+		if (loginRedirect === 'undefined') loginRedirect = undefined;
 
 		try {
 			let r = await login(user, cookies);
diff --git a/src/routes/(app)/pot/[name]/+page.svelte b/src/routes/(app)/pot/[name]/+page.svelte
index c936cf59..c6b9c51d 100644
--- a/src/routes/(app)/pot/[name]/+page.svelte
+++ b/src/routes/(app)/pot/[name]/+page.svelte
@@ -36,7 +36,7 @@
 				<h1 class="text-2xl md:text-3xl font-semibold">Public Pot</h1>
 			</div>
 			<p class="text-secondary">Anyone who knows the URL to this pot can add or take out funds</p>
-      <img src={src} class="mx-auto" />
+			<img {src} class="mx-auto" />
 			<div class="flex justify-center gap-4">
 				<div class="my-auto">
 					<h2 class="text-2xl md:text-3xl font-semibold">
diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js
index 067a9ef6..44c1f44b 100644
--- a/src/routes/(app)/register/+page.server.js
+++ b/src/routes/(app)/register/+page.server.js
@@ -13,7 +13,7 @@ export const actions = {
 		let user = { username, password, cipher, salt, pubkey };
 		let error;
 
-    if (loginRedirect === 'undefined') loginRedirect = undefined;
+		if (loginRedirect === 'undefined') loginRedirect = undefined;
 
 		try {
 			await post('/register', { user });
diff --git a/src/routes/(app)/send/[uuid=uuid]/+page.server.js b/src/routes/(app)/send/[uuid=uuid]/+page.server.js
index dd6fb82d..e9f161c7 100644
--- a/src/routes/(app)/send/[uuid=uuid]/+page.server.js
+++ b/src/routes/(app)/send/[uuid=uuid]/+page.server.js
@@ -20,7 +20,7 @@ export const actions = {
 				return invalid(403, { amount, confirm: true });
 			}
 
-			await post('/send', body, auth(cookies));
+			await post('/payments', body, auth(cookies));
 		} catch (e) {
 			return invalid(400, { message: e.message });
 		}
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
index a29793bf..2ae693aa 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
@@ -2,7 +2,7 @@ import { invalid, redirect } from '@sveltejs/kit';
 import { btc as asset, auth, post } from '$lib/utils';
 
 export async function load({ params }) {
-	return post('/lightning/parse', params);
+	return post('/parse', params);
 }
 
 export const actions = {
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
index e670320c..01712df2 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
@@ -20,7 +20,7 @@ export const actions = {
 				return invalid(403, { amount, confirm: true });
 			}
 
-			await post('/send', body, auth(cookies));
+			await post('/payments', body, auth(cookies));
 		} catch (e) {
 			console.log(e);
 			return invalid(400, { message: e.message });
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
index 07e29f44..a5b463be 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
@@ -27,7 +27,8 @@
 		({ hash } = await post('/invoice', {
 			invoice: {
 				amount,
-				rate: rates[recipient.currency]
+				rate: rates[recipient.currency],
+				type: 'internal'
 			},
 			user: recipient
 		}));
-- 
cgit v1.2.3