From 216a600224fde22ce76b367557a02094ec693886 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 1 Dec 2023 20:04:13 -0800 Subject: prettier --- src/routes/(app)/+error.svelte | 58 +- src/routes/(app)/+layout.server.js | 86 +-- src/routes/(app)/+layout.svelte | 297 ++++++----- .../(app)/[username]/(profile)/+layout.server.js | 36 +- .../(app)/[username]/(profile)/+layout.svelte | 466 +++++++++-------- .../(app)/[username]/(profile)/+page.server.js | 52 +- src/routes/(app)/[username]/(profile)/+page.svelte | 462 ++++++++-------- .../(profile)/event/[id]/+page.server.js | 18 +- .../[username]/(profile)/event/[id]/+page.svelte | 6 +- .../[username]/(profile)/followers/+page.svelte | 81 +-- .../[username]/(profile)/follows/+page.svelte | 78 +-- .../[username]/(profile)/request/+page.server.js | 22 +- .../[username]/(profile)/request/+page.svelte | 50 +- .../[username]/(profile)/request/sent/+page.svelte | 21 +- src/routes/(app)/[username]/+layout.server.js | 18 +- src/routes/(app)/[username]/+layout.svelte | 96 ++-- .../(app)/[username]/address/+page.server.js | 14 +- .../(app)/[username]/card/[serial]/+page.server.js | 22 +- .../(app)/[username]/card/[serial]/+page.svelte | 60 +-- src/routes/(app)/[username]/funds/+page.svelte | 83 ++- src/routes/(app)/[username]/generate/+page.svelte | 110 ++-- src/routes/(app)/[username]/generate/+server.js | 16 +- src/routes/(app)/[username]/invoice/+server.js | 8 +- .../[username]/invoice/[id]/+layout.server.js | 52 +- .../(app)/[username]/invoice/[id]/+page.server.js | 4 +- .../(app)/[username]/invoice/[id]/+page.svelte | 442 ++++++++-------- .../[username]/invoice/[id]/paid/+page.svelte | 108 ++-- .../[username]/invoice/[id]/tip/+page.server.js | 11 +- .../(app)/[username]/invoice/[id]/tip/+page.svelte | 386 +++++++------- .../(app)/[username]/invoice/sent/+page.svelte | 8 +- src/routes/(app)/[username]/map/+page.server.js | 12 +- src/routes/(app)/[username]/map/+page.svelte | 6 +- .../(app)/[username]/messages/+page.server.js | 31 +- src/routes/(app)/[username]/messages/+page.svelte | 335 ++++++------ .../[username]/payments/[...page]/+page.server.js | 30 +- .../[username]/payments/[...page]/+page.svelte | 514 +++++++++--------- .../(app)/[username]/payments/[...page]/+server.js | 22 +- .../[username]/receive/[...param]/+page.server.js | 14 +- .../[username]/receive/[...param]/+page.svelte | 82 +-- .../(app)/[username]/request/[id]/+page.server.js | 35 +- .../(app)/[username]/request/[id]/+page.svelte | 85 +-- src/routes/(app)/[username]/reset/+server.js | 14 +- .../[username]/settings/[...tab]/+page.server.js | 31 +- .../[username]/settings/[...tab]/+page.svelte | 400 +++++++------- .../[username]/settings/[...tab]/_account.svelte | 342 ++++++------ .../(app)/[username]/settings/[...tab]/_pos.svelte | 84 +-- .../[username]/settings/[...tab]/_security.svelte | 561 ++++++++++---------- .../[username]/settings/[...tab]/_shopify.svelte | 129 +++-- src/routes/(app)/[username]/shopify.js/+server.js | 14 +- src/routes/(app)/admin/+layout.server.js | 14 +- src/routes/(app)/admin/+layout.svelte | 8 +- src/routes/(app)/admin/+page.server.js | 14 +- src/routes/(app)/admin/+page.svelte | 34 +- src/routes/(app)/buy/+page.server.js | 43 +- src/routes/(app)/buy/+page.svelte | 230 ++++---- src/routes/(app)/disable2fa/+server.js | 18 +- src/routes/(app)/enable2fa/+server.js | 8 +- src/routes/(app)/events/+server.js | 6 +- src/routes/(app)/fund/[id]/+page.server.js | 28 +- src/routes/(app)/fund/[id]/+page.svelte | 256 ++++----- src/routes/(app)/fund/[id]/sweep/+page.server.js | 17 +- src/routes/(app)/fund/[id]/sweep/+page.svelte | 54 +- .../(app)/fund/[id]/withdraw/+page.server.js | 26 +- src/routes/(app)/fund/[id]/withdraw/+page.svelte | 94 ++-- src/routes/(app)/fund/[id]/withdraw/+server.js | 6 +- src/routes/(app)/launch/+page.server.js | 6 +- src/routes/(app)/launch/+page.svelte | 187 ++++--- src/routes/(app)/launch/purchase/+page.server.js | 68 +-- src/routes/(app)/launch/purchase/+page.svelte | 114 ++-- .../(app)/launch/purchase/card/+page.server.js | 88 ++-- src/routes/(app)/launch/purchase/card/+page.svelte | 134 ++--- .../(app)/launch/thanks/[asset]/+page.svelte | 40 +- src/routes/(app)/launch/ticket/+page.server.js | 14 +- src/routes/(app)/launch/ticket/+page.svelte | 56 +- src/routes/(app)/ln/[lnurl]/+page.server.js | 118 +++-- src/routes/(app)/ln/[lnurl]/+page.svelte | 14 +- src/routes/(app)/ln/withdrawal/sent/+page.svelte | 31 +- src/routes/(app)/locations/+server.js | 20 +- src/routes/(app)/login/+page.server.js | 36 +- src/routes/(app)/login/+page.svelte | 20 +- src/routes/(app)/logout/+page.server.js | 12 +- src/routes/(app)/otpsecret/+server.js | 26 +- src/routes/(app)/password/+server.js | 8 +- src/routes/(app)/payment/[id]/+page.server.js | 6 +- src/routes/(app)/payment/[id]/+page.svelte | 289 +++++----- .../(app)/payment/[id]/plain/+page.server.js | 6 +- src/routes/(app)/payment/[id]/plain/+page.svelte | 132 ++--- src/routes/(app)/payment/[id]/print/+server.js | 8 +- src/routes/(app)/pin/+server.js | 8 +- src/routes/(app)/qr/[text]/+page.server.js | 8 +- src/routes/(app)/qr/[text]/+page.svelte | 18 +- .../(app)/redeem/[redeemcode]/+page.server.js | 24 +- src/routes/(app)/redeem/[redeemcode]/+page.svelte | 4 +- src/routes/(app)/register/+page.server.js | 67 +-- src/routes/(app)/register/+page.svelte | 582 +++++++++++---------- src/routes/(app)/scan/+page.svelte | 63 ++- src/routes/(app)/send/+layout.svelte | 14 +- src/routes/(app)/send/[...text]/+page.server.js | 182 +++---- src/routes/(app)/send/[...text]/+page.svelte | 212 ++++---- .../bitcoin/[address]/[...amount]/+page.server.js | 45 +- .../bitcoin/[address]/[...amount]/+page.svelte | 279 +++++----- .../send/fund/[name]/[...amount]/+page.server.js | 24 +- .../send/fund/[name]/[...amount]/+page.svelte | 94 ++-- src/routes/(app)/send/invoice/[id]/+page.server.js | 65 ++- src/routes/(app)/send/invoice/[id]/+page.svelte | 300 ++++++----- .../(app)/send/lightning/[payreq]/+page.server.js | 30 +- .../(app)/send/lightning/[payreq]/+page.svelte | 181 ++++--- .../user/[username]/[...amount]/+page.server.js | 81 +-- .../send/user/[username]/[...amount]/+page.svelte | 166 +++--- src/routes/(app)/sent/+page.server.js | 6 +- src/routes/(app)/sent/+page.svelte | 73 +-- src/routes/(app)/support/+page.svelte | 214 ++++---- src/routes/(app)/support/+server.js | 8 +- src/routes/(app)/withdraw/+server.js | 11 +- 114 files changed, 5699 insertions(+), 5261 deletions(-) (limited to 'src/routes/(app)') diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte index 36726e26..ed0bec3e 100644 --- a/src/routes/(app)/+error.svelte +++ b/src/routes/(app)/+error.svelte @@ -1,38 +1,38 @@
-
- - - -
+
+ + + +
-
-
-
-

