From ccc13974d22a47995b5f9f674891a39d54aa0620 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 9 Nov 2022 09:53:33 -0800
Subject: refactor settings

---
 src/components/Pin.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte
index 2a6bf977..80e003b9 100644
--- a/src/components/Pin.svelte
+++ b/src/components/Pin.svelte
@@ -1,5 +1,6 @@
 <script>
 	import { pin } from '$lib/store';
+
 	let pinCode = '';
 	let pinInput;
 
@@ -9,7 +10,7 @@
 <div class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-20">
 	<div class="relative top-1/3 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white space-y-5">
 		<h1 class="text-center text-2xl font-semibold">Please enter your PIN</h1>
-		<input bind:value={pinCode} />
+		<input bind:value={pinCode} autofocus />
 		<div class="w-full flex">
 			<button
 				type="submit"
-- 
cgit v1.2.3


From c901b229121ee74b4a1a8794ca7578d9cfea0055 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 9 Nov 2022 11:18:38 -0800
Subject: fix support form

---
 src/components/AppHeader.svelte                    |  4 +-
 src/components/Footer.svelte                       |  2 +-
 src/lib/utils.js                                   |  2 +-
 .../(app)/[username]/support/+page.server.js       | 13 ----
 src/routes/(app)/[username]/support/+page.svelte   | 76 --------------------
 src/routes/(app)/support/+page.server.js           | 16 +++++
 src/routes/(app)/support/+page.svelte              | 81 ++++++++++++++++++++++
 7 files changed, 101 insertions(+), 93 deletions(-)
 delete mode 100644 src/routes/(app)/[username]/support/+page.server.js
 delete mode 100644 src/routes/(app)/[username]/support/+page.svelte
 create mode 100644 src/routes/(app)/support/+page.server.js
 create mode 100644 src/routes/(app)/support/+page.svelte

