From 059613490db9be904791686c49851ec1cc095774 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 26 Jul 2022 21:06:01 -0700 Subject: register endpoint --- src/routes/invoice.svelte | 2 ++ src/routes/login.js | 12 ++---------- src/routes/register.js | 6 ++++++ src/routes/register.svelte | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 src/routes/register.js (limited to 'src/routes') diff --git a/src/routes/invoice.svelte b/src/routes/invoice.svelte index b8f9e54b..eedb2494 100644 --- a/src/routes/invoice.svelte +++ b/src/routes/invoice.svelte @@ -6,6 +6,7 @@ QR code +{#if $user} {text} @@ -16,3 +17,4 @@ QR code {#each $user.payments as p} {p.amount}
{/each} +{/if} diff --git a/src/routes/login.js b/src/routes/login.js index e8c74365..771de9e1 100644 --- a/src/routes/login.js +++ b/src/routes/login.js @@ -1,13 +1,5 @@ -import got from 'got'; +import { post } from '$lib/utils'; export async function POST({ request }) { - let json = await request.json(); - - let body = await got - .post('http://localhost:3119/login', { - json - }) - .json(); - - return { body }; + return { body: await post('/login', await request.json()) }; } diff --git a/src/routes/register.js b/src/routes/register.js new file mode 100644 index 00000000..9f79f94e --- /dev/null +++ b/src/routes/register.js @@ -0,0 +1,6 @@ +import { post } from '$lib/utils'; + +export async function POST({ request }) { + let user = await request.json(); + return { body: await post('/register', { user }) }; +} diff --git a/src/routes/register.svelte b/src/routes/register.svelte index 60a81ced..69ec5fd2 100644 --- a/src/routes/register.svelte +++ b/src/routes/register.svelte @@ -1,6 +1,5 @@ -- cgit v1.2.3 From 80cf7e9b77dcc4cbcf7711eb63a218c3aec07ec6 Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:00:43 -0600 Subject: hook up receive page and more adjustments --- .env | 1 + src/components/AppHeader.svelte | 4 +- src/lib/socket.js | 3 +- src/lib/store.js | 1 + src/routes/invoice.js | 3 +- src/routes/invoice.svelte | 23 +++-- src/routes/receive.svelte | 194 +++++++++++++++++++++++++++++----------- static/icons/info.svg | 3 + 8 files changed, 161 insertions(+), 71 deletions(-) create mode 100644 static/icons/info.svg (limited to 'src/routes') diff --git a/.env b/.env index cdf37b2a..be4e208d 100644 --- a/.env +++ b/.env @@ -1 +1,2 @@ VITE_COINOS_URL=http://localhost:3119 +VITE_COINOS_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImJvYiIsImlhdCI6MTY1ODg1NTM4Mn0.typE3V7Jb29S3aXGKd81RaazR6I4CBG_oW5WAY3avr4 diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 9998a4f6..bbe2e05e 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -14,10 +14,10 @@ >
- import { rate, user } from '$lib/store'; - import { onMount } from 'svelte'; + import { rate, user, invoiceAmount } from '$lib/store'; export let text; -QR code - -{text} - -{$rate} - -{$user?.username} - -{#each $user.payments as p} - {p.amount}
-{/each} +{#if $user} + {text} + {$invoiceAmount} + {$rate} + {$user.username} + {#each $user.payments as p} + {p.amount}
+ {/each} +{/if} diff --git a/src/routes/receive.svelte b/src/routes/receive.svelte index 73d3cc06..8cc49de2 100644 --- a/src/routes/receive.svelte +++ b/src/routes/receive.svelte @@ -2,74 +2,162 @@ // in the future we will want to allow users to set their fiat currency in the settings import { AppHeader, Icon } from '$comp'; import { goto } from '$app/navigation'; + import { invoiceAmount, rate } from '$lib/store'; let useFiat = true; let amountFiat = 0; let amountSats = 0; + let message = ''; + + $: $invoiceAmount = parseInt(amountSats === 0 ? amountFiat / ($rate / 100000000) : amountSats); + $: amountSatsFormatted = new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format( + amountSats + ); + + $: amountFiatConverted = new Intl.NumberFormat('en-US', { + style: 'currency', + currency: 'USD' + }).format(amountSats * ($rate / 100000000)); + + $: amountSatsConverted = new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format( + amountFiat / ($rate / 100000000) + ); const numPad = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '0', '<']; + + const handleInput = (value) => { + if (message) { + message = ''; + } + if (useFiat) { + if (amountFiat === 0 && value !== '.' && value !== '<' && value !== '0') { + amountFiat = value; + } else if (amountFiat === 0 && value === '.') { + amountFiat = '0.'; + } else if (amountFiat !== 0 && amountFiat.includes('.') && value === '.') { + return; + } else if (value === '<') { + if (amountFiat !== 0) { + amountFiat = amountFiat.slice(0, amountFiat.length - 1); + if (amountFiat.length === 0) { + amountFiat = 0; + } + } + } else if (value !== '.' && value !== '<' && parseInt(amountFiat + value) > $rate) { + message = 'Please enter an amount less than 1 bitcoin.'; + } else if (amountFiat !== 0 && amountFiat.match(/\.../)) { + return; + } else { + amountFiat = amountFiat + value; + } + } else { + if (value === '.') { + return; + } else if (amountSats === 0 && value !== '<' && value !== '0') { + amountSats = value; + } else if (value === '<') { + if (amountSats !== 0) { + amountSats = amountSats.slice(0, amountSats.length - 1); + if (amountSats.length === 0) { + amountSats = 0; + } + } + } else if (value !== '<' && parseInt(amountSats + value) > 100000000) { + message = 'Please enter an amount less than 1 bitcoin.'; + } else { + amountSats = amountSats + value; + } + } + }; -
-
- -
-
- {useFiat ? `$${amountFiat}` : amountSats}{useFiat ? 'CAD' : 'SATS'} +
+ +
+
+ {useFiat ? `$${amountFiat}` : amountSatsFormatted}{useFiat ? 'USD' : 'SATS'} +
+ {useFiat ? `${amountSatsConverted} SATS` : `${amountFiatConverted} USD`} +
- {useFiat ? `${amountSats} SATS` : `$${amountFiat} CAD`} -
- -
- {#each numPad as value} - {#if value === '<'} - - {:else} - - {/if} - {/each} -
+ + + + + {:else} + + {/if} + {/each} +
- -
- - + +
+ + +
-
+{/if} diff --git a/static/icons/info.svg b/static/icons/info.svg new file mode 100644 index 00000000..80f33b37 --- /dev/null +++ b/static/icons/info.svg @@ -0,0 +1,3 @@ + + + -- cgit v1.2.3 From 3681ed8458d68fa41cda01ad769546872be3c900 Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:27:22 -0600 Subject: add loading skeleton to receive page --- src/routes/receive.svelte | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/routes') diff --git a/src/routes/receive.svelte b/src/routes/receive.svelte index 8cc49de2..a67b0787 100644 --- a/src/routes/receive.svelte +++ b/src/routes/receive.svelte @@ -160,4 +160,10 @@
+{:else} +
+
+
{/if} -- cgit v1.2.3 From cd9e850f9e15e890727026942d646d59f526fe4e Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 26 Jul 2022 23:37:18 -0700 Subject: fix invoice endpoint --- src/lib/socket.js | 1 + src/lib/utils.js | 2 +- src/routes/invoice.js | 15 +++------------ 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'src/routes') diff --git a/src/lib/socket.js b/src/lib/socket.js index 9d0c472e..90238c23 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -24,6 +24,7 @@ export const messages = (data) => ({ connected: auth, login() { + console.log("OY", data) user.set(data); } }); diff --git a/src/lib/utils.js b/src/lib/utils.js index 5b1bba7f..c17b0a98 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -11,4 +11,4 @@ export const post = (url, body) => method: 'POST', body: JSON.stringify(body), headers: { accept: 'application/json', 'content-type': 'application/json' } - }).then((r) => r.json); + }).then((r) => r.json()); diff --git a/src/routes/invoice.js b/src/routes/invoice.js index 147da2b7..4b3327f6 100644 --- a/src/routes/invoice.js +++ b/src/routes/invoice.js @@ -1,21 +1,12 @@ -import got from 'got'; +import { post } from '$lib/utils'; import { invoiceAmount } from '$lib/store'; const username = 'bob', network = 'lightning'; export async function GET({ params }) { - let text = await got - .post('http://localhost:3119/lightning/invoice', { - json: { amount: invoiceAmount } - }) - .text(); - - await got - .post('http://localhost:3119/invoice', { - json: { invoice: { text, network }, user: { username } } - }) - .json(); + let { text } = await post('/lightning/invoice', { amount: invoiceAmount }); + await post('/invoice', { invoice: { text, network }, user: { username } }); return { body: { text } }; } -- cgit v1.2.3 From bcb252eb0b52f64449dad295595fdaa5e80cb5dc Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Thu, 28 Jul 2022 22:17:58 -0600 Subject: final adjustments for numpad --- src/components/RegisterOrLogin.svelte | 4 +++- src/lib/socket.js | 2 +- src/routes/receive.svelte | 10 ++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'src/routes') diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte index db577911..6cae8b5a 100644 --- a/src/components/RegisterOrLogin.svelte +++ b/src/components/RegisterOrLogin.svelte @@ -77,7 +77,9 @@

