From 2af4a989092ae63eb9ae38ac35982b6bba2e917c Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 3 Nov 2022 01:28:01 -0700 Subject: show who payments are with --- src/hooks.server.js | 11 ++-- src/lib/socket.js | 4 +- src/lib/utils.js | 30 ++++++----- src/locales/en.json | 2 +- src/routes/(app)/+layout.svelte | 2 - src/routes/(app)/[username]/+page.svelte | 7 ++- .../[username]/transactions/[...page]/+page.svelte | 60 ++++++++++------------ src/routes/(app)/invoice/[id]/+layout.server.js | 10 ++-- src/routes/(app)/invoice/[id]/+page.svelte | 51 ++++++++---------- src/routes/(app)/invoice/[id]/tip/+page.svelte | 15 +++--- src/routes/(app)/locations/+server.js | 2 +- src/routes/+page.server.js | 4 +- 12 files changed, 95 insertions(+), 103 deletions(-) (limited to 'src') diff --git a/src/hooks.server.js b/src/hooks.server.js index 510affb6..d8b52215 100644 --- a/src/hooks.server.js +++ b/src/hooks.server.js @@ -2,7 +2,10 @@ import { auth, get, protectedRoutes } from '$lib/utils'; export async function handle({ event, resolve }) { let token = event.cookies.get('token'); - let { params, url: { pathname, origin } } = event; + let { + params, + url: { pathname, origin } + } = event; let user; if (token && pathname !== '/logout') { @@ -10,10 +13,10 @@ export async function handle({ event, resolve }) { user = await get('/me', auth(event.cookies)); event.locals.user = user; - if (['/login', '/register'].includes(pathname)) - return Response.redirect(origin + `/${user.username}/dashboard`, 307); + if (['/login', '/register'].includes(pathname)) + return Response.redirect(origin + `/${user.username}/dashboard`, 307); } catch (e) { - return Response.redirect(origin + '/logout', 307); + return Response.redirect(origin + '/logout', 307); } } diff --git a/src/lib/socket.js b/src/lib/socket.js index 94c1802e..672d008c 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -15,9 +15,9 @@ export const send = (type, data) => { }; export const messages = (data) => ({ - id() { + id() { last.set(Date.now()); - }, + }, rate() { rate.set(data); diff --git a/src/lib/utils.js b/src/lib/utils.js index c33b1cf9..a2829ca4 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -64,13 +64,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/, /support/]; export const success = (m) => { toast.pop(); @@ -138,16 +132,28 @@ export const f = (s, currency) => .replace('CA', ''); export const s = (s) => new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format(s); +export const sat = (s) => { + let p = Math.floor(Math.log(s) / Math.LN10 + 0.000000001); + let d = Math.floor((p + 1) / 3); + + return ( + '⚡️' + + (parseInt(s) > 0 + ? new Intl.NumberFormat('en-US', { maximumFractionDigits: 1 }).format(s / Math.pow(1000, d)) + + ['', 'K', 'M', 'G'][d] + : 0 + ).toString() + ); +}; export const sats = 100000000; export const back = () => browser && history.go(-1); export const focus = (el) => setTimeout(() => el.focus()); - export const wait = async (f, s = 300) => { - let i = 0; - while (!(await f()) && i < s) (await sleep(1000)) && i++; - if (i >= s) throw new Error("timeout"); - return f(); + let i = 0; + while (!(await f()) && i < s) (await sleep(1000)) && i++; + if (i >= s) throw new Error('timeout'); + return f(); }; diff --git a/src/locales/en.json b/src/locales/en.json index be7baa71..89ccb8a5 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -160,7 +160,7 @@ "update1": "" }, "user": { - "unfollow": "Unfollow", + "unfollow": "Unfollow", "following": "Following", "follow": "Follow", "remove": "Remove", diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 10b16449..f6d79788 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -24,8 +24,6 @@ $user = u; }; - $: $page.url.searchParams.get('logout') && close(); - $: $selectedRate = r * (rates[u?.currency || 'USD'] / rates.USD); onMount(() => { diff --git a/src/routes/(app)/[username]/+page.svelte b/src/routes/(app)/[username]/+page.svelte index fb22c828..78e9a9d3 100644 --- a/src/routes/(app)/[username]/+page.svelte +++ b/src/routes/(app)/[username]/+page.svelte @@ -77,8 +77,11 @@

- This is a lightning addresslightning address

diff --git a/src/routes/(app)/[username]/transactions/[...page]/+page.svelte b/src/routes/(app)/[username]/transactions/[...page]/+page.svelte index dd58509a..efecbaf2 100644 --- a/src/routes/(app)/[username]/transactions/[...page]/+page.svelte +++ b/src/routes/(app)/[username]/transactions/[...page]/+page.svelte @@ -1,10 +1,10 @@ - @@ -81,10 +72,12 @@ > -
-
- {@html svg} -
+
screenfull.toggle(qr)} + > +
@@ -99,27 +92,27 @@
{#if invoice.tip}
- {$t('invoice.invoice')} - {f(amountFiat, currency)} - {`(${s(amount)} SAT)`} + {$t('invoice.invoice')} + + {f(amountFiat, currency)} + {`${sat(amount)}`} +
- {$t('invoice.tip')} - {f(tipAmount, currency)} - {`(${s(tip)} SAT)`} + {`${sat(tip)}`} +
{/if} -
- {$t('invoice.total')} - + {$t('invoice.total')} + {f(amountFiat + parseFloat(tipAmount), currency)} - {`(${s(tip + amount)} SAT)`}{`${sat(tip + amount)}`}
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.svelte b/src/routes/(app)/invoice/[id]/tip/+page.svelte index 6ea3aae5..b3906010 100644 --- a/src/routes/(app)/invoice/[id]/tip/+page.svelte +++ b/src/routes/(app)/invoice/[id]/tip/+page.svelte @@ -1,7 +1,7 @@ - @@ -137,7 +134,7 @@ on:input={handleSlide} /> -
+
{f(amountFiat, currency)} @@ -145,9 +142,9 @@
-
- {s(amount)} - +{s(tip)} SAT +
+ {sat(amount)} + +{sat(tip)}
diff --git a/src/routes/(app)/locations/+server.js b/src/routes/(app)/locations/+server.js index 381919ab..87f8975d 100644 --- a/src/routes/(app)/locations/+server.js +++ b/src/routes/(app)/locations/+server.js @@ -1,4 +1,4 @@ -import { get } from "$lib/utils"; +import { get } from '$lib/utils'; import { json } from '@sveltejs/kit'; export async function GET({ fetch, setHeaders }) { diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js index 774b4586..4b9e84b0 100644 --- a/src/routes/+page.server.js +++ b/src/routes/+page.server.js @@ -1,4 +1,4 @@ -import { get } from "$lib/utils"; +import { get } from '$lib/utils'; export const prerender = true; -export let load = async () => get("/locations"); +export let load = async () => get('/locations'); -- cgit v1.2.3