diff options
| -rw-r--r-- | src/components/Numpad.svelte | 4 | ||||
| -rw-r--r-- | src/routes/(app)/+error.svelte | 29 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/dashboard/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/settings/[...tab]/+page.svelte | 6 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/settings/[...tab]/_pos.svelte | 8 | ||||
| -rw-r--r-- | src/routes/(app)/invoice/[id]/+page.svelte | 4 | ||||
| -rw-r--r-- | src/routes/(app)/ln/[lnurl]/+page.server.js | 18 | ||||
| -rw-r--r-- | src/routes/(app)/support/+page.server.js | 2 | ||||
| -rw-r--r-- | src/routes/(app)/support/+page.svelte | 15 |
9 files changed, 44 insertions, 44 deletions
diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte index 4f546499..a4cdb50f 100644 --- a/src/components/Numpad.svelte +++ b/src/components/Numpad.svelte @@ -93,9 +93,7 @@ <div class="text-5xl md:text-6xl font-semibold tracking-widest mb-1"> {fiat ? `${symbol}${amountFiat}` : '⚡️' + amountSatsFormatted} </div> - <span class="text-secondary mr-1" - >{fiat ? amountSatsConverted : amountFiatConverted}</span - > + <span class="text-secondary mr-1">{fiat ? amountSatsConverted : amountFiatConverted}</span> <button type="button" on:click={() => { diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte index dddc83a7..8d613909 100644 --- a/src/routes/(app)/+error.svelte +++ b/src/routes/(app)/+error.svelte @@ -21,21 +21,22 @@ </a> </div> - <div class="flex justify-center items-center"> - <div class="shadow-xl rounded-3xl p-10 pb-12 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]"> - <h1 class="text-3xl md:text-4xl font-semibold"> - {$t('error.header')} - </h1> + <div class="flex justify-center items-center"> + <div class="shadow-xl rounded-3xl p-10 pb-12 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]"> + <h1 class="text-3xl md:text-4xl font-semibold"> + {$t('error.header')} + </h1> - <p class="text-secondary"> - {message}. If the problem persists, please <a href="/support" class="underline">let us know.</a> - </p> + <p class="text-secondary"> + {message}. If the problem persists, please + <a href="/support" class="underline">let us know.</a> + </p> - <button - class="rounded-full bg-black text-white py-2 px-5 font-bold hover:opacity-80 mb-2" - on:click={back}>Back</button - > - </div> - </div> + <button + class="rounded-full bg-black text-white py-2 px-5 font-bold hover:opacity-80 mb-2" + on:click={back}>Back</button + > + </div> + </div> </div> {/if} diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte index 3a90968c..5d6322eb 100644 --- a/src/routes/(app)/[username]/dashboard/+page.svelte +++ b/src/routes/(app)/[username]/dashboard/+page.svelte @@ -98,7 +98,7 @@ <div>= {f(animatedRate, user.currency)}</div> </div> <div class="text-secondary flex ml-auto"> - <div>{sat(sats)} =</div> + <div>{sat(sats)} =</div> <div class="flex ml-1"> <div class="my-auto mr-1">1</div> <img src="/images/bitcoin.svg" class="w-5 my-auto" /> diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte index d546e817..d47ce0de 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte +++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte @@ -19,10 +19,10 @@ let submit; - let { user, token, tab } = data; + let { user, token, rates, tab } = data; $: update(data); - let update = () => ({ user, token, tab } = data); + let update = () => ({ user, token, rates, tab } = data); $: form?.user && ({ user } = form); @@ -87,7 +87,7 @@ {/each} </div> - <svelte:component this={comp} {user} {submit} /> + <svelte:component this={comp} {user} {rates} {submit} /> </div> <div diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte index d5e17786..b4aa3181 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte +++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte @@ -4,17 +4,15 @@ import { success, failure } from '$lib/utils'; import { page } from '$app/stores'; - let { rates, user } = $page.data; - - $: ({ rates, user } = $page.data); + export let user, rates; const fiats = Object.keys(rates); </script> <div> <label for="currency" class="font-bold block mb-1">{$t('user.settings.localCurrency')}</label> - <select name="currency" class="select-styles block py-3 w-full"> + <select name="currency" class="select-styles block py-3 w-full" value={user.currency}> {#each fiats as fiat} - <option value={fiat} selected={user.currency === fiat}>{fiat}</option> + <option value={fiat}>{fiat}</option> {/each} </select> </div> diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index 569d1430..ad985d07 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -80,8 +80,6 @@ <div class="container mx-auto max-w-lg px-4 space-y-5"> <div class="w-full flex"> <h1 class="text-secondary block text-2xl flex mx-auto"> - <div class="my-auto">Send to</div> - <div> <a href="/{username}" class="text-black font-semibold hover:opacity-80 mx-auto"> <div class="flex my-auto"> @@ -100,7 +98,7 @@ </div> {#if address} - <div>{address}</div> + <div class="text-secondary">{address}</div> {/if} <div class="mb-10 flex gap-2 justify-center"> diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.js b/src/routes/(app)/ln/[lnurl]/+page.server.js index b3d76041..eb31a058 100644 --- a/src/routes/(app)/ln/[lnurl]/+page.server.js +++ b/src/routes/(app)/ln/[lnurl]/+page.server.js @@ -2,16 +2,16 @@ 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'); + 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); - } + return lnurl; + } catch (e) { + throw error(500, e.message); + } } export const actions = { diff --git a/src/routes/(app)/support/+page.server.js b/src/routes/(app)/support/+page.server.js index 78c640e3..02c5e3b3 100644 --- a/src/routes/(app)/support/+page.server.js +++ b/src/routes/(app)/support/+page.server.js @@ -1,4 +1,4 @@ -import { post } from "$lib/utils"; +import { post } from '$lib/utils'; import { invalid } from '@sveltejs/kit'; export const actions = { diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte index 690e4770..64353f4d 100644 --- a/src/routes/(app)/support/+page.svelte +++ b/src/routes/(app)/support/+page.svelte @@ -7,9 +7,9 @@ export let data, form; let { user } = data; - $: if (user) { - data.subject = { ...user }; - } + $: if (user) { + data.subject = { ...user }; + } let email; let message; @@ -40,8 +40,13 @@ {$t('user.support.header')} </h1> - <p class="text-secondary">Fill out this form or email us directly at <a class="underline" href="mailto:[email protected]">[email protected]</a> and we'll do our best to get back to you in a timely manner.</p> - + <p class="text-secondary"> + Fill out this form or email us directly at <a + class="underline" + href="mailto:[email protected]">[email protected]</a + > and we'll do our best to get back to you in a timely manner. + </p> + <form method="POST" use:enhance> <div class="mb-4"> <label for="account" class="font-semibold">{$t('user.support.accountName')}</label> |