From 63f1a6780bab85ebb48ca1fc142cc6beaf772faa Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Mon, 3 Oct 2022 23:13:49 -0700 Subject: refactoring --- package.json | 2 +- pnpm-lock.yaml | 16 +- src/components/AppHeader.svelte | 49 +++-- src/components/LandingHeader.svelte | 9 +- src/components/LandingHero.svelte | 19 +- src/components/LocationsMap.svelte | 2 +- src/components/Numpad.svelte | 11 +- src/components/Qr.svelte | 19 +- src/components/RegisterOrLogin.svelte | 20 +- src/lib/parse.js | 37 ---- src/lib/socket.js | 19 +- src/lib/store.js | 7 +- src/lib/utils.js | 8 +- src/locales/en.json | 2 +- src/routes/+layout.server.js | 4 +- src/routes/+layout.svelte | 16 +- src/routes/+page.svelte | 17 +- src/routes/[username]/+layout.svelte | 7 + src/routes/[username]/+page.svelte | 4 +- src/routes/[username]/customers/+page.svelte | 5 - src/routes/[username]/dashboard/+page.svelte | 4 +- src/routes/[username]/receive/+page.server.js | 12 ++ src/routes/[username]/receive/+page.svelte | 231 ++------------------- src/routes/[username]/settings/+page.svelte | 4 +- src/routes/[username]/settings/_account.svelte | 25 +-- src/routes/[username]/settings/_pos.svelte | 1 - src/routes/[username]/settings/_security.svelte | 12 +- src/routes/[username]/support/+page.svelte | 103 +++++---- .../[username]/transactions/[...page]/+page.svelte | 9 +- src/routes/invoice/+server.js | 10 - src/routes/invoice/[id]/+page.svelte | 20 +- src/routes/login/+page.server.js | 12 +- src/routes/logout/+page.server.js | 8 +- src/routes/logout/+page.svelte | 10 - src/routes/logout/done/+page.svelte | 3 - src/routes/scan/+page.svelte | 6 +- src/routes/send/+page.server.js | 2 +- src/routes/send/+page.svelte | 14 +- src/routes/send/bitcoin/[address]/+page.svelte | 5 +- src/routes/send/lightning/[payreq]/+page.server.js | 2 +- src/routes/send/lightning/[payreq]/+page.svelte | 17 +- src/routes/sent/+page.svelte | 12 +- 42 files changed, 253 insertions(+), 542 deletions(-) create mode 100644 src/routes/[username]/+layout.svelte create mode 100644 src/routes/[username]/receive/+page.server.js diff --git a/package.json b/package.json index f707385e..5663853d 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,8 @@ "prettier-plugin-svelte": "^2.7.1", "qr-code-styling": "1.6.0-rc.1", "qr-scanner": "^1.4.1", + "screenfull": "^6.0.2", "svelte": "^3.50.1", - "svelte-fullscreen": "^2.0.0", "svelte-outclick": "^3.1.0", "svelte-pincode": "^2.1.2", "svelte-preprocess": "^4.10.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 578f5590..4538dda2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,8 +17,8 @@ specifiers: prettier-plugin-svelte: ^2.7.1 qr-code-styling: 1.6.0-rc.1 qr-scanner: ^1.4.1 + screenfull: ^6.0.2 svelte: ^3.50.1 - svelte-fullscreen: ^2.0.0 svelte-outclick: ^3.1.0 svelte-pincode: ^2.1.2 svelte-preprocess: ^4.10.7 @@ -43,8 +43,8 @@ devDependencies: prettier-plugin-svelte: 2.7.1_nk6d2fkgcllkkdynqbuearcure qr-code-styling: 1.6.0-rc.1 qr-scanner: 1.4.1 + screenfull: 6.0.2 svelte: 3.50.1 - svelte-fullscreen: 2.0.0 svelte-outclick: 3.1.0 svelte-pincode: 2.1.2 svelte-preprocess: 4.10.7_r763xggw3my2ousygwguxmp6ru @@ -1438,9 +1438,9 @@ packages: rimraf: 2.7.1 dev: true - /screenfull/5.2.0: - resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==} - engines: {node: '>=0.10.0'} + /screenfull/6.0.2: + resolution: {integrity: sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw==} + engines: {node: ^14.13.1 || >=16.0.0} dev: true /secp256k1/4.0.3: @@ -1528,12 +1528,6 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte-fullscreen/2.0.0: - resolution: {integrity: sha512-Sg03gZAyYtW7gqTA9WoFXY2m4CkFmRFu/+n7bmGJnYt/qxtO0N2tdQ61lZwbgN2AAMh2zF/185CTBI9vv3zvKQ==} - dependencies: - screenfull: 5.2.0 - dev: true - /svelte-hmr/0.15.0_svelte@3.50.1: resolution: {integrity: sha512-Aw21SsyoohyVn4yiKXWPNCSW2DQNH/76kvUnE9kpt4h9hcg9tfyQc6xshx9hzgMfGF0kVx0EGD8oBMWSnATeOg==} engines: {node: ^12.20 || ^14.13.1 || >= 16} diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 62cfd940..fca11272 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -1,13 +1,16 @@
- {#if $subject?.profile} + {#if subject?.profile}
- - - + + +
{:else}
- {#if !$user} + {#if !user} - {#if !$user} + {#if !user} + + +
{/if} - diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte index 8a8599c4..6d0b086e 100644 --- a/src/components/LocationsMap.svelte +++ b/src/components/LocationsMap.svelte @@ -77,7 +77,7 @@ locations.forEach(({ lat, lng, info }) => { let marker = L.marker([lat, lng]); - marker.bindPopup(info); + marker.bindPopup(info); markers.addLayer(marker); }); diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte index 3555688c..9de4a0dc 100644 --- a/src/components/Numpad.svelte +++ b/src/components/Numpad.svelte @@ -1,6 +1,6 @@ -
{ - if (!disabled) copy(text); - }} -/> +
diff --git a/src/routes/invoice/+server.js b/src/routes/invoice/+server.js index 5b2f2b39..e69de29b 100644 --- a/src/routes/invoice/+server.js +++ b/src/routes/invoice/+server.js @@ -1,10 +0,0 @@ -import { auth, get, post } from '$lib/utils'; - -export async function POST({ cookies, request }) { - let { amount, currency, network = 'lightning', prompt, rate, tip, user } = await request.json(); - let invoice = { amount, currency, network, prompt, rate, tip }; - - return new Response(JSON.stringify(await post('/invoice', { invoice, user }, auth(cookies))), { - headers: { 'content-type': 'application/json' } - }); -} diff --git a/src/routes/invoice/[id]/+page.svelte b/src/routes/invoice/[id]/+page.svelte index 7ff63862..9e0f9654 100644 --- a/src/routes/invoice/[id]/+page.svelte +++ b/src/routes/invoice/[id]/+page.svelte @@ -1,14 +1,14 @@ diff --git a/src/routes/logout/done/+page.svelte b/src/routes/logout/done/+page.svelte index 50fb766e..47d48c54 100644 --- a/src/routes/logout/done/+page.svelte +++ b/src/routes/logout/done/+page.svelte @@ -1,12 +1,9 @@
diff --git a/src/routes/sent/+page.svelte b/src/routes/sent/+page.svelte index de61fd41..95bce839 100644 --- a/src/routes/sent/+page.svelte +++ b/src/routes/sent/+page.svelte @@ -14,11 +14,9 @@

{$t('invoice.paymentSuccessful')}

- - - + + + -- cgit v1.2.3