From 59ccb2dd1763e31424ebf04f3fefb2ba4f82bdc2 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Mon, 31 Oct 2022 11:41:16 -0700 Subject: prettier --- docker-compose.yml | 12 ++--- src/components/Tip.svelte | 12 ++++- src/lib/socket.js | 2 +- src/routes/+layout.svelte | 8 +-- src/routes/[username]/+page.svelte | 11 ++-- src/routes/[username]/receive/+page.svelte | 2 +- src/routes/[username]/settings/+page.svelte | 4 +- .../transactions/[...page]/+page.server.js | 3 +- .../[username]/transactions/[...page]/+page.svelte | 10 ++-- src/routes/scan/+page.svelte | 2 +- static/manifest.json | 30 +++++------ static/manifest.webmanifest | 62 +++++++++++----------- 12 files changed, 81 insertions(+), 77 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d6bd8700..ace944bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,13 +8,13 @@ services: - '3121:3121' environment: NODE_ENV: production - ORIGIN: "${ORIGIN}" + ORIGIN: '${ORIGIN}' PORT: 3121 - PUBLIC_COINOS_URL: "${PUBLIC_COINOS_URL}" - PUBLIC_BTC: "${PUBLIC_BTC}" - PUBLIC_SOCKET: "${PUBLIC_SOCKET}" - STRIPE: "${STRIPE}" - LAUNCH: "${LAUNCH}" + PUBLIC_COINOS_URL: '${PUBLIC_COINOS_URL}' + PUBLIC_BTC: '${PUBLIC_BTC}' + PUBLIC_SOCKET: '${PUBLIC_SOCKET}' + STRIPE: '${STRIPE}' + LAUNCH: '${LAUNCH}' extra_hosts: - host.docker.internal:host-gateway networks: diff --git a/src/components/Tip.svelte b/src/components/Tip.svelte index c915da80..7e2df7f4 100644 --- a/src/components/Tip.svelte +++ b/src/components/Tip.svelte @@ -6,7 +6,15 @@ import { tick } from 'svelte'; import { goto } from '$app/navigation'; - export let amountFiat, showMobileTip, tipPercent, tipAmount, amount, currency, tip, username, rate; + export let amountFiat, + showMobileTip, + tipPercent, + tipAmount, + amount, + currency, + tip, + username, + rate; const tipAmounts = ['No thanks', '10%', '15%', '20%']; let showCustomAmount; @@ -150,7 +158,7 @@ on:input={(e) => handleCustomTipAmount(e)} class="pl-10" placeholder="Custom amount" - autofocus + autofocus /> -

This is a re-usable lightning address

+

+ This is a re-usable lightning address +

