From e2608b3fe00d4575c08846af4f7a192e4f1100ed Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 26 Oct 2023 14:24:43 -0700 Subject: reveal seed phrase --- src/lib/nostr.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/nostr.js b/src/lib/nostr.js index 987b89d0..28dbe50f 100644 --- a/src/lib/nostr.js +++ b/src/lib/nostr.js @@ -58,7 +58,7 @@ function typedArrayToBuffer(array) { return array.buffer.slice(array.byteOffset, array.byteLength + array.byteOffset); } -let getPrivateKey = async (user) => { +export let getMnemonic = async (user) => { let { cipher, username, salt } = user; let password = get(pw); @@ -85,8 +85,11 @@ let getPrivateKey = async (user) => { ) ); - mnemonic = entropyToMnemonic(entropy, wordlist); - return privateKeyFromSeedWords(mnemonic); + return entropyToMnemonic(entropy, wordlist); +}; + +let getPrivateKey = async (user) => { + return privateKeyFromSeedWords(await getMnemonic(user)); }; export let sign = async ({ event, user }) => { -- cgit v1.2.3 From 8041f705373758940b9487ed5c4cd34bfb04ac16 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 8 Nov 2023 13:46:04 -0800 Subject: rename pot to fund --- src/lib/utils.js | 2 +- src/locales/en.json | 2 +- .../(app)/[username]/card/[serial]/+page.server.js | 6 +- .../(app)/[username]/invoice/[id]/+page.svelte | 2 +- src/routes/(app)/fund/[name]/+page.server.js | 23 ++++ src/routes/(app)/fund/[name]/+page.svelte | 138 +++++++++++++++++++++ src/routes/(app)/fund/[name]/sweep/+page.server.js | 14 +++ src/routes/(app)/fund/[name]/sweep/+page.svelte | 37 ++++++ .../(app)/fund/[name]/withdraw/+page.server.js | 20 +++ src/routes/(app)/fund/[name]/withdraw/+page.svelte | 58 +++++++++ src/routes/(app)/fund/[name]/withdraw/+server.js | 6 + src/routes/(app)/payment/[id]/+page.svelte | 4 +- src/routes/(app)/pot/[name]/+page.server.js | 23 ---- src/routes/(app)/pot/[name]/+page.svelte | 138 --------------------- src/routes/(app)/pot/[name]/sweep/+page.server.js | 14 --- src/routes/(app)/pot/[name]/sweep/+page.svelte | 37 ------ .../(app)/pot/[name]/withdraw/+page.server.js | 20 --- src/routes/(app)/pot/[name]/withdraw/+page.svelte | 58 --------- src/routes/(app)/pot/[name]/withdraw/+server.js | 6 - src/routes/(app)/send/[...text]/+page.server.js | 9 +- src/routes/(app)/send/[...text]/+page.svelte | 13 -- .../send/fund/[name]/[...amount]/+page.server.js | 17 +++ .../send/fund/[name]/[...amount]/+page.svelte | 58 +++++++++ .../send/pot/[name]/[...amount]/+page.server.js | 17 --- .../(app)/send/pot/[name]/[...amount]/+page.svelte | 58 --------- 25 files changed, 383 insertions(+), 397 deletions(-) create mode 100644 src/routes/(app)/fund/[name]/+page.server.js create mode 100644 src/routes/(app)/fund/[name]/+page.svelte create mode 100644 src/routes/(app)/fund/[name]/sweep/+page.server.js create mode 100644 src/routes/(app)/fund/[name]/sweep/+page.svelte create mode 100644 src/routes/(app)/fund/[name]/withdraw/+page.server.js create mode 100644 src/routes/(app)/fund/[name]/withdraw/+page.svelte create mode 100644 src/routes/(app)/fund/[name]/withdraw/+server.js delete mode 100644 src/routes/(app)/pot/[name]/+page.server.js delete mode 100644 src/routes/(app)/pot/[name]/+page.svelte delete mode 100644 src/routes/(app)/pot/[name]/sweep/+page.server.js delete mode 100644 src/routes/(app)/pot/[name]/sweep/+page.svelte delete mode 100644 src/routes/(app)/pot/[name]/withdraw/+page.server.js delete mode 100644 src/routes/(app)/pot/[name]/withdraw/+page.svelte delete mode 100644 src/routes/(app)/pot/[name]/withdraw/+server.js create mode 100644 src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js create mode 100644 src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte delete mode 100644 src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js delete mode 100644 src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte (limited to 'src/lib') diff --git a/src/lib/utils.js b/src/lib/utils.js index 52494c88..9e1066e2 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -251,7 +251,7 @@ export let types = { bitcoin: 'bitcoin', lightning: 'lightning', internal: 'internal', - pot: 'pot', + fund: 'fund', classic: 'classic' }; diff --git a/src/locales/en.json b/src/locales/en.json index a1d0c0aa..d3e294d4 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -263,7 +263,7 @@ } }, "payments": { - "moneyPot": "Money Pot", + "fund": "Fund", "addFunds": "Add Funds", "takeFunds": "Take Funds", "show": "Show", diff --git a/src/routes/(app)/[username]/card/[serial]/+page.server.js b/src/routes/(app)/[username]/card/[serial]/+page.server.js index e2569536..40e375aa 100644 --- a/src/routes/(app)/[username]/card/[serial]/+page.server.js +++ b/src/routes/(app)/[username]/card/[serial]/+page.server.js @@ -3,14 +3,14 @@ import { redirect } from "@sveltejs/kit" export let load = async ({ cookies, params }) => { let { serial } = params; - let pot; + let fund; try { - pot = await get(`/pot/${serial}`, auth(cookies)); + fund = await get(`/fund/${serial}`, auth(cookies)); } catch (e) { console.log(e); } - if (pot) throw redirect(307, `/pot/${serial}`); + if (fund) throw redirect(307, `/fund/${serial}`); return params; }; diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte index 2d204255..a0894dd1 100644 --- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte +++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte @@ -15,7 +15,7 @@ let reading = async ({ message, serialNumber }) => { let name = serialNumber.replace(/:/g, '-'); - let result = await post(`/pot/${name}/withdraw`, { amount, hash, name }); + let result = await post(`/fund/${name}/withdraw`, { amount, hash, name }); }; let readingerror = (e) => console.log('nfc error', e); diff --git a/src/routes/(app)/fund/[name]/+page.server.js b/src/routes/(app)/fund/[name]/+page.server.js new file mode 100644 index 00000000..ad20c7d9 --- /dev/null +++ b/src/routes/(app)/fund/[name]/+page.server.js @@ -0,0 +1,23 @@ +import { error, redirect } from '@sveltejs/kit'; +import { auth, get, post } from '$lib/utils'; +import Qr from 'qrcode-base64'; + +export let load = async ({ params: { name }, url }) => { + let { amount, payments } = await get(`/fund/${name}`); + + let src = Qr.drawImg(url.href, { size: 300 }); + return { amount, payments, src }; +}; + +export const actions = { + default: async ({ cookies, locals, params, request }) => { + let { user } = locals; + + if (user) { + await post('/redeem', params, auth(cookies)); + throw redirect(307, `/${user.username}/payments`); + } + + throw redirect(307, '/register'); + } +}; diff --git a/src/routes/(app)/fund/[name]/+page.svelte b/src/routes/(app)/fund/[name]/+page.svelte new file mode 100644 index 00000000..0ac10c24 --- /dev/null +++ b/src/routes/(app)/fund/[name]/+page.svelte @@ -0,0 +1,138 @@ + + +
+
+
+
+ + {#if name.split('-').length === 4} +

Card {name}

+ {:else} + Fund +
+

{$t('payments.fund')}

+

{name}

+
+ {/if} +
+ {#if show} + {name} + {/if} +
+
+

+ {f(amountFiat, currency)} +

+

+ {sat(amount)} +

+
+
+
+
+ + + +
+
+ + + +
+
+
+ + +
+
+ {#each payments as p} + +
+
+
0}> + {f(Math.abs(p.amount) * (p.rate / sats), p.currency)} + {#if p.tip} + + +{Math.round((p.tip / Math.abs(p.amount)) * 100)}% + + {/if} +
+ +
+ {sat(Math.abs(p.amount) + (p.tip || 0))} +
+
+ +
+
+
+ +
+
{p.user.username}
+
+
+ +
+
+ {format(new Date(p.created), 'h:mm aaa')} +
+
+ {format(new Date(p.created), 'MMM d')} +
+
+
+ + {:else} +

{$t('payments.empty')}

+ {/each} +
+
+
+
diff --git a/src/routes/(app)/fund/[name]/sweep/+page.server.js b/src/routes/(app)/fund/[name]/sweep/+page.server.js new file mode 100644 index 00000000..929348ef --- /dev/null +++ b/src/routes/(app)/fund/[name]/sweep/+page.server.js @@ -0,0 +1,14 @@ +import { get, auth, post } from '$lib/utils'; +import { redirect } from '@sveltejs/kit'; + +export async function load({ cookies, params, parent }) { + let { user } = await parent(); + let { name } = params; + let { amount } = await get(`/fund/${name}`); + + + if (!amount) throw redirect(307, `/fund/${name}`); + if (!user) throw redirect(307, `/register?redirect=/fund/${name}/sweep`); + await post('/take', { amount, name }, auth(cookies)); + return { amount, name }; +} diff --git a/src/routes/(app)/fund/[name]/sweep/+page.svelte b/src/routes/(app)/fund/[name]/sweep/+page.svelte new file mode 100644 index 00000000..9b473af3 --- /dev/null +++ b/src/routes/(app)/fund/[name]/sweep/+page.svelte @@ -0,0 +1,37 @@ + + +
+
+ + + +
+ +
+ +
+

{$t('payments.fundsClaimed')}

+

+ {f(fiat(amount, rate), currency)} +

+

+ ⚡️{s(amount)} +

+
+ + +
+ + +
{$t('payments.tapAnywhere')}
diff --git a/src/routes/(app)/fund/[name]/withdraw/+page.server.js b/src/routes/(app)/fund/[name]/withdraw/+page.server.js new file mode 100644 index 00000000..4d590890 --- /dev/null +++ b/src/routes/(app)/fund/[name]/withdraw/+page.server.js @@ -0,0 +1,20 @@ +import { fail, json, redirect } from '@sveltejs/kit'; +import { fd, auth, post } from '$lib/utils'; + +export async function load({ parent }) { + let { user } = await parent(); + if (!user) throw redirect(307, '/register'); +} + +export const actions = { + default: async ({ cookies, request }) => { + let body = await fd(request); + try { + await post('/take', body, auth(cookies)); + } catch (e) { + return fail(400, { message: e.message }); + } + + throw redirect(307, `/fund/${body.name}`); + } +}; diff --git a/src/routes/(app)/fund/[name]/withdraw/+page.svelte b/src/routes/(app)/fund/[name]/withdraw/+page.svelte new file mode 100644 index 00000000..7be643a9 --- /dev/null +++ b/src/routes/(app)/fund/[name]/withdraw/+page.svelte @@ -0,0 +1,58 @@ + + + + +{#if form?.message} +
+ {form.message} +
+{/if} + +
+ + +
+ + + + +
+ +
+
+
diff --git a/src/routes/(app)/fund/[name]/withdraw/+server.js b/src/routes/(app)/fund/[name]/withdraw/+server.js new file mode 100644 index 00000000..0f9a23f3 --- /dev/null +++ b/src/routes/(app)/fund/[name]/withdraw/+server.js @@ -0,0 +1,6 @@ +import { json } from '@sveltejs/kit'; +import { auth, post } from '$lib/utils'; + +export async function POST({ cookies, request }) { + return json(await post('/take', await request.json(), auth(cookies))); +} diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte index 38b91658..98c5a68b 100644 --- a/src/routes/(app)/payment/[id]/+page.svelte +++ b/src/routes/(app)/payment/[id]/+page.svelte @@ -47,10 +47,10 @@
{/if} - {#if p.type === types.pot} + {#if p.type === types.fund}
{direction} - +
Pot diff --git a/src/routes/(app)/pot/[name]/+page.server.js b/src/routes/(app)/pot/[name]/+page.server.js deleted file mode 100644 index 8f8b9d8f..00000000 --- a/src/routes/(app)/pot/[name]/+page.server.js +++ /dev/null @@ -1,23 +0,0 @@ -import { error, redirect } from '@sveltejs/kit'; -import { auth, get, post } from '$lib/utils'; -import Qr from 'qrcode-base64'; - -export let load = async ({ params: { name }, url }) => { - let { amount, payments } = await get(`/pot/${name}`); - - let src = Qr.drawImg(url.href, { size: 300 }); - return { amount, payments, src }; -}; - -export const actions = { - default: async ({ cookies, locals, params, request }) => { - let { user } = locals; - - if (user) { - await post('/redeem', params, auth(cookies)); - throw redirect(307, `/${user.username}/payments`); - } - - throw redirect(307, '/register'); - } -}; diff --git a/src/routes/(app)/pot/[name]/+page.svelte b/src/routes/(app)/pot/[name]/+page.svelte deleted file mode 100644 index ea1e45f2..00000000 --- a/src/routes/(app)/pot/[name]/+page.svelte +++ /dev/null @@ -1,138 +0,0 @@ - - -
-
-
-
- - {#if name.split('-').length === 4} -

Card {name}

- {:else} - Pot -
-

{$t('payments.moneyPot')}

-

{name}

-
- {/if} -
- {#if show} - {name} - {/if} -
-
-

- {f(amountFiat, currency)} -

-

- {sat(amount)} -

-
-
-
-
- - - -
-
- - - -
-
-
- - -
-
- {#each payments as p} - -
-
-
0}> - {f(Math.abs(p.amount) * (p.rate / sats), p.currency)} - {#if p.tip} - - +{Math.round((p.tip / Math.abs(p.amount)) * 100)}% - - {/if} -
- -
- {sat(Math.abs(p.amount) + (p.tip || 0))} -
-
- -
-
-
- -
-
{p.user.username}
-
-
- -
-
- {format(new Date(p.created), 'h:mm aaa')} -
-
- {format(new Date(p.created), 'MMM d')} -
-
-
- - {:else} -

{$t('payments.empty')}

- {/each} -
-
-
-
diff --git a/src/routes/(app)/pot/[name]/sweep/+page.server.js b/src/routes/(app)/pot/[name]/sweep/+page.server.js deleted file mode 100644 index c2c8051d..00000000 --- a/src/routes/(app)/pot/[name]/sweep/+page.server.js +++ /dev/null @@ -1,14 +0,0 @@ -import { get, auth, post } from '$lib/utils'; -import { redirect } from '@sveltejs/kit'; - -export async function load({ cookies, params, parent }) { - let { user } = await parent(); - let { name } = params; - let { amount } = await get(`/pot/${name}`); - - - if (!amount) throw redirect(307, `/pot/${name}`); - if (!user) throw redirect(307, `/register?redirect=/pot/${name}/sweep`); - await post('/take', { amount, name }, auth(cookies)); - return { amount, name }; -} diff --git a/src/routes/(app)/pot/[name]/sweep/+page.svelte b/src/routes/(app)/pot/[name]/sweep/+page.svelte deleted file mode 100644 index 9b473af3..00000000 --- a/src/routes/(app)/pot/[name]/sweep/+page.svelte +++ /dev/null @@ -1,37 +0,0 @@ - - -
-
- - - -
- -
- -
-

{$t('payments.fundsClaimed')}

-

- {f(fiat(amount, rate), currency)} -

-

- ⚡️{s(amount)} -

-
- - -
- - -
{$t('payments.tapAnywhere')}
diff --git a/src/routes/(app)/pot/[name]/withdraw/+page.server.js b/src/routes/(app)/pot/[name]/withdraw/+page.server.js deleted file mode 100644 index e7ea29f1..00000000 --- a/src/routes/(app)/pot/[name]/withdraw/+page.server.js +++ /dev/null @@ -1,20 +0,0 @@ -import { fail, json, redirect } from '@sveltejs/kit'; -import { fd, auth, post } from '$lib/utils'; - -export async function load({ parent }) { - let { user } = await parent(); - if (!user) throw redirect(307, '/register'); -} - -export const actions = { - default: async ({ cookies, request }) => { - let body = await fd(request); - try { - await post('/take', body, auth(cookies)); - } catch (e) { - return fail(400, { message: e.message }); - } - - throw redirect(307, `/pot/${body.name}`); - } -}; diff --git a/src/routes/(app)/pot/[name]/withdraw/+page.svelte b/src/routes/(app)/pot/[name]/withdraw/+page.svelte deleted file mode 100644 index 7be643a9..00000000 --- a/src/routes/(app)/pot/[name]/withdraw/+page.svelte +++ /dev/null @@ -1,58 +0,0 @@ - - - - -{#if form?.message} -
- {form.message} -
-{/if} - -
- - -
- - - - -
- -
-
-
diff --git a/src/routes/(app)/pot/[name]/withdraw/+server.js b/src/routes/(app)/pot/[name]/withdraw/+server.js deleted file mode 100644 index 0f9a23f3..00000000 --- a/src/routes/(app)/pot/[name]/withdraw/+server.js +++ /dev/null @@ -1,6 +0,0 @@ -import { json } from '@sveltejs/kit'; -import { auth, post } from '$lib/utils'; - -export async function POST({ cookies, request }) { - return json(await post('/take', await request.json(), auth(cookies))); -} diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js index cafce7c9..6b4b000e 100644 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ b/src/routes/(app)/send/[...text]/+page.server.js @@ -30,7 +30,7 @@ let parse = async (t, host) => { if (id) throw redirect(307, `/send/invoice/${id}`); } - if (t.includes('/pot')) throw redirect(307, t.substring(t.indexOf('/pot'))); + if (t.includes('/fund')) throw redirect(307, t.substring(t.indexOf('/fund'))); if (t.toLowerCase().startsWith('lnurl')) throw redirect(307, `/ln/${t}`); if (t.includes(':')) t = t.split(':')[1]; @@ -66,13 +66,12 @@ let parse = async (t, host) => { if (user) throw redirect(307, `/send/user/${t}`); - // pot - let pot; + let fund; try { - pot = await get(`/pot/${t}`); + fund = await get(`/fund/${t}`); } catch (e) {} - if (pot) throw redirect(307, `/send/pot/${t}`); + if (fund) throw redirect(307, `/send/fund/${t}`); // invoice let invoice; diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte index 3abc5a1a..c246f811 100644 --- a/src/routes/(app)/send/[...text]/+page.svelte +++ b/src/routes/(app)/send/[...text]/+page.svelte @@ -35,19 +35,6 @@
- {#if form?.error} -
-
- Could not find anything with that name. Would you like to create a new pot? -
-
- -
-
- {/if}
diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js new file mode 100644 index 00000000..2cb3c4a9 --- /dev/null +++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js @@ -0,0 +1,17 @@ +import { fail, redirect } from '@sveltejs/kit'; +import { auth, fd, post } from '$lib/utils'; + +export const actions = { + default: async ({ cookies, request }) => { + let body = await fd(request); + let p; + + try { + p = await post('/payments', body, auth(cookies)); + } catch (e) { + return fail(400, { message: e.message }); + } + + if (p) throw redirect(307, `/fund/${body.name}`); + } +}; diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte new file mode 100644 index 00000000..6aecf8f3 --- /dev/null +++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte @@ -0,0 +1,58 @@ + + + + +{#if form?.message} +
+ {form.message} +
+{/if} + +
+ + + + + + + +
+ +
+ +
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js deleted file mode 100644 index 3f819696..00000000 --- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js +++ /dev/null @@ -1,17 +0,0 @@ -import { fail, redirect } from '@sveltejs/kit'; -import { auth, fd, post } from '$lib/utils'; - -export const actions = { - default: async ({ cookies, request }) => { - let body = await fd(request); - let p; - - try { - p = await post('/payments', body, auth(cookies)); - } catch (e) { - return fail(400, { message: e.message }); - } - - if (p) throw redirect(307, `/pot/${body.name}`); - } -}; diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte deleted file mode 100644 index 6aecf8f3..00000000 --- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte +++ /dev/null @@ -1,58 +0,0 @@ - - - - -{#if form?.message} -
- {form.message} -
-{/if} - -
- - -
- - - - -
- -
-
-
-- cgit v1.2.3 From b466b3d39c3b9ec792ef924c7f4750fb70b6a016 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 15 Nov 2023 23:02:29 -0800 Subject: prefill register page --- package.json | 4 +- pnpm-lock.yaml | 16 ++ src/components/AppHeader.svelte | 193 ++++++++-------- src/components/Avatar.svelte | 2 +- src/lib/punks.js | 66 ++++++ src/lib/upload.js | 3 +- src/locales/en.json | 2 +- src/routes/(app)/+layout.svelte | 2 +- .../(app)/[username]/(profile)/+layout.svelte | 36 +-- src/routes/(app)/[username]/(profile)/+page.svelte | 8 +- .../[username]/settings/[...tab]/+page.svelte | 28 ++- .../[username]/settings/[...tab]/_account.svelte | 6 +- .../(app)/[username]/settings/[...tab]/_pos.svelte | 4 +- .../[username]/settings/[...tab]/_security.svelte | 2 +- src/routes/(app)/register/+page.server.js | 29 ++- src/routes/(app)/register/+page.svelte | 245 ++++++++++++++++++++- src/routes/+layout.svelte | 3 + src/routes/+page.server.js | 1 + src/routes/+page.svelte | 109 ++++----- static/icons/upload.svg | 4 + 20 files changed, 576 insertions(+), 187 deletions(-) create mode 100644 src/lib/punks.js create mode 100644 static/icons/upload.svg (limited to 'src/lib') diff --git a/package.json b/package.json index 2063fb63..911e287f 100644 --- a/package.json +++ b/package.json @@ -52,10 +52,12 @@ }, "type": "module", "dependencies": { + "@faker-js/faker": "^8.2.0", "@scure/bip39": "^1.2.1", "html2canvas": "^1.4.1", "leaflet-tooltip-layout": "^0.1.2", "maplibre-gl": "^3.3.1", - "uint8array-extras": "^0.5.0" + "uint8array-extras": "^0.5.0", + "unique-names-generator": "^4.7.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c6490728..1463027a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,6 +5,9 @@ settings: excludeLinksFromLockfile: false dependencies: + '@faker-js/faker': + specifier: ^8.2.0 + version: 8.2.0 '@scure/bip39': specifier: ^1.2.1 version: 1.2.1 @@ -20,6 +23,9 @@ dependencies: uint8array-extras: specifier: ^0.5.0 version: 0.5.0 + unique-names-generator: + specifier: ^4.7.1 + version: 4.7.1 devDependencies: '@scure/base': @@ -319,6 +325,11 @@ packages: dev: true optional: true + /@faker-js/faker@8.2.0: + resolution: {integrity: sha512-VacmzZqVxdWdf9y64lDOMZNDMM/FQdtM9IsaOPKOm2suYwEatb8VkdHqOzXcDnZbk7YDE2BmsJmy/2Hmkn563g==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'} + dev: false + /@jridgewell/sourcemap-codec@1.4.14: resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} dev: true @@ -2011,6 +2022,11 @@ packages: set-value: 2.0.1 dev: false + /unique-names-generator@4.7.1: + resolution: {integrity: sha512-lMx9dX+KRmG8sq6gulYYpKWZc9RlGsgBR6aoO8Qsm3qvkSJ+3rAymr+TnV8EDMrIrwuFJ4kruzMWM/OpYzPoow==} + engines: {node: '>=8'} + dev: false + /update-browserslist-db@1.0.10(browserslist@4.21.4): resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==} hasBin: true diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index a37a834e..123606e1 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -3,7 +3,7 @@ import { banner, newPayment, colorTheme } from '$lib/store'; import { goto } from '$app/navigation'; import { Avatar, Icon } from '$comp'; - import { t } from '$lib/translations'; + import { loading, t } from '$lib/translations'; import { page } from '$app/stores'; export let data; @@ -28,112 +28,115 @@ $banner?.id && $banner.id === subject.id ? `url(${$banner.src})` : subject?.banner - ? `url(/api/public/${subject.id}-banner.webp)` + ? `url(/api/public/${subject.banner}.webp)` : undefined; $: $page && (showMenu = false); -
-
- {:else} - - - - {/if} - -
- -
- + + {/if} + +
+ +
+ +{/if} diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte index b258a0e8..3955a42f 100644 --- a/src/components/Avatar.svelte +++ b/src/components/Avatar.svelte @@ -1,29 +1,31 @@ -
- {user.username} -
+
+ {user.username} +
diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte index 0e4f2ec2..92714f98 100644 --- a/src/components/Balance.svelte +++ b/src/components/Balance.svelte @@ -1,34 +1,34 @@ {#if show && user.haspin && $pin?.length !== 6} - (show = false)} /> + (show = false)} /> {/if}
- {#if user.haspin && !$pin} - - {:else} -
- {#if isNaN($animatedRate)} -
—
- {:else} - {f((user.balance * $animatedRate) / sats, user.currency)} - {/if} -
+ {#if user.haspin && !$pin} + + {:else} +
+ {#if isNaN($animatedRate)} +
—
+ {:else} + {f((user.balance * $animatedRate) / sats, user.currency)} + {/if} +
-
- ⚡️{s(user.balance)} -
- {/if} +
+ ⚡️{s(user.balance)} +
+ {/if}
diff --git a/src/components/Calendar.svelte b/src/components/Calendar.svelte index 7504f48e..b07c136c 100644 --- a/src/components/Calendar.svelte +++ b/src/components/Calendar.svelte @@ -1,14 +1,14 @@ - + diff --git a/src/components/Card.svelte b/src/components/Card.svelte index 44ab635f..864465c0 100644 --- a/src/components/Card.svelte +++ b/src/components/Card.svelte @@ -1,14 +1,14 @@ - + diff --git a/src/components/Check.svelte b/src/components/Check.svelte index 4c9f504b..222c4dea 100644 --- a/src/components/Check.svelte +++ b/src/components/Check.svelte @@ -1,11 +1,11 @@ diff --git a/src/components/Code.svelte b/src/components/Code.svelte index ffca98a4..6c1048cf 100644 --- a/src/components/Code.svelte +++ b/src/components/Code.svelte @@ -1,27 +1,31 @@ -
-
-
{samples[sample]}
-
- +
+
+
{samples[sample]}
+
+
diff --git a/src/components/Event.svelte b/src/components/Event.svelte index 68f44589..2312f44e 100644 --- a/src/components/Event.svelte +++ b/src/components/Event.svelte @@ -1,84 +1,87 @@ -
- -
-
- -
- -
- +
+ +
+
+ +
+ +
+ -
-
-
- {user.display_name || ''} - @{user.username} -
-
 {distance(seen)}
-
-
- {content} -
+
+
+
+ {user.display_name || ""} + @{user.username} +
+
 {distance(seen)}
+
+
+ {content} +
-
-
- -
444
-
-
- -
1072
-
-
- -
26
-
-
- -
4
-
-
-
+
+
+ +
444
+
+
+ +
1072
+
+
+ +
26
+
+
+ +
4
+
+
+
diff --git a/src/components/FaqCard.svelte b/src/components/FaqCard.svelte index 918e03d6..ae1ad077 100644 --- a/src/components/FaqCard.svelte +++ b/src/components/FaqCard.svelte @@ -1,15 +1,15 @@
-

{$t('faq.' + questionID + '.question')}

-

- {$t('faq.' + questionID + '.answer')} -

+

{$t("faq." + questionID + ".question")}

+

+ {$t("faq." + questionID + ".answer")} +

diff --git a/src/components/Feed.svelte b/src/components/Feed.svelte index 7de087a7..0c9c96d1 100644 --- a/src/components/Feed.svelte +++ b/src/components/Feed.svelte @@ -1,72 +1,84 @@ {#if user} -
-
- -
- -
+
+
+ +
+ +
{/if} {#if browser} - {#if sorted.length} - - - - - - {:else} -
-
{$t('user.noNotes')}
-
- {/if} + {#if sorted.length} + + + + + + {:else} +
+
{$t("user.noNotes")}
+
+ {/if} {/if} diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index eda26526..c1ac79cf 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -1,65 +1,74 @@ -