{:else}
- Forgot Password? + Forgot Password?
{/if} diff --git a/src/lib/socket.js b/src/lib/socket.js index 90238c23..087addf9 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -24,7 +24,7 @@ export const messages = (data) => ({ connected: auth, login() { - console.log("OY", data) + console.log('OY', data); user.set(data); } }); diff --git a/src/routes/receive.svelte b/src/routes/receive.svelte index a67b0787..338bc06c 100644 --- a/src/routes/receive.svelte +++ b/src/routes/receive.svelte @@ -32,6 +32,8 @@ if (useFiat) { if (amountFiat === 0 && value !== '.' && value !== '<' && value !== '0') { amountFiat = value; + } else if ((amountFiat === 0 || amountFiat === '0') && value === '0') { + return; } else if (amountFiat === 0 && value === '.') { amountFiat = '0.'; } else if (amountFiat !== 0 && amountFiat.includes('.') && value === '.') { @@ -41,6 +43,7 @@ amountFiat = amountFiat.slice(0, amountFiat.length - 1); if (amountFiat.length === 0) { amountFiat = 0; + amountSats = 0; } } } else if (value !== '.' && value !== '<' && parseInt(amountFiat + value) > $rate) { @@ -92,7 +95,10 @@ if (useFiat) { amountSats = (amountFiat / ($rate / 100000000)).toFixed(0).toString(); } else { - amountFiat = (amountSats * ($rate / 100000000)).toFixed(2).toString(); + amountFiat = + (amountSats * ($rate / 100000000)).toFixed(2) > 0.0 + ? (amountSats * ($rate / 100000000)).toFixed(2).toString() + : 0; } useFiat = !useFiat; }}>
{/if} -- cgit v1.2.3 From 49e7185efd45add123e0dbfcab077772b5ff22f6 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 28 Jul 2022 21:22:25 -0700 Subject: save token in cookie --- package.json | 1 + pnpm-lock.yaml | 7 +++++++ src/components/RegisterOrLogin.svelte | 4 +++- src/hooks/index.js | 16 ++++++++++++++++ src/lib/socket.js | 1 - src/lib/store.js | 18 ++++++++++++++++-- src/routes/__layout.svelte | 4 ++++ src/routes/login.js | 21 ++++++++++++++++++++- 8 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 src/hooks/index.js (limited to 'src/routes') diff --git a/package.json b/package.json index 6d3ad58a..23bb6cb6 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "@sveltejs/adapter-auto": "next", "@sveltejs/kit": "next", "autoprefixer": "^10.4.7", + "cookie": "^0.5.0", "postcss": "^8.4.14", "prettier": "^2.7.1", "prettier-plugin-svelte": "^2.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 72a53df0..9c34207f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,7 @@ specifiers: '@sveltejs/adapter-auto': next '@sveltejs/kit': next autoprefixer: ^10.4.7 + cookie: ^0.5.0 postcss: ^8.4.14 prettier: ^2.7.1 prettier-plugin-svelte: ^2.7.0 @@ -16,6 +17,7 @@ devDependencies: '@sveltejs/adapter-auto': 1.0.0-next.64 '@sveltejs/kit': 1.0.0-next.396_svelte@3.49.0+vite@3.0.3 autoprefixer: 10.4.7_postcss@8.4.14 + cookie: 0.5.0 postcss: 8.4.14 prettier: 2.7.1 prettier-plugin-svelte: 2.7.0_o3ioganyptcsrh6x4hnxvjkpqi @@ -371,6 +373,11 @@ packages: resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} dev: true + /cookie/0.5.0: + resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} + engines: {node: '>= 0.6'} + dev: true + /cssesc/3.0.0: resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} engines: {node: '>=4'} diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte index 6cae8b5a..2334741d 100644 --- a/src/components/RegisterOrLogin.svelte +++ b/src/components/RegisterOrLogin.svelte @@ -7,7 +7,7 @@ export let page; - let username, password; + let username = "bob", password = "pw"; let revealPassword = false; @@ -20,6 +20,7 @@ let r = await post(url, { username, password }); if (!r.token) r = await post('/login', { username, password }); $token = r.token; + console.log("new token", r.token) auth(); goto('/receive'); }; @@ -42,6 +43,7 @@ required class="bg-primary p-4 rounded-2xl w-full" bind:value={username} + autofocus />
diff --git a/src/hooks/index.js b/src/hooks/index.js new file mode 100644 index 00000000..21e56052 --- /dev/null +++ b/src/hooks/index.js @@ -0,0 +1,16 @@ +import cookie from "cookie"; +export async function handle({ event, resolve }) { + let { request: { headers }, + } = event; + + const cookies = cookie.parse(headers.get("cookie") || ""); + let { token } = cookies; + event.locals = { token }; + + return resolve(event); +} + + +export const getSession = ({ locals: { token } }) => { + return { token }; +}; diff --git a/src/lib/socket.js b/src/lib/socket.js index 087addf9..9d0c472e 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -24,7 +24,6 @@ export const messages = (data) => ({ connected: auth, login() { - console.log('OY', data); user.set(data); } }); diff --git a/src/lib/store.js b/src/lib/store.js index 7b510748..62232f9d 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -1,6 +1,20 @@ -import { writable } from 'svelte/store'; +import { get, writable } from 'svelte/store'; +import { browser } from '$app/env'; + +const persisted = (k, i) => { + let s = writable( + browser && sessionStorage.getItem(k) && sessionStorage.getItem(k) !== 'undefined' + ? JSON.parse(sessionStorage.getItem(k)) + : i + ); + + s.subscribe((v) => browser && sessionStorage.setItem(k, JSON.stringify(v)) + ); + + return s; +}; export const rate = writable(); export const user = writable(); export const invoiceAmount = writable(); -export const token = writable(); +export const token = persisted('token'); diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index f5576edd..1af9679a 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -2,7 +2,11 @@ import '../app.css'; import { onMount } from 'svelte'; import { connect } from '$lib/socket'; + import { token } from "$lib/store"; + import { session } from "$app/stores"; + import { browser } from "$app/env"; + browser && ($token ||= $session.token); onMount(connect); diff --git a/src/routes/login.js b/src/routes/login.js index 771de9e1..db1fbb6c 100644 --- a/src/routes/login.js +++ b/src/routes/login.js @@ -1,5 +1,24 @@ import { post } from '$lib/utils'; +import cookie from 'cookie'; + +let maxAge = 30 * 24 * 60 * 60; export async function POST({ request }) { - return { body: await post('/login', await request.json()) }; + let body = await post('/login', await request.json()); + + let expires = new Date(); + expires.setSeconds(expires.getSeconds() + maxAge); + + return { + body, + headers: { + 'set-cookie': cookie.serialize('token', body.token, { + httpOnly: true, + maxAge, + sameSite: 'lax', + path: '/', + expires + }) + } + }; } -- cgit v1.2.3 From a038ce9711f8ae5945eba073c82aa2aeb2bcf5c3 Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Fri, 29 Jul 2022 21:29:18 -0600 Subject: start hooking up invoice screen --- package.json | 1 + pnpm-lock.yaml | 18 ++- src/components/RegisterOrLogin.svelte | 7 +- src/hooks/index.js | 18 +-- src/lib/store.js | 4 +- src/routes/__layout.svelte | 8 +- src/routes/invoice.svelte | 253 ++++++++++++++++++++++++++++++++-- src/routes/receive.svelte | 22 +-- static/icons/arrow-left.svg | 3 + static/images/invoice.svg | 4 + tailwind.config.cjs | 3 +- 11 files changed, 298 insertions(+), 43 deletions(-) create mode 100644 static/icons/arrow-left.svg create mode 100644 static/images/invoice.svg (limited to 'src/routes') diff --git a/package.json b/package.json index 23bb6cb6..d4312d1c 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "postcss": "^8.4.14", "prettier": "^2.7.1", "prettier-plugin-svelte": "^2.7.0", + "qr-code-styling": "1.6.0-rc.1", "svelte": "^3.49.0", "svelte-preprocess": "^4.10.7", "tailwindcss": "^3.1.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9c34207f..69b6d84e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,7 @@ specifiers: postcss: ^8.4.14 prettier: ^2.7.1 prettier-plugin-svelte: ^2.7.0 + qr-code-styling: 1.6.0-rc.1 svelte: ^3.49.0 svelte-preprocess: ^4.10.7 tailwindcss: ^3.1.6 @@ -15,12 +16,13 @@ specifiers: devDependencies: '@sveltejs/adapter-auto': 1.0.0-next.64 - '@sveltejs/kit': 1.0.0-next.396_svelte@3.49.0+vite@3.0.3 + '@sveltejs/kit': 1.0.0-next.398_svelte@3.49.0+vite@3.0.3 autoprefixer: 10.4.7_postcss@8.4.14 cookie: 0.5.0 postcss: 8.4.14 prettier: 2.7.1 prettier-plugin-svelte: 2.7.0_o3ioganyptcsrh6x4hnxvjkpqi + qr-code-styling: 1.6.0-rc.1 svelte: 3.49.0 svelte-preprocess: 4.10.7_nxvsp6sjiltnatqa6jdm4mr6zu tailwindcss: 3.1.6 @@ -121,8 +123,8 @@ packages: - supports-color dev: true - /@sveltejs/kit/1.0.0-next.396_svelte@3.49.0+vite@3.0.3: - resolution: {integrity: sha512-bKFpuzp9QxPkOIOEIeNeedvxEMORNqBPxUmoJXDP/Se7MrSfcxYiamjBcKrG+bgGNWmV39nD3EvUox+CXno/Ig==} + /@sveltejs/kit/1.0.0-next.398_svelte@3.49.0+vite@3.0.3: + resolution: {integrity: sha512-ONjHoRurnFUe+0lv0P9rZQpDuuJy4Cr/lDneoG+lkOR5/7gcvd03TlVdxLz1ZQAWPbgovm/PpshOvIUeC4n62A==} engines: {node: '>=16.9'} hasBin: true peerDependencies: @@ -1130,6 +1132,16 @@ packages: hasBin: true dev: true + /qr-code-styling/1.6.0-rc.1: + resolution: {integrity: sha512-ModRIiW6oUnsP18QzrRYZSc/CFKFKIdj7pUs57AEVH20ajlglRpN3HukjHk0UbNMTlKGuaYl7Gt6/O5Gg2NU2Q==} + dependencies: + qrcode-generator: 1.4.4 + dev: true + + /qrcode-generator/1.4.4: + resolution: {integrity: sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw==} + dev: true + /queue-microtask/1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte index 2334741d..15be60cf 100644 --- a/src/components/RegisterOrLogin.svelte +++ b/src/components/RegisterOrLogin.svelte @@ -7,7 +7,8 @@ export let page; - let username = "bob", password = "pw"; + let username = 'bob', + password = 'pw'; let revealPassword = false; @@ -20,7 +21,7 @@ let r = await post(url, { username, password }); if (!r.token) r = await post('/login', { username, password }); $token = r.token; - console.log("new token", r.token) + console.log('new token', r.token); auth(); goto('/receive'); }; @@ -43,7 +44,7 @@ required class="bg-primary p-4 rounded-2xl w-full" bind:value={username} - autofocus + autofocus /> diff --git a/src/hooks/index.js b/src/hooks/index.js index 21e56052..6a9c8ec5 100644 --- a/src/hooks/index.js +++ b/src/hooks/index.js @@ -1,16 +1,16 @@ -import cookie from "cookie"; +import cookie from 'cookie'; export async function handle({ event, resolve }) { - let { request: { headers }, - } = event; + let { + request: { headers } + } = event; - const cookies = cookie.parse(headers.get("cookie") || ""); - let { token } = cookies; - event.locals = { token }; + const cookies = cookie.parse(headers.get('cookie') || ''); + let { token } = cookies; + event.locals = { token }; - return resolve(event); + return resolve(event); } - export const getSession = ({ locals: { token } }) => { - return { token }; + return { token }; }; diff --git a/src/lib/store.js b/src/lib/store.js index 62232f9d..6f4a9515 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -8,8 +8,7 @@ const persisted = (k, i) => { : i ); - s.subscribe((v) => browser && sessionStorage.setItem(k, JSON.stringify(v)) - ); + s.subscribe((v) => browser && sessionStorage.setItem(k, JSON.stringify(v))); return s; }; @@ -17,4 +16,5 @@ const persisted = (k, i) => { export const rate = writable(); export const user = writable(); export const invoiceAmount = writable(); +export const invoiceAmountFiat = writable(); export const token = persisted('token'); diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 1af9679a..6562db18 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -2,11 +2,11 @@ import '../app.css'; import { onMount } from 'svelte'; import { connect } from '$lib/socket'; - import { token } from "$lib/store"; - import { session } from "$app/stores"; - import { browser } from "$app/env"; + import { token } from '$lib/store'; + import { session } from '$app/stores'; + import { browser } from '$app/env'; - browser && ($token ||= $session.token); + browser && ($token ||= $session.token); onMount(connect); diff --git a/src/routes/invoice.svelte b/src/routes/invoice.svelte index 567aefbb..6dce84fe 100644 --- a/src/routes/invoice.svelte +++ b/src/routes/invoice.svelte @@ -1,15 +1,248 @@ -{#if $user} - {text} - {$invoiceAmount} - {$rate} - {$user.username} - {#each $user.payments as p} - {p.amount}
- {/each} -{/if} + + +
+
+ {#if $invoiceAmount && $invoiceAmountFiat && $rate && text} + +
+

Add a tip?

+ +
+ {tipAmountFormatted}{`(${tipAmountSats} SATS)`} + {tipPercent}% +
+ + { + customTipAmount = ''; + tipPercent = e.target.value; + }} + /> + +
+ {#each tipAmounts as amount} + + {/each} + +
+ $ + handleCustomTipAmount(e)} + class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto" + placeholder="Other" + /> + +
+
+
+ +
+ + +
+ Scan to pay insert name here + +
+ +
+
+ Invoice + {invoiceAmountFiatFormatted} + {`(${invoiceAmountFormatted} SATS)`} +
+ +
+ Tip + {tipAmountFormatted} + {`(${tipAmountSats} SATS)`} +
+ +
+ Total + {totalAmountFormatted} + {`(${totalAmountSats} SATS)`} +
+
+
+ {:else} +
+
+
+ {/if} +
+
+ + diff --git a/src/routes/receive.svelte b/src/routes/receive.svelte index 338bc06c..095a2ba3 100644 --- a/src/routes/receive.svelte +++ b/src/routes/receive.svelte @@ -2,7 +2,7 @@ // in the future we will want to allow users to set their fiat currency in the settings import { AppHeader, Icon } from '$comp'; import { goto } from '$app/navigation'; - import { invoiceAmount, rate } from '$lib/store'; + import { invoiceAmount, invoiceAmountFiat, rate } from '$lib/store'; let useFiat = true; let amountFiat = 0; @@ -10,6 +10,9 @@ let message = ''; $: $invoiceAmount = parseInt(amountSats === 0 ? amountFiat / ($rate / 100000000) : amountSats); + $: $invoiceAmountFiat = parseInt( + amountFiat === 0 ? amountSats * ($rate / 100000000) : amountFiat + ); $: amountSatsFormatted = new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format( amountSats ); @@ -63,6 +66,7 @@ amountSats = amountSats.slice(0, amountSats.length - 1); if (amountSats.length === 0) { amountSats = 0; + amountFiat = 0; } } } else if (value !== '<' && parseInt(amountSats + value) > 100000000) { @@ -77,8 +81,8 @@ -{#if $rate} -
+
+ {#if $rate}
@@ -165,11 +169,7 @@ >
-
-{:else} -
-
-
-{/if} + {:else} +
+ {/if} +
diff --git a/static/icons/arrow-left.svg b/static/icons/arrow-left.svg new file mode 100644 index 00000000..64ded577 --- /dev/null +++ b/static/icons/arrow-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/images/invoice.svg b/static/images/invoice.svg new file mode 100644 index 00000000..4c9cbce9 --- /dev/null +++ b/static/images/invoice.svg @@ -0,0 +1,4 @@ + + + + diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 86d5d1cf..4be763a3 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -6,7 +6,8 @@ module.exports = { colors: { primary: '#F5F7FA', secondary: '#858A92', - gradient: '#C3CFE2' + gradient: '#C3CFE2', + lightgrey: '#eaecef' } } }, -- cgit v1.2.3 From b972aa21389c20ab9da1a627612bbc1dafeec366 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 29 Jul 2022 23:40:59 -0700 Subject: dynamic qr lib import and invoice amount param --- src/routes/invoice.js | 12 -- src/routes/invoice.svelte | 248 ------------------------------------ src/routes/invoice/[amount].js | 14 +++ src/routes/invoice/[amount].svelte | 252 +++++++++++++++++++++++++++++++++++++ src/routes/receive.svelte | 2 +- 5 files changed, 267 insertions(+), 261 deletions(-) delete mode 100644 src/routes/invoice.js delete mode 100644 src/routes/invoice.svelte create mode 100644 src/routes/invoice/[amount].js create mode 100644 src/routes/invoice/[amount].svelte (limited to 'src/routes') diff --git a/src/routes/invoice.js b/src/routes/invoice.js deleted file mode 100644 index 4b3327f6..00000000 --- a/src/routes/invoice.js +++ /dev/null @@ -1,12 +0,0 @@ -import { post } from '$lib/utils'; -import { invoiceAmount } from '$lib/store'; - -const username = 'bob', - network = 'lightning'; - -export async function GET({ params }) { - let { text } = await post('/lightning/invoice', { amount: invoiceAmount }); - await post('/invoice', { invoice: { text, network }, user: { username } }); - - return { body: { text } }; -} diff --git a/src/routes/invoice.svelte b/src/routes/invoice.svelte deleted file mode 100644 index 6dce84fe..00000000 --- a/src/routes/invoice.svelte +++ /dev/null @@ -1,248 +0,0 @@ - - - - -
-
- {#if $invoiceAmount && $invoiceAmountFiat && $rate && text} - -
-

Add a tip?

- -
- {tipAmountFormatted}{`(${tipAmountSats} SATS)`} - {tipPercent}% -
- - { - customTipAmount = ''; - tipPercent = e.target.value; - }} - /> - -
- {#each tipAmounts as amount} - - {/each} - -
- $ - handleCustomTipAmount(e)} - class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto" - placeholder="Other" - /> - -
-
-
- -
- - -
- Scan to pay insert name here - -
- -
-
- Invoice - {invoiceAmountFiatFormatted} - {`(${invoiceAmountFormatted} SATS)`} -
- -
- Tip - {tipAmountFormatted} - {`(${tipAmountSats} SATS)`} -
- -
- Total - {totalAmountFormatted} - {`(${totalAmountSats} SATS)`} -
-
-
- {:else} -
-
-
- {/if} -
-
- - diff --git a/src/routes/invoice/[amount].js b/src/routes/invoice/[amount].js new file mode 100644 index 00000000..f75a1672 --- /dev/null +++ b/src/routes/invoice/[amount].js @@ -0,0 +1,14 @@ +import { post } from '$lib/utils'; + +const username = 'bob', + network = 'lightning'; + +export async function GET({ params }) { + let { amount } = params; + console.log("AMT", amount); + let { text } = await post('/lightning/invoice', { amount }); + console.log("TXT", text); + await post('/invoice', { invoice: { text, network }, user: { username } }); + + return { body: { amount, text } }; +} diff --git a/src/routes/invoice/[amount].svelte b/src/routes/invoice/[amount].svelte new file mode 100644 index 00000000..dd6ed7fa --- /dev/null +++ b/src/routes/invoice/[amount].svelte @@ -0,0 +1,252 @@ + + + + +
+
+ {#if $invoiceAmount && $invoiceAmountFiat && $rate && text} + +
+

Add a tip?

+ +
+ {tipAmountFormatted}{`(${tipAmountSats} SATS)`} + {tipPercent}% +
+ + { + customTipAmount = ''; + tipPercent = e.target.value; + }} + /> + +
+ {#each tipAmounts as amount} + + {/each} + +
+ $ + handleCustomTipAmount(e)} + class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto" + placeholder="Other" + /> + +
+
+
+ +
+ + +
+ Scan to pay insert name here + +
+ +
+
+ Invoice + {invoiceAmountFiatFormatted} + {`(${invoiceAmountFormatted} SATS)`} +
+ +
+ Tip + {tipAmountFormatted} + {`(${tipAmountSats} SATS)`} +
+ +
+ Total + {totalAmountFormatted} + {`(${totalAmountSats} SATS)`} +
+
+
+ {:else} +
+
+
+ {/if} +
+
+ + diff --git a/src/routes/receive.svelte b/src/routes/receive.svelte index 095a2ba3..ff156783 100644 --- a/src/routes/receive.svelte +++ b/src/routes/receive.svelte @@ -160,7 +160,7 @@ 0 ? 'opacity-50' : 'opacity-100'}" - on:click={() => goto('/invoice')} + on:click={() => goto(`/invoice/${$invoiceAmount}`)} disabled={$invoiceAmount === 0}> Show QR + import { Icon } from '$comp'; + + +
+
+ + + + + + +