diff --git a/src/routes/[username]/receive/+page.svelte b/src/routes/[username]/receive/+page.svelte index 7425740a..3ae831c6 100644 --- a/src/routes/[username]/receive/+page.svelte +++ b/src/routes/[username]/receive/+page.svelte @@ -24,7 +24,7 @@ : 'opacity-100 hover:opacity-80'}" disabled={!amount} > - Next + Next diff --git a/src/routes/[username]/settings/+page.svelte b/src/routes/[username]/settings/+page.svelte index 1451846b..86705b1d 100644 --- a/src/routes/[username]/settings/+page.svelte +++ b/src/routes/[username]/settings/+page.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/[username]/transactions/[...page]/+page.server.js b/src/routes/[username]/transactions/[...page]/+page.server.js index 1151d412..c484909c 100644 --- a/src/routes/[username]/transactions/[...page]/+page.server.js +++ b/src/routes/[username]/transactions/[...page]/+page.server.js @@ -11,7 +11,7 @@ export async function load({ cookies, params, request }) { if (parts.length === 3) [start, end, page] = parts; if (!parseInt(page)) page = 1; - let offset = (page-1) * limit; + let offset = (page - 1) * limit; let url = `/payments?v2=true&limit=${limit}&offset=${offset}`; if (start) url += `&start=${start}`; @@ -20,6 +20,5 @@ export async function load({ cookies, params, request }) { let { total, transactions } = await get(url, auth(cookies)); let pages = new Array(Math.ceil(total / limit)); - return { total, transactions, page, pages, start, end }; } diff --git a/src/routes/[username]/transactions/[...page]/+page.svelte b/src/routes/[username]/transactions/[...page]/+page.svelte index 71314e88..dd58509a 100644 --- a/src/routes/[username]/transactions/[...page]/+page.svelte +++ b/src/routes/[username]/transactions/[...page]/+page.svelte @@ -34,8 +34,8 @@ $: $page && ($newPayment = false); $: $newPayment && invalidate(`/users/${user.username}`); - $: path = $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf('/')); - $: console.log(path) + $: path = $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf('/')); + $: console.log(path); let csv = () => { const keys = ['hash', 'updatedAt', 'rate', 'currency', 'amount', 'fee', 'tip']; @@ -100,11 +100,7 @@
{#if pages.length > 1} {#each pages as _, i} - +
{i + 1}
diff --git a/src/routes/scan/+page.svelte b/src/routes/scan/+page.svelte index 79dbe7b0..13053d7e 100644 --- a/src/routes/scan/+page.svelte +++ b/src/routes/scan/+page.svelte @@ -7,7 +7,7 @@ let scanner, vid; onMount(() => { - scanner = new QrScanner(vid, ({ data }) => goto(`/send/${data}`), { + scanner = new QrScanner(vid, ({ data }) => goto(`/send/${data}`), { highlightScanRegion: true, highlightCodeOutline: true }); diff --git a/static/manifest.json b/static/manifest.json index ba1383ab..3ce34fb8 100644 --- a/static/manifest.json +++ b/static/manifest.json @@ -1,17 +1,17 @@ { - "short_name": "coinos", - "name": "coinos", - "icons": [ - { - "src": "/icons/coinos.png", - "type": "image/webp", - "sizes": "1024x1024", - "purpose": "any maskable" - } - ], - "start_url": "/", - "background_color": "#000000", - "display": "standalone", - "scope": "/", - "theme_color": "#000000" + "short_name": "coinos", + "name": "coinos", + "icons": [ + { + "src": "/icons/coinos.png", + "type": "image/webp", + "sizes": "1024x1024", + "purpose": "any maskable" + } + ], + "start_url": "/", + "background_color": "#000000", + "display": "standalone", + "scope": "/", + "theme_color": "#000000" } diff --git a/static/manifest.webmanifest b/static/manifest.webmanifest index de84394a..f77d93c7 100644 --- a/static/manifest.webmanifest +++ b/static/manifest.webmanifest @@ -1,32 +1,32 @@ { - "theme_color": "#fff", - "background_color": "#000", - "display": "fullscreen", - "scope": "/", - "start_url": "/", - "name": "Coinos", - "description": "Bitcoin web wallet", - "short_name": "Coinos", - "icons": [ - { - "src": "/icon-192x192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/icon-256x256.png", - "sizes": "256x256", - "type": "image/png" - }, - { - "src": "/icon-384x384.png", - "sizes": "384x384", - "type": "image/png" - }, - { - "src": "/icon-512x512.png", - "sizes": "512x512", - "type": "image/png" - } - ] -} \ No newline at end of file + "theme_color": "#fff", + "background_color": "#000", + "display": "fullscreen", + "scope": "/", + "start_url": "/", + "name": "Coinos", + "description": "Bitcoin web wallet", + "short_name": "Coinos", + "icons": [ + { + "src": "/icon-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/icon-256x256.png", + "sizes": "256x256", + "type": "image/png" + }, + { + "src": "/icon-384x384.png", + "sizes": "384x384", + "type": "image/png" + }, + { + "src": "/icon-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ] +} -- cgit v1.2.3