From ac4e976d816974f5887ebe7e4b1287617671ccb1 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 1 Feb 2023 20:48:26 -0800 Subject: check payment with field --- src/routes/(app)/[username]/payments/[...page]/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte index c9731299..7161f50c 100644 --- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte +++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte @@ -178,7 +178,7 @@
Pot
- {:else if p.type === types.internal} + {:else if p.with}
-- cgit v1.2.3 From 8ebbc178b68da89470bac68f65a365bc6366747b Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 1 Feb 2023 21:10:04 -0800 Subject: cole bio update --- src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index d65ffc45..eb0039ac 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -33,8 +33,8 @@ }, "cole": { "name": "Cole", - "position": "Bitcoin Professional", - "bio": "As a Certified Bitcoin Professional, Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible." + "position": "Certified Bitcoin Professional", + "bio": "Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible." }, "john": { "name": "John Barratt", -- cgit v1.2.3 From 916f331e0e9a051830ce988639bb2149788e8228 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 2 Feb 2023 23:26:34 -0800 Subject: move invoices, combine profile and dashboard --- src/components/AppHeader.svelte | 2 +- src/components/Balance.svelte | 19 ++ src/components/Invoice.svelte | 2 +- src/components/Toggle.svelte | 3 +- src/components/index.js | 1 + src/lib/invoice.js | 4 +- src/lib/socket.js | 11 +- src/lib/store.js | 1 + src/lib/ticket.js | 2 +- src/lib/utils.js | 26 +++ .../(app)/[username]/(profile)/+layout.svelte | 99 ++++++-- src/routes/(app)/[username]/(profile)/+page.svelte | 24 +- .../[username]/(profile)/followers/+page.svelte | 2 +- .../[username]/(profile)/follows/+page.svelte | 2 +- .../(app)/[username]/address/+page.server.js | 4 +- .../(app)/[username]/dashboard/+page.server.js | 8 +- src/routes/(app)/[username]/dashboard/+page.svelte | 10 - src/routes/(app)/[username]/invoice/+server.js | 5 + .../[username]/invoice/[hash]/+layout.server.js | 20 ++ .../(app)/[username]/invoice/[hash]/+layout.svelte | 1 + .../[username]/invoice/[hash]/+page.server.js | 5 + .../(app)/[username]/invoice/[hash]/+page.svelte | 123 ++++++++++ .../[username]/invoice/[hash]/paid/+page.svelte | 62 +++++ .../[username]/invoice/[hash]/tip/+page.server.js | 11 + .../[username]/invoice/[hash]/tip/+page.svelte | 248 ++++++++++++++++++++ .../(app)/[username]/invoice/sent/+page.svelte | 10 + .../[username]/receive/[...param]/+page.svelte | 4 +- .../(app)/[username]/request/[id]/+page.server.js | 2 +- .../(app)/[username]/settings/[...tab]/_pos.svelte | 3 +- src/routes/(app)/invoice/+server.js | 5 - src/routes/(app)/invoice/[hash]/+layout.server.js | 19 -- src/routes/(app)/invoice/[hash]/+layout.svelte | 1 - src/routes/(app)/invoice/[hash]/+page.server.js | 5 - src/routes/(app)/invoice/[hash]/+page.svelte | 156 ------------- src/routes/(app)/invoice/[hash]/paid/+page.svelte | 62 ----- .../(app)/invoice/[hash]/tip/+page.server.js | 11 - src/routes/(app)/invoice/[hash]/tip/+page.svelte | 252 --------------------- src/routes/(app)/invoice/sent/+page.svelte | 10 - src/routes/(app)/launch/purchase/+page.server.js | 2 +- src/routes/(app)/send/[...text]/+page.svelte | 3 - .../send/user/[username]/[...amount]/+page.svelte | 2 +- 41 files changed, 641 insertions(+), 601 deletions(-) create mode 100644 src/components/Balance.svelte create mode 100644 src/routes/(app)/[username]/invoice/+server.js create mode 100644 src/routes/(app)/[username]/invoice/[hash]/+layout.server.js create mode 100644 src/routes/(app)/[username]/invoice/[hash]/+layout.svelte create mode 100644 src/routes/(app)/[username]/invoice/[hash]/+page.server.js create mode 100644 src/routes/(app)/[username]/invoice/[hash]/+page.svelte create mode 100644 src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte create mode 100644 src/routes/(app)/[username]/invoice/[hash]/tip/+page.server.js create mode 100644 src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte create mode 100644 src/routes/(app)/[username]/invoice/sent/+page.svelte delete mode 100644 src/routes/(app)/invoice/+server.js delete mode 100644 src/routes/(app)/invoice/[hash]/+layout.server.js delete mode 100644 src/routes/(app)/invoice/[hash]/+layout.svelte delete mode 100644 src/routes/(app)/invoice/[hash]/+page.server.js delete mode 100644 src/routes/(app)/invoice/[hash]/+page.svelte delete mode 100644 src/routes/(app)/invoice/[hash]/paid/+page.svelte delete mode 100644 src/routes/(app)/invoice/[hash]/tip/+page.server.js delete mode 100644 src/routes/(app)/invoice/[hash]/tip/+page.svelte delete mode 100644 src/routes/(app)/invoice/sent/+page.svelte diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 83571e62..29e96ce1 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -34,7 +34,7 @@
- + diff --git a/src/components/Toggle.svelte b/src/components/Toggle.svelte index 7f3db2f5..3516e48b 100644 --- a/src/components/Toggle.svelte +++ b/src/components/Toggle.svelte @@ -1,11 +1,10 @@
diff --git a/src/components/index.js b/src/components/index.js index ea44c7d9..18a821ff 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,3 +1,4 @@ +export { default as Balance } from './Balance.svelte'; export { default as Lnurlp } from './Lnurlp.svelte'; export { default as Lnurlw } from './Lnurlw.svelte'; export { default as Event } from './Event.svelte'; diff --git a/src/lib/invoice.js b/src/lib/invoice.js index 983cde2a..4c487172 100644 --- a/src/lib/invoice.js +++ b/src/lib/invoice.js @@ -29,6 +29,6 @@ export default async ({ cookies, request, url }) => { throw redirect(307, `/${user.username}/request/${request_id}`); } - if (invoice.prompt) throw redirect(307, `/invoice/${hash}/tip`); - else throw redirect(307, `/invoice/${hash}`); + if (invoice.prompt) throw redirect(307, `/${user.username}/invoice/${hash}/tip`); + else throw redirect(307, `/${user.username}/invoice/${hash}`); }; diff --git a/src/lib/socket.js b/src/lib/socket.js index 4044d2a2..986fc268 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -60,10 +60,13 @@ export const messages = (data) => ({ let { amount, invoice } = data; invalidate('app:invoice'); - let payments = get(payments); - let i = payments.findIndex((p) => p.id === data.id); - if (~i) (payments[i] = data), payments.set(payments); - else newPayment.set(true); + let p = get(payments); + let i = p.findIndex((p) => p.id === data.id); + + if (~i) { + p[i] = data; + payments.set(p); + } else newPayment.set(true); invalidate((url) => url.pathname === '/payments'); diff --git a/src/lib/store.js b/src/lib/store.js index d38eb411..93ac3d47 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -32,6 +32,7 @@ const persistLocal = (key, defaultValue) => { return s; }; +export const animatedRate = writable(0); export const avatar = writable(); export const banner = writable(); export const colorTheme = writable('from-primary to-gradient'); diff --git a/src/lib/ticket.js b/src/lib/ticket.js index 708c10f4..e1ebcb8c 100644 --- a/src/lib/ticket.js +++ b/src/lib/ticket.js @@ -6,7 +6,7 @@ export const createTicket = async (cookies, username) => { let { ticket } = await get('/ticket'); let { address } = await post( - '/invoice', + `/${username}/invoice`, { invoice: { network: 'liquid' }, user: { username } }, auth(cookies) ); diff --git a/src/lib/utils.js b/src/lib/utils.js index 2b5dda90..d0b0b1c2 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -202,3 +202,29 @@ export const stretch = async (password, salt) => ); export const bip32 = await BIP32Factory(ecc); + +function get_bigrams(string) { + var s = string.toLowerCase(); + var v = s.split(''); + for (var i = 0; i < v.length; i++) { + v[i] = s.slice(i, i + 2); + } + return v; +} + +export function ss(str1, str2) { + if (str1.length > 0 && str2.length > 0) { + var pairs1 = get_bigrams(str1); + var pairs2 = get_bigrams(str2); + var union = pairs1.length + pairs2.length; + var hits = 0; + for (var x = 0; x < pairs1.length; x++) { + for (var y = 0; y < pairs2.length; y++) { + if (pairs1[x] == pairs2[y]) hit_count++; + } + } + if (hits > 0) return (2.0 * hits) / union; + } + + return 0.0; +} diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index 6528d688..b318d777 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -1,12 +1,15 @@ -
-