404

+

Page not found.

+
+
diff --git a/src/routes/__error.svelte b/src/routes/__error.svelte new file mode 100644 index 00000000..6cdeeac7 --- /dev/null +++ b/src/routes/__error.svelte @@ -0,0 +1,16 @@ + + +
+
+ + + + + + +

Error

+

Please try again or contact support.

+
+
diff --git a/src/routes/invoice/[amount].svelte b/src/routes/invoice/[amount].svelte index 4c1ec199..2cf16e37 100644 --- a/src/routes/invoice/[amount].svelte +++ b/src/routes/invoice/[amount].svelte @@ -8,6 +8,10 @@ export let text; export let amount; + if (!$user && typeof window !== 'undefined') { + window.location = '/login'; + } + let tipPercent = 0; const setRate = ($invoiceAmountFiat / $invoiceAmount) * 100000000; @@ -83,131 +87,133 @@ }); - - -
-
- {#if $invoiceAmount && $invoiceAmountFiat && $rate && text} - -
-

Add a tip?

- -
- {tipAmountFormatted}{`(${tipAmountSats} SATS)`} - {tipPercent}% -
- - { - customTipAmount = ''; - tipPercent = e.target.value; - }} - /> - -
- {#each tipAmounts as amount} - goto('/receive')}> + + + +
+
+ {#if $invoiceAmount && $invoiceAmountFiat && $rate && text} + +
+

Add a tip?

+ +
+ {tipAmountFormatted}{`(${tipAmountSats} SATS)`} - {/each} + {tipPercent}% +
-
- $ - handleCustomTipAmount(e)} - class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto" - placeholder="Other" - /> - + { + customTipAmount = ''; + tipPercent = e.target.value; + }} + /> + +
+ {#each tipAmounts as amount} + + {/each} + +
+ $ + handleCustomTipAmount(e)} + class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto" + placeholder="Other" + /> + +
-
- -
- - -
- Scan to pay insert name here
-
-
- Invoice - {invoiceAmountFiatFormatted} - {`(${invoiceAmountFormatted} SATS)`} -
- -
- Tip - {tipAmountFormatted} - {`(${tipAmountSats} SATS)`} -
+ +
+ Scan to pay insert name here -
- Total - {totalAmountFormatted} - {`(${totalAmountSats} SATS)`} +
+ +
+
+ Invoice + {invoiceAmountFiatFormatted} + {`(${invoiceAmountFormatted} SATS)`} +
+ +
+ Tip + {tipAmountFormatted} + {`(${tipAmountSats} SATS)`} +
+ +
+ Total + {totalAmountFormatted} + {`(${totalAmountSats} SATS)`} +
-
- {:else} -
-
-
- {/if} + {:else} +
+
+
+ {/if} +
-
+{/if} diff --git a/static/icons/heart.svg b/static/icons/heart.svg new file mode 100644 index 00000000..f3a5f757 --- /dev/null +++ b/static/icons/heart.svg @@ -0,0 +1,3 @@ + + + -- cgit v1.2.3 From 1f8b1f52431dc7a95118b310dbca3a178d24614b Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Sat, 30 Jul 2022 08:31:48 -0600 Subject: remove comment --- src/routes/receive.svelte | 1 - 1 file changed, 1 deletion(-) (limited to 'src/routes') diff --git a/src/routes/receive.svelte b/src/routes/receive.svelte index 11bafe9a..760733a3 100644 --- a/src/routes/receive.svelte +++ b/src/routes/receive.svelte @@ -85,7 +85,6 @@ {#if $user} -
{#if $rate}
-- cgit v1.2.3 From 8acc59a86b6ec049dfe07f92fd19eeda726136f3 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 30 Jul 2022 09:47:08 -0700 Subject: logout function --- src/components/AppHeader.svelte | 4 +++- src/components/RegisterOrLogin.svelte | 4 ++-- src/lib/socket.js | 4 ++++ src/routes/[...path].svelte | 16 ---------------- src/routes/[username].js | 3 +++ src/routes/[username].svelte | 27 +++++++++++++++++++++++++++ src/routes/__layout.svelte | 23 +++++++++++++++++++---- src/routes/logout/done.svelte | 13 +++++++++++++ src/routes/logout/index.js | 26 ++++++++++++++++++++++++++ src/routes/logout/index.svelte | 10 ++++++++++ src/routes/receive.svelte | 4 ---- static/icons/logout.svg | 3 +++ 12 files changed, 110 insertions(+), 27 deletions(-) delete mode 100644 src/routes/[...path].svelte create mode 100644 src/routes/[username].js create mode 100644 src/routes/[username].svelte create mode 100644 src/routes/logout/done.svelte create mode 100644 src/routes/logout/index.js create mode 100644 src/routes/logout/index.svelte create mode 100644 static/icons/logout.svg (limited to 'src/routes') diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 6376e27f..b096f01e 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -14,9 +14,11 @@ - + diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte index b42b8d7f..f5764a85 100644 --- a/src/components/RegisterOrLogin.svelte +++ b/src/components/RegisterOrLogin.svelte @@ -1,7 +1,7 @@ diff --git a/src/lib/socket.js b/src/lib/socket.js index 9d0c472e..14555bd3 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -46,6 +46,10 @@ export function connect() { interval = setInterval(() => send('heartbeat'), 5000); } +export function close() { + if (socket) socket.close(); +} + function onWebsocketMessage(msg) { let { type, data } = JSON.parse(msg.data); messages(data)[type] && messages(data)[type](); diff --git a/src/routes/[...path].svelte b/src/routes/[...path].svelte deleted file mode 100644 index 503316bb..00000000 --- a/src/routes/[...path].svelte +++ /dev/null @@ -1,16 +0,0 @@ - - -
-
- - - - - - -

404

-

Page not found.

-
-
diff --git a/src/routes/[username].js b/src/routes/[username].js new file mode 100644 index 00000000..39a216c2 --- /dev/null +++ b/src/routes/[username].js @@ -0,0 +1,3 @@ +export async function GET({ params }) { + return { body: params } +} diff --git a/src/routes/[username].svelte b/src/routes/[username].svelte new file mode 100644 index 00000000..fe1f7754 --- /dev/null +++ b/src/routes/[username].svelte @@ -0,0 +1,27 @@ + + +{#if $user?.username === username} + +
+
+
+ Signed in as {username} +
+ + +
+
+{/if} diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 6562db18..c01dc848 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -2,12 +2,27 @@ import '../app.css'; import { onMount } from 'svelte'; import { connect } from '$lib/socket'; - import { token } from '$lib/store'; - import { session } from '$app/stores'; + import { user, token } from '$lib/store'; + import { page, session } from '$app/stores'; import { browser } from '$app/env'; + import { goto } from '$app/navigation'; browser && ($token ||= $session.token); - onMount(connect); + let protectedRoutes = [/receive/]; + let ready = false; + + onMount(() => { + if (protectedRoutes.find((p) => $page.url.pathname.match(p))) { + if (!$token) goto('/login'); + user.subscribe((u) => (ready = true)); + } else { + ready = true; + } + + connect(); + }); - +{#if ready} + +{/if} diff --git a/src/routes/logout/done.svelte b/src/routes/logout/done.svelte new file mode 100644 index 00000000..894c7b99 --- /dev/null +++ b/src/routes/logout/done.svelte @@ -0,0 +1,13 @@ + diff --git a/src/routes/logout/index.js b/src/routes/logout/index.js new file mode 100644 index 00000000..80e65f8b --- /dev/null +++ b/src/routes/logout/index.js @@ -0,0 +1,26 @@ +import cookie from "cookie"; + +const opts = { + httpOnly: true, + sameSite: "lax", + path: "/", +}; + +export async function GET({ request: { headers } }) { + return { + status: 302, + headers: { + location: "/logout/done", + "set-cookie": [ + cookie.serialize("token", "", { + ...opts, + expires: new Date(0), + }), + cookie.serialize("refresh_token", "", { + ...opts, + expires: new Date(0), + }), + ], + }, + }; +} diff --git a/src/routes/logout/index.svelte b/src/routes/logout/index.svelte new file mode 100644 index 00000000..2c6a7085 --- /dev/null +++ b/src/routes/logout/index.svelte @@ -0,0 +1,10 @@ + diff --git a/src/routes/receive.svelte b/src/routes/receive.svelte index 760733a3..0329dea4 100644 --- a/src/routes/receive.svelte +++ b/src/routes/receive.svelte @@ -4,10 +4,6 @@ import { goto } from '$app/navigation'; import { invoiceAmount, invoiceAmountFiat, rate, user } from '$lib/store'; - if (!$user && typeof window !== 'undefined') { - window.location = '/login'; - } - let useFiat = true; let amountFiat = 0; let amountSats = 0; diff --git a/static/icons/logout.svg b/static/icons/logout.svg new file mode 100644 index 00000000..495d6574 --- /dev/null +++ b/static/icons/logout.svg @@ -0,0 +1,3 @@ + + + -- cgit v1.2.3 From 5bf4891768f1ee359ee5795272c289b40745aed5 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 30 Jul 2022 11:13:39 -0700 Subject: get invoice by uuid --- src/components/AppHeader.svelte | 4 +- src/components/RegisterOrLogin.svelte | 2 +- src/lib/utils.js | 5 + src/routes/[username].js | 3 - src/routes/[username].svelte | 27 --- src/routes/[username]/index.js | 3 + src/routes/[username]/index.svelte | 27 +++ src/routes/[username]/receive.svelte | 188 ++++++++++++++++++++ src/routes/__layout.svelte | 2 +- src/routes/invoice/[amount].js | 12 -- src/routes/invoice/[amount].svelte | 322 ---------------------------------- src/routes/invoice/[id].js | 11 ++ src/routes/invoice/[id].svelte | 322 ++++++++++++++++++++++++++++++++++ src/routes/invoice/index.js | 11 ++ src/routes/receive.svelte | 178 ------------------- 15 files changed, 572 insertions(+), 545 deletions(-) delete mode 100644 src/routes/[username].js delete mode 100644 src/routes/[username].svelte create mode 100644 src/routes/[username]/index.js create mode 100644 src/routes/[username]/index.svelte create mode 100644 src/routes/[username]/receive.svelte delete mode 100644 src/routes/invoice/[amount].js delete mode 100644 src/routes/invoice/[amount].svelte create mode 100644 src/routes/invoice/[id].js create mode 100644 src/routes/invoice/[id].svelte create mode 100644 src/routes/invoice/index.js delete mode 100644 src/routes/receive.svelte (limited to 'src/routes') diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index b096f01e..99eea6d5 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -8,9 +8,11 @@
diff --git a/src/lib/socket.js b/src/lib/socket.js index 36d41ea8..c7c541e1 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -18,7 +18,7 @@ export const messages = (data) => ({ }, payment() { - console.log(data); + console.log(data, 'payment'); }, connected: auth, diff --git a/src/routes/[username]/customers.svelte b/src/routes/[username]/customers.svelte new file mode 100644 index 00000000..1935b156 --- /dev/null +++ b/src/routes/[username]/customers.svelte @@ -0,0 +1,5 @@ + + + diff --git a/src/routes/[username]/dashboard.svelte b/src/routes/[username]/dashboard.svelte new file mode 100644 index 00000000..1935b156 --- /dev/null +++ b/src/routes/[username]/dashboard.svelte @@ -0,0 +1,5 @@ + + + diff --git a/src/routes/[username]/settings.svelte b/src/routes/[username]/settings.svelte new file mode 100644 index 00000000..1935b156 --- /dev/null +++ b/src/routes/[username]/settings.svelte @@ -0,0 +1,5 @@ + + + diff --git a/src/routes/[username]/support.svelte b/src/routes/[username]/support.svelte new file mode 100644 index 00000000..1935b156 --- /dev/null +++ b/src/routes/[username]/support.svelte @@ -0,0 +1,5 @@ + + + diff --git a/src/routes/[username]/transactions.svelte b/src/routes/[username]/transactions.svelte new file mode 100644 index 00000000..1935b156 --- /dev/null +++ b/src/routes/[username]/transactions.svelte @@ -0,0 +1,5 @@ + + + diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index d26ccfed..736f38e8 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -18,7 +18,7 @@ if (protectedRoutes.find((p) => $page.url.pathname.match(p))) { if (!$token) { goto('/login'); - toast.push('Please login to continue.'); + toast.push('Please sign in to continue.'); } user.subscribe((u) => (ready = true)); } else { diff --git a/static/icons/customers.svg b/static/icons/customers.svg new file mode 100644 index 00000000..0b6081ba --- /dev/null +++ b/static/icons/customers.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/dash.svg b/static/icons/dash.svg new file mode 100644 index 00000000..acb39ab9 --- /dev/null +++ b/static/icons/dash.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/logout.svg b/static/icons/logout.svg index 495d6574..a614cfc0 100644 --- a/static/icons/logout.svg +++ b/static/icons/logout.svg @@ -1,3 +1,3 @@ - - + + diff --git a/static/icons/settings.svg b/static/icons/settings.svg new file mode 100644 index 00000000..2fac5bea --- /dev/null +++ b/static/icons/settings.svg @@ -0,0 +1,4 @@ + + + + diff --git a/static/icons/support.svg b/static/icons/support.svg new file mode 100644 index 00000000..47b935b5 --- /dev/null +++ b/static/icons/support.svg @@ -0,0 +1,3 @@ + + + -- cgit v1.2.3 From 27cbd543cece74228680d74f276eca89e13b557b Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Sat, 30 Jul 2022 20:45:19 -0600 Subject: add user public page --- src/components/AppHeader.svelte | 84 ++++++++++++++++++--------------- src/lib/utils.js | 4 ++ src/routes/[username]/index.svelte | 96 ++++++++++++++++++++++++++++++++------ src/routes/__layout.svelte | 11 ++++- static/icons/copy.svg | 3 ++ static/icons/minus.svg | 3 ++ static/icons/plus.svg | 3 ++ 7 files changed, 152 insertions(+), 52 deletions(-) create mode 100644 static/icons/copy.svg create mode 100644 static/icons/minus.svg create mode 100644 static/icons/plus.svg (limited to 'src/routes') diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 9f73adbf..d0123650 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -5,6 +5,8 @@ import { goto } from '$app/navigation'; import { Icon } from '$comp'; + export let avatarPosition = 'left-[calc(50vw-48px)]'; + const menuButtons = [ { title: 'Customers', icon: 'customers', goto: 'customers' }, { title: 'Dashboard', icon: 'dash', goto: 'dashboard' }, @@ -24,48 +26,54 @@ }; -
+
- -
-
    - {#each menuButtons as button} -
  • - -
    • - {/each} -
+ {#if $user} + + + + + + + + + +
+ +
+
    + {#each menuButtons as button} +
  • + +
    • + {/each} +
+
-
+ {:else} + + + + {/if}
diff --git a/src/lib/utils.js b/src/lib/utils.js index 22c88522..7831c519 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -17,3 +17,7 @@ export const post = (url, body) => body: JSON.stringify(body), headers: { accept: 'application/json', 'content-type': 'application/json' } }).then((r) => r.json()); + +export const copy = (text) => { + navigator.clipboard.writeText(text); +}; diff --git a/src/routes/[username]/index.svelte b/src/routes/[username]/index.svelte index 90d0c04a..a53b94cc 100644 --- a/src/routes/[username]/index.svelte +++ b/src/routes/[username]/index.svelte @@ -1,24 +1,94 @@ -{#if $user?.username === username} - -
-
-
- Signed in as {username} + +{#if username} + + +
+
+
+

{username}

+ +

Address goes here

+ +
-
- - - +
+
+
+
+ +

Scan to pay with Bitcoin

+ +
+ {lightning} + +
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 736f38e8..b2cb8aae 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -30,8 +30,17 @@ {#if ready} - + {:else} {/if} + + diff --git a/static/icons/copy.svg b/static/icons/copy.svg new file mode 100644 index 00000000..38b43e02 --- /dev/null +++ b/static/icons/copy.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/minus.svg b/static/icons/minus.svg new file mode 100644 index 00000000..65450cf4 --- /dev/null +++ b/static/icons/minus.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/plus.svg b/static/icons/plus.svg new file mode 100644 index 00000000..310c79d5 --- /dev/null +++ b/static/icons/plus.svg @@ -0,0 +1,3 @@ + + + -- cgit v1.2.3 From c5f0e9838ea1fc6d66026f139b955ea2ac181ef9 Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Sat, 30 Jul 2022 23:48:55 -0600 Subject: add about section to landing page --- src/components/About.svelte | 82 ++++++++++++++++++++++++++++++++++++++++++++ src/components/index.js | 1 + src/routes/index.svelte | 15 ++++++-- static/icons/github.svg | 3 ++ static/icons/twitter.svg | 3 ++ static/images/swoosh.png | Bin 0 -> 4382 bytes 6 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 src/components/About.svelte create mode 100644 static/icons/github.svg create mode 100644 static/icons/twitter.svg create mode 100644 static/images/swoosh.png (limited to 'src/routes') diff --git a/src/components/About.svelte b/src/components/About.svelte new file mode 100644 index 00000000..eb8e9a82 --- /dev/null +++ b/src/components/About.svelte @@ -0,0 +1,82 @@ + + +
+

About

+
+

+ Coinos is an open source bitcoin web wallet, point of sale, ecommerce marketplace and exchange + platform. Development started in Vancouver in September 2012 as a way to provide local + merchants with a convenient way to accept bitcoin payments. +

+ The feature set has grown over the years to accomodate a wide variety of use cases with the goal + of making it as easy as possible for anyone to get started using Bitcoin quickly, cheaply, and + securely. +

+ Anyone can download the source code and host their own instance of the platform backed by their + own bitcoin, liquid or lightning nodes, or reach out and we'll gladly set this up for you. + +

+

+ Once signed in, you can create both custodial and non-custodial wallets within your account. + The default custodial wallet allows funds to be deposited on any of the bitcoin, liquid or + lightning networks and seamlessly withdrawn over any other network without any conversion + process or fee. +

+ Using a non-custodial wallet means keys are generated client-side in your browser so we never have + access to the funds. Transactions from these accounts are subject to on-chain transaction fees + and Lightning Network payments are not supported but we advise using this account type or a paper + wallet for storing larger amounts. +

+ Intra-account transfers between custodial wallets of different users on our server are completely + free, instant, and unlimited. +

+
+ +
+
+

The Founder

+ + + +
+ Adam Soltys + Chief Technical Officer +
+ +
+ + +
+
+ +
    +
  • Running Bitcoin since 2011
    • +
  • 20+ years web development experience in government and industry
    • +
  • Early Bitcoin Vancouver meetup organizer
    • +
  • Founder of The Bitcoin Co-op and early supporter of Decentral Vancouver
    • +
  • Yogi, permaculturist, anarchist, decentralist
    • +
  • Husband, father, brother, son
    • +
+
+
diff --git a/src/components/index.js b/src/components/index.js index 53f0fe99..afa4790c 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -9,3 +9,4 @@ export { default as RegisterOrLogin } from './RegisterOrLogin.svelte'; export { default as AppHeader } from './AppHeader.svelte'; export { default as LoadingSplash } from './LoadingSplash.svelte'; export { default as PageNotFound } from './404.svelte'; +export { default as About } from './About.svelte'; diff --git a/src/routes/index.svelte b/src/routes/index.svelte index cda885a3..5a9a0275 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -1,5 +1,13 @@ -
-

About

-
-

- Coinos is an open source bitcoin web wallet, point of sale, ecommerce marketplace and exchange - platform. Development started in Vancouver in September 2012 as a way to provide local - merchants with a convenient way to accept bitcoin payments. -

- The feature set has grown over the years to accomodate a wide variety of use cases with the goal - of making it as easy as possible for anyone to get started using Bitcoin quickly, cheaply, and - securely. -

- Anyone can download the source code and host their own instance of the platform backed by their - own bitcoin, liquid or lightning nodes, or reach out and we'll gladly set this up for you. - -

-

- Once signed in, you can create both custodial and non-custodial wallets within your account. - The default custodial wallet allows funds to be deposited on any of the bitcoin, liquid or - lightning networks and seamlessly withdrawn over any other network without any conversion - process or fee. -

- Using a non-custodial wallet means keys are generated client-side in your browser so we never have - access to the funds. Transactions from these accounts are subject to on-chain transaction fees - and Lightning Network payments are not supported but we advise using this account type or a paper - wallet for storing larger amounts. -

- Intra-account transfers between custodial wallets of different users on our server are completely - free, instant, and unlimited. -

-
- -
-
-

The Founder

+

About

+
+

+ Coinos is an open source bitcoin web wallet, point of sale, ecommerce marketplace and exchange + platform. Development started in Vancouver in September 2012 as a way to provide local merchants + with a convenient way to accept bitcoin payments. +

+ The feature set has grown over the years to accomodate a wide variety of use cases with the goal + of making it as easy as possible for anyone to get started using Bitcoin quickly, cheaply, and securely. +

+ Anyone can download the source code and host their own instance of the platform backed by their own + bitcoin, liquid or lightning nodes, or reach out and we'll gladly set this up for you. + +

+

+ Once signed in, you can create both custodial and non-custodial wallets within your account. The + default custodial wallet allows funds to be deposited on any of the bitcoin, liquid or lightning + networks and seamlessly withdrawn over any other network without any conversion process or fee. +

+ Using a non-custodial wallet means keys are generated client-side in your browser so we never have + access to the funds. Transactions from these accounts are subject to on-chain transaction fees and + Lightning Network payments are not supported but we advise using this account type or a paper wallet + for storing larger amounts. +

+ Intra-account transfers between custodial wallets of different users on our server are completely + free, instant, and unlimited. +

+
- +
+
+

The Founder

-
- Adam Soltys - Chief Technical Officer -
+ -
- - -
+
+ Adam Soltys + Chief Technical Officer
-
    -
  • Running Bitcoin since 2011
    • -
  • 20+ years web development experience in government and industry
    • -
  • Early Bitcoin Vancouver meetup organizer
    • -
  • Founder of The Bitcoin Co-op and early supporter of Decentral Vancouver
    • -
  • Yogi, permaculturist, anarchist, decentralist
    • -
  • Husband, father, brother, son
    • -
+
+ + +
+ +
    +
  • Running Bitcoin since 2011
    • +
  • 20+ years web development experience in government and industry
    • +
  • Early Bitcoin Vancouver meetup organizer
    • +
  • Founder of The Bitcoin Co-op and early supporter of Decentral Vancouver
    • +
  • Yogi, permaculturist, anarchist, decentralist
    • +
  • Husband, father, brother, son
    • +
diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte index 927c8749..91443ba5 100644 --- a/src/components/LandingHeader.svelte +++ b/src/components/LandingHeader.svelte @@ -6,6 +6,7 @@ export let howItWorks; export let faq; + export let about;
@@ -17,7 +18,7 @@ - +
+ +
-- cgit v1.2.3 From f81e273613e95e89087badcc0cb5a9bd007e6d47 Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Sun, 31 Jul 2022 01:02:39 -0600 Subject: add footer and other refactoring --- src/components/About.svelte | 18 ++++++++++++------ src/components/Footer.svelte | 39 +++++++++++++++++++++++++++++++++++++++ src/components/index.js | 1 + src/routes/community.svelte | 0 src/routes/index.svelte | 5 ++++- src/routes/jobs.svelte | 0 static/icons/shield.svg | 15 +++++++++++++++ 7 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 src/components/Footer.svelte create mode 100644 src/routes/community.svelte create mode 100644 src/routes/jobs.svelte create mode 100644 static/icons/shield.svg (limited to 'src/routes') diff --git a/src/components/About.svelte b/src/components/About.svelte index 0fdf5200..a5f4c274 100644 --- a/src/components/About.svelte +++ b/src/components/About.svelte @@ -1,5 +1,14 @@

About

@@ -68,11 +77,8 @@
    -
  • Running Bitcoin since 2011
    • -
  • 20+ years web development experience in government and industry
    • -
  • Early Bitcoin Vancouver meetup organizer
    • -
  • Founder of The Bitcoin Co-op and early supporter of Decentral Vancouver
    • -
  • Yogi, permaculturist, anarchist, decentralist
    • -
  • Husband, father, brother, son
    • + {#each aboutAdam as about} +
  • {about}
    • + {/each}
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte new file mode 100644 index 00000000..0c682179 --- /dev/null +++ b/src/components/Footer.svelte @@ -0,0 +1,39 @@ + + +
+ + +
+

Follow Us

+ +
+ +
+

Company

+ +
+ + +
diff --git a/src/components/index.js b/src/components/index.js index afa4790c..dade4c2c 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -10,3 +10,4 @@ export { default as AppHeader } from './AppHeader.svelte'; export { default as LoadingSplash } from './LoadingSplash.svelte'; export { default as PageNotFound } from './404.svelte'; export { default as About } from './About.svelte'; +export { default as Footer } from './Footer.svelte'; diff --git a/src/routes/community.svelte b/src/routes/community.svelte new file mode 100644 index 00000000..e69de29b diff --git a/src/routes/index.svelte b/src/routes/index.svelte index 2164c58b..c823f668 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -6,7 +6,8 @@ HowItWorksCard, FaqCard, Image, - About + About, + Footer } from '$comp'; let howItWorks; @@ -112,3 +113,5 @@
+ +