(limited to 'src/components')

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index ec0f5174..728b025a 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -17,7 +17,7 @@
 		menuButtons = [
 			{ key: 'nav.profile', icon: 'profile', href: `/${user.username}` },
 			{ key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` },
-			{ key: 'nav.support', icon: 'support', href: `/${user.username}/support` },
+			{ key: 'nav.support', icon: 'support', href: `/support` },
 			{ key: 'nav.signOut', icon: 'logout', href: `/logout` }
 		];
 
@@ -80,7 +80,7 @@
 						class="bg-white p-2 rounded-full w-12 h-12 drop-shadow-xl border border-black/10 {$page
 							.url.pathname === `/${user.username}` ||
 						$page.url.pathname === `/${user.username}/settings` ||
-						$page.url.pathname === `/${user.username}/support`
+						$page.url.pathname === `/support`
 							? 'opacity-100'
 							: `opacity-70 hover:opacity-80 ${showMenu ? 'opacity-80' : ''}`}"
 						on:click={() => (showMenu = !showMenu)}
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
index 5e0aeb4a..0b0a2b72 100644
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@@ -10,7 +10,7 @@
 
 	const companyLinks = [
 		{ url: '/news', titleID: 'news' },
-		{ url: 'mailto:support@coinos.io', titleID: 'support' },
+		{ url: '/support', titleID: 'support' },
 		{ url: '/jobs', titleID: 'jobs' }
 	];
 </script>
diff --git a/src/lib/utils.js b/src/lib/utils.js
index c3960487..2bf6b800 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -70,7 +70,7 @@ export function reverseFormat(val, locale) {
 	return Number.isNaN(reversedVal) ? 0 : +reversedVal;
 }
 
-export let protectedRoutes = [/customers/, /dashboard/, /settings/, /transactions/, /support/];
+export let protectedRoutes = [/customers/, /dashboard/, /settings/, /transactions/];
 
 export const success = (m) => {
 	toast.pop();
diff --git a/src/routes/(app)/[username]/support/+page.server.js b/src/routes/(app)/[username]/support/+page.server.js
deleted file mode 100644
index a335ec96..00000000
--- a/src/routes/(app)/[username]/support/+page.server.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let form = Object.fromEntries(await request.formData());
-
-		try {
-			await post('/email', form);
-		} catch (e) {
-			return invalid(400, { failed: true });
-		}
-
-		return { success: true };
-	}
-};
diff --git a/src/routes/(app)/[username]/support/+page.svelte b/src/routes/(app)/[username]/support/+page.svelte
deleted file mode 100644
index cd1cc69f..00000000
--- a/src/routes/(app)/[username]/support/+page.svelte
+++ /dev/null
@@ -1,76 +0,0 @@
-<script>
-	import { enhance } from '$app/forms';
-	import { scale } from 'svelte/transition';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
-
-	export let data, form;
-
-	let { user } = data;
-	let email;
-	let message;
-</script>
-
-<div class="container px-4 max-w-lg mx-auto mt-20">
-	{#if form?.success}
-		<h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">Thank you!</h1>
-		<p class="text-center mb-8">Someone will be in touch shortly.</p>
-
-		<a href={`/${user.username}/dashboard`}>
-			<button class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full mb-2"
-				>Done</button
-			>
-		</a>
-	{:else}
-		<h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">
-			{$t('user.support.header')}
-		</h1>
-		<form method="POST" use:enhance>
-			<div class="mb-4">
-				<label for="account" class="font-semibold">{$t('user.support.accountName')}</label>
-				<input
-					class="block border rounded-xl p-2 w-full"
-					type="text"
-					name="account"
-					required
-					disabled
-					value={user.username}
-				/>
-			</div>
-
-			<div class="mb-4">
-				<label for="email" class="font-semibold">{$t('user.support.email')}</label>
-				<input
-					class="block border rounded-xl p-2 w-full"
-					type="email"
-					name="email"
-					bind:value={email}
-					required
-				/>
-			</div>
-
-			<div class="mb-4">
-				<label for="message" class="font-semibold">{$t('user.support.message')}</label>
-				<textarea
-					rows={5}
-					class="block border rounded-xl p-2 w-full"
-					type="text"
-					name="message"
-					bind:value={message}
-					required
-				/>
-			</div>
-
-			<button
-				type="submit"
-				disabled={!email || !message}
-				class="{!email || !message
-					? 'opacity-50'
-					: 'opacity-100'} bg-black text-white font-bold rounded-xl py-3 w-full mx-auto {email &&
-				message
-					? 'hover:opacity-80'
-					: ''}">{$t('user.support.send')}</button
-			>
-		</form>
-	{/if}
-</div>
diff --git a/src/routes/(app)/support/+page.server.js b/src/routes/(app)/support/+page.server.js
new file mode 100644
index 00000000..78c640e3
--- /dev/null
+++ b/src/routes/(app)/support/+page.server.js
@@ -0,0 +1,16 @@
+import { post } from "$lib/utils";
+import { invalid } from '@sveltejs/kit';
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let form = Object.fromEntries(await request.formData());
+
+		try {
+			await post('/email', form);
+		} catch (e) {
+			return invalid(400, { error: e.message });
+		}
+
+		return { success: true };
+	}
+};
diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte
new file mode 100644
index 00000000..9181f701
--- /dev/null
+++ b/src/routes/(app)/support/+page.svelte
@@ -0,0 +1,81 @@
+<script>
+	import { enhance } from '$app/forms';
+	import { scale } from 'svelte/transition';
+	import { Icon } from '$comp';
+	import { t } from '$lib/translations';
+
+	export let data, form;
+
+	let { user } = data;
+	let email;
+	let message;
+</script>
+
+{#if form?.error}
+	<div class="text-red-600 text-center">
+		{form.error}
+	</div>
+{/if}
+
+<div class="container px-4 max-w-lg mx-auto mt-20">
+	{#if form?.success}
+		<h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">Thank you!</h1>
+		<p class="text-center mb-8">Someone will be in touch shortly.</p>
+
+		<a href={user ? `/${user.username}/dashboard` : '/'}>
+			<button class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full mb-2"
+				>Done</button
+			>
+		</a>
+	{:else}
+		<h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">
+			{$t('user.support.header')}
+		</h1>
+		<form method="POST" use:enhance>
+			<div class="mb-4">
+				<label for="account" class="font-semibold">{$t('user.support.accountName')}</label>
+				<input
+					class="block border rounded-xl p-2 w-full"
+					type="text"
+					name="account"
+					required
+					value={user?.username || ''}
+				/>
+			</div>
+
+			<div class="mb-4">
+				<label for="email" class="font-semibold">{$t('user.support.email')}</label>
+				<input
+					class="block border rounded-xl p-2 w-full"
+					type="email"
+					name="email"
+					bind:value={email}
+					required
+				/>
+			</div>
+
+			<div class="mb-4">
+				<label for="message" class="font-semibold">{$t('user.support.message')}</label>
+				<textarea
+					rows={5}
+					class="block border rounded-xl p-2 w-full"
+					type="text"
+					name="message"
+					bind:value={message}
+					required
+				/>
+			</div>
+
+			<button
+				type="submit"
+				disabled={!email || !message}
+				class="{!email || !message
+					? 'opacity-50'
+					: 'opacity-100'} bg-black text-white font-bold rounded-xl py-3 w-full mx-auto {email &&
+				message
+					? 'hover:opacity-80'
+					: ''}">{$t('user.support.send')}</button
+			>
+		</form>
+	{/if}
+</div>
-- 
cgit v1.2.3


From 6cd848815e832b474224c17afd547d156a672706 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 9 Nov 2022 11:23:52 -0800
Subject: short form sats on numpad

---
 src/components/Numpad.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/components')

diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 55ce96d4..4f546499 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { Left, Icon } from '$comp';
 	import { selectedRate } from '$lib/store';
-	import { f, s, post, warning, sats } from '$lib/utils';
+	import { f, s, post, warning, sat, sats } from '$lib/utils';
 	import { t } from '$lib/translations';
 
 	export let amount,
@@ -36,7 +36,7 @@
 
 	$: amountFiatConverted = f(amountSats * ($selectedRate / sats), currency);
 
-	$: amountSatsConverted = s(amountFiat / ($selectedRate / sats));
+	$: amountSatsConverted = sat(amountFiat / ($selectedRate / sats));
 
 	const numPad = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '0', '<'];
 
@@ -94,7 +94,7 @@
 				{fiat ? `${symbol}${amountFiat}` : '⚡️' + amountSatsFormatted}
 			</div>
 			<span class="text-secondary mr-1"
-				>{fiat ? `⚡️${amountSatsConverted}` : amountFiatConverted}</span
+				>{fiat ? amountSatsConverted : amountFiatConverted}</span
 			>
 			<button
 				type="button"
-- 
cgit v1.2.3