Error

-
-

Something went wrong

-

{$page.error.message}

+
+
+
+

Error

+
+

Something went wrong

+

{$page.error.message}

-
- - - -
-
-
+
+ + + +
+
+
diff --git a/src/routes/(app)/+layout.server.js b/src/routes/(app)/+layout.server.js index e80e1e64..9fcf6411 100644 --- a/src/routes/(app)/+layout.server.js +++ b/src/routes/(app)/+layout.server.js @@ -1,44 +1,48 @@ -import { error, redirect } from '@sveltejs/kit'; -import { get, post, auth, protectedRoutes } from '$lib/utils'; -import { PUBLIC_BTC as btc } from '$env/static/public'; +import { error, redirect } from "@sveltejs/kit"; +import { get, post, auth, protectedRoutes } from "$lib/utils"; +import { PUBLIC_BTC as btc } from "$env/static/public"; export async function load({ cookies, request, url, params }) { - let { pathname } = url; - let token = cookies.get('token'); - let rate, - rates = { USD: 1 }; - - let user; - if (token) { - try { - user = await get('/me', auth(cookies)); - } catch (e) {} - } - - if (user?.needsMigration) { - throw redirect(307, `/migrate`); - } - - if (user && ['/login', '/register'].includes(pathname) && request.method === 'GET') { - throw redirect(307, `/${user.username}`); - } - - if ( - protectedRoutes.find((p) => pathname.match(p)) && - (!user || user.username !== params.username) - ) { - throw redirect(307, '/login'); - } - - if (user && !user.pubkey && !pathname.includes('generate')) - throw redirect(307, `/${user.username}/generate`); - - try { - rate = await get('/rate'); - rates = await get('/rates'); - } catch (e) { - console.log(e); - } - - return { user, token, rate, rates }; + let { pathname } = url; + let token = cookies.get("token"); + let rate, + rates = { USD: 1 }; + + let user; + if (token) { + try { + user = await get("/me", auth(cookies)); + } catch (e) {} + } + + if (user?.needsMigration) { + throw redirect(307, `/migrate`); + } + + if ( + user && + ["/login", "/register"].includes(pathname) && + request.method === "GET" + ) { + throw redirect(307, `/${user.username}`); + } + + if ( + protectedRoutes.find((p) => pathname.match(p)) && + (!user || user.username !== params.username) + ) { + throw redirect(307, "/login"); + } + + if (user && !user.pubkey && !pathname.includes("generate")) + throw redirect(307, `/${user.username}/generate`); + + try { + rate = await get("/rate"); + rates = await get("/rates"); + } catch (e) { + console.log(e); + } + + return { user, token, rate, rates }; } diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 51ade9c7..c5a312e1 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -1,167 +1,174 @@ {#if browser && $passwordPrompt} - + {/if} - {#if subject} - coinos - {subject.username} - - {:else} - coinos - {/if} - - {#if subject?.profile} - - {:else} - - {/if} + {#if subject} + coinos - {subject.username} + + {:else} + coinos + {/if} + + {#if subject?.profile} + + {:else} + + {/if}
- +
{#if $invoice} - + {/if} {#if $request} - + {/if} diff --git a/src/routes/(app)/[username]/(profile)/+layout.server.js b/src/routes/(app)/[username]/(profile)/+layout.server.js index f4f2ca0a..a508de92 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.server.js +++ b/src/routes/(app)/[username]/(profile)/+layout.server.js @@ -1,26 +1,26 @@ -import { get } from '$lib/utils'; +import { get } from "$lib/utils"; export async function load({ parent }) { - let { subject, user } = await parent(); + let { subject, user } = await parent(); - subject.follows = []; - subject.followers = []; + subject.follows = []; + subject.followers = []; - try { - subject.follows = await get(`/${subject.pubkey}/follows`); - } catch (e) { - console.log('problem fetching follows', e); - } + try { + subject.follows = await get(`/${subject.pubkey}/follows`); + } catch (e) { + console.log("problem fetching follows", e); + } - try { - subject.followers = await get(`/${subject.pubkey}/followers`); - } catch (e) { - console.log('problem fetching followers', e); - } + try { + subject.followers = await get(`/${subject.pubkey}/followers`); + } catch (e) { + console.log("problem fetching followers", e); + } - if (user) { - user.follows = await get(`/${user.pubkey}/follows?tagsonly=true`); - } + if (user) { + user.follows = await get(`/${user.pubkey}/follows?tagsonly=true`); + } - return { subject, user }; + return { subject, user }; } diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index 55c22bdb..6b166e2c 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -1,236 +1,246 @@
-