From 45fe0a77bd3b0bf4f648ccefa390a12bcab430a6 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 8 Feb 2023 13:20:22 -0800
Subject: internal payment fixes

---
 src/components/LandingHeader.svelte                     | 17 +++++++++--------
 src/components/Pin.svelte                               |  2 +-
 src/lib/utils.js                                        |  1 -
 src/routes/(app)/[username]/(profile)/+layout.svelte    |  5 ++++-
 .../(app)/[username]/request/[id]/+page.server.js       |  3 +--
 src/routes/(app)/send/[...text]/+page.server.js         | 15 ++++++---------
 src/routes/(app)/send/[...text]/+page.svelte            |  9 +++++++--
 src/routes/(app)/send/invoice/[id]/+page.server.js      |  4 +++-
 src/routes/(static)/+layout.svelte                      |  2 +-
 9 files changed, 32 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte
index 2c3bcd6a..f9db5ea0 100644
--- a/src/components/LandingHeader.svelte
+++ b/src/components/LandingHeader.svelte
@@ -3,7 +3,7 @@
 	import { scroll } from '$lib/utils';
 	import { Icon } from '$comp';
 	import { t } from '$lib/translations';
-  import { page } from '$app/stores';
+	import { page } from '$app/stores';
 
 	export let howItWorks;
 	export let faq;
@@ -32,13 +32,14 @@
 
 		<!-- desktop nav -->
 		<div class="hidden space-x-10 md:flex flex-wrap justify-center items-center font-bold">
-      {#if $page.url.pathname === "/"}
-			<button class="hover:opacity-80" on:click={() => scroll(howItWorks)}
-				>{$t('howItWorks.header')}</button
-			>
-			<button class="hover:opacity-80" on:click={() => scroll(faq)}>{$t('faq.header')}</button>
-			<button class="hover:opacity-80" on:click={() => scroll(about)}>{$t('about.header')}</button>
-      {/if}
+			{#if $page.url.pathname === '/'}
+				<button class="hover:opacity-80" on:click={() => scroll(howItWorks)}
+					>{$t('howItWorks.header')}</button
+				>
+				<button class="hover:opacity-80" on:click={() => scroll(faq)}>{$t('faq.header')}</button>
+				<button class="hover:opacity-80" on:click={() => scroll(about)}>{$t('about.header')}</button
+				>
+			{/if}
 			{#if !user}
 				<button
 					class="border rounded-full px-6 py-2 font-bold hover:opacity-80"
diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte
index a59f574e..1d7ed65b 100644
--- a/src/components/Pin.svelte
+++ b/src/components/Pin.svelte
@@ -10,7 +10,7 @@
 	let pin = '';
 
 	$: update(value);
-	let update = (v) => (pin = v)
+	let update = (v) => (pin = v);
 
 	$: pin.toString().length > 5 && (value = pin.toString());
 </script>
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 948696bb..80f7fe07 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -9,7 +9,6 @@ import { get as getStore } from 'svelte/store';
 
 export function scroll(section) {
 	if (getStore(page).url.pathname !== '/') goto('/');
-  console.log("section", section);
 	setTimeout(() => section.scrollIntoView({ behavior: 'smooth' }), 500);
 }
 
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index f3488e4b..dfa25b78 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -134,7 +134,10 @@
 			{/if}
 			{#if !subject.anon && subject.username !== user?.username}
 				<div class="w-full flex">
-					<a href={user ? `/send/${subject.username}` : `/${subject.username}/receive`} class="mx-auto">
+					<a
+						href={user ? `/send/${subject.username}` : `/${subject.username}/receive`}
+						class="mx-auto"
+					>
 						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
 							<div class="mx-auto flex">
 								<Icon icon="send" style="mr-2" />
diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js
index 5fb90bf3..89792ab8 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/request/[id]/+page.server.js
@@ -4,7 +4,7 @@ import { redirect } from '@sveltejs/kit';
 export let load = async ({ cookies, depends, params, parent }) => {
 	depends('app:invoice');
 
-  let { user } = await parent();
+	let { user } = await parent();
 	if (!user) throw redirect(307, '/login');
 
 	let { request } = await get(`/request/${params.id}`, auth(cookies));
@@ -21,6 +21,5 @@ export let load = async ({ cookies, depends, params, parent }) => {
 		if (request.requester.username === user.username) throw redirect(307, `/send/${id}`);
 	}
 
-
 	return { request };
 };
diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js
index 4c2776f5..d09b4da9 100644
--- a/src/routes/(app)/send/[...text]/+page.server.js
+++ b/src/routes/(app)/send/[...text]/+page.server.js
@@ -63,24 +63,21 @@ let parse = async (t, host) => {
 
 	if (user) throw redirect(307, `/send/user/${t}`);
 
-  // pot
+	// pot
 	let pot;
 	try {
 		pot = await get(`/pot/${t}`);
-		console.log(pot);
-	} catch (e) {
-	}
+	} catch (e) {}
 
 	if (pot) throw redirect(307, `/send/pot/${t}`);
 
-  // invoice
-  let invoice;
+	// invoice
+	let invoice;
 	try {
 		invoice = await get(`/invoice/${t}`);
-	} catch (e) {
-	}
+	} catch (e) {}
 
-  if (invoice) throw redirect(307, `/send/invoice/${invoice.hash}`);
+	if (invoice) throw redirect(307, `/send/invoice/${invoice.hash}`);
 };
 
 export async function load({ cookies, params, request, url }) {
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 2a9df12a..5a376f9f 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -38,9 +38,14 @@
 	<form method="POST" use:enhance>
 		{#if form?.error}
 			<div class="mb-5">
-				<div class="text-secondary">Could not find anything with that name. Would you like to create a new pot?</div>
+				<div class="text-secondary">
+					Could not find anything with that name. Would you like to create a new pot?
+				</div>
 				<div class="w-full flex justify-center">
-          <a href={`/send/pot/${text}`}><button class="bg-black text-white border rounded-full px-6 py-2 font-bold">Yes</button></a>
+					<a href={`/send/pot/${text}`}
+						><button class="bg-black text-white border rounded-full px-6 py-2 font-bold">Yes</button
+						></a
+					>
 				</div>
 			</div>
 		{/if}
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js
index 6b7823ce..2df19985 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.js
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.js
@@ -11,10 +11,12 @@ export async function load({ params: { id }, parent }) {
 }
 
 export const actions = {
-	default: async ({ cookies, request }) => {
+	default: async ({ cookies, params: { hash }, request }) => {
 		try {
 			let body = Object.fromEntries(await request.formData());
 			let { confirmed } = body;
+			body.amount = parseInt(body.amount);
+			body.hash = hash;
 
 			if (!confirmed) {
 				return fail(400, { amount, confirm: true });
diff --git a/src/routes/(static)/+layout.svelte b/src/routes/(static)/+layout.svelte
index dde9fd11..f3a726af 100644
--- a/src/routes/(static)/+layout.svelte
+++ b/src/routes/(static)/+layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Footer, LandingHeader } from "$comp";
+	import { Footer, LandingHeader } from '$comp';
 </script>
 
 <LandingHeader />
-- 
cgit v1.2.3