aboutsummaryrefslogtreecommitdiffstats
path: root/src/routes/(app)
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2023-10-16 15:34:26 -0700
committerAdam Soltys <[email protected]>2023-10-16 15:34:26 -0700
commit829c2efb9c4415c64466988f1e189184ffb88478 (patch)
tree23f9e5fd83be3d4ee3943d254e4d3d2ce194819a /src/routes/(app)
parent16475fffdb0d20a2933cfaf6922afc7c137bb7fe (diff)
parent0212fe0032eb0c5d6bfb74ebaab42543b73d6d6b (diff)
downloadcoinos-ui-829c2efb9c4415c64466988f1e189184ffb88478.tar.gz
coinos-ui-829c2efb9c4415c64466988f1e189184ffb88478.zip
Merge branch 'master' into swapee
Diffstat (limited to 'src/routes/(app)')
-rw-r--r--src/routes/(app)/[username]/(profile)/+layout.svelte20
-rw-r--r--src/routes/(app)/[username]/(profile)/+page.svelte2
-rw-r--r--src/routes/(app)/[username]/card/[serial]/+page.svelte50
-rw-r--r--src/routes/(app)/[username]/generate/+page.svelte8
-rw-r--r--src/routes/(app)/[username]/invoice/[id]/+layout.server.js (renamed from src/routes/(app)/[username]/invoice/[hash]/+layout.server.js)20
-rw-r--r--src/routes/(app)/[username]/invoice/[id]/+layout.svelte (renamed from src/routes/(app)/[username]/invoice/[hash]/+layout.svelte)0
-rw-r--r--src/routes/(app)/[username]/invoice/[id]/+page.server.js (renamed from src/routes/(app)/[username]/invoice/[hash]/+page.server.js)0
-rw-r--r--src/routes/(app)/[username]/invoice/[id]/+page.svelte (renamed from src/routes/(app)/[username]/invoice/[hash]/+page.svelte)4
-rw-r--r--src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte (renamed from src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte)1
-rw-r--r--src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js (renamed from src/routes/(app)/[username]/invoice/[hash]/tip/+page.server.js)0
-rw-r--r--src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte (renamed from src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte)0
-rw-r--r--src/routes/(app)/[username]/map/+page.server.js12
-rw-r--r--src/routes/(app)/[username]/map/+page.svelte8
-rw-r--r--src/routes/(app)/[username]/payments/[...page]/+page.server.js4
-rw-r--r--src/routes/(app)/[username]/payments/[...page]/+page.svelte14
-rw-r--r--src/routes/(app)/[username]/receive/[...param]/+page.svelte1
-rw-r--r--src/routes/(app)/[username]/settings/[...tab]/+page.svelte4
-rw-r--r--src/routes/(app)/[username]/settings/[...tab]/_account.svelte36
-rw-r--r--src/routes/(app)/[username]/settings/[...tab]/_pos.svelte4
-rw-r--r--src/routes/(app)/[username]/settings/[...tab]/_security.svelte6
-rw-r--r--src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte57
-rw-r--r--src/routes/(app)/[username]/shopify.js/+server.js4
-rw-r--r--src/routes/(app)/login/+page.svelte2
-rw-r--r--src/routes/(app)/payment/[id]/+page.svelte6
-rw-r--r--src/routes/(app)/pot/[name]/+page.svelte20
-rw-r--r--src/routes/(app)/pot/[name]/sweep/+page.svelte31
-rw-r--r--src/routes/(app)/pot/[name]/withdraw/+page.svelte4
-rw-r--r--src/routes/(app)/qr/[text]/+page.svelte2
-rw-r--r--src/routes/(app)/send/invoice/[id]/+page.svelte15
29 files changed, 194 insertions, 141 deletions
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 0642b6fc..b8059a90 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -51,16 +51,16 @@
<div class="w-[240px] lg:absolute space-y-5 left-20 mx-auto lg:mr-10">
<h1 class="text-3xl font-bold text-center mx-auto">{display || username}</h1>
- {#if subject.address}
- <div
- class="text-secondary mx-auto text-center lg:text-left lg:mx-0"
- class:line-clamp-3={hideBio}
- on:click={toggleBio}
- on:keydown={toggleBio}
- >
- {subject.address}
- </div>
- {/if}
+ {#if subject.address}
+ <div
+ class="text-secondary mx-auto text-center lg:text-left lg:mx-0"
+ class:line-clamp-3={hideBio}
+ on:click={toggleBio}
+ on:keydown={toggleBio}
+ >
+ {subject.address}
+ </div>
+ {/if}
<div class="flex justify-around">
<a href={`/${subject.pubkey}/follows`}
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 798509ed..8ff7ea90 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -98,7 +98,7 @@
>
<div class="mx-auto flex">
<Icon icon="numpad" style="my-auto h-6 mr-2 invert" />
- <div class="my-auto mt-1">Request Payment</div>
+ <div class="my-auto mt-1">{$t('user.requestPayment')}</div>
</div>
</button>
</a>
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.svelte b/src/routes/(app)/[username]/card/[serial]/+page.svelte
index aee3be28..afdaf65d 100644
--- a/src/routes/(app)/[username]/card/[serial]/+page.svelte
+++ b/src/routes/(app)/[username]/card/[serial]/+page.svelte
@@ -6,30 +6,30 @@
</script>
<div class="space-y-5">
-<div class="relative flex justify-center gap-2">
- <h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {serial}</h1>
-</div>
-<div class="flex justify-center">
- <a href={`/send/pot/${serial}`}>
- <button
- class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white justify-center gap-2"
- >
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="invert text-black peer-placeholder-shown:text-gray-300 h-6 w-6 my-auto"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
+ <div class="relative flex justify-center gap-2">
+ <h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {serial}</h1>
+ </div>
+ <div class="flex justify-center">
+ <a href={`/send/pot/${serial}`}>
+ <button
+ class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white justify-center gap-2"
>
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z"
- />
- </svg>
- <div class="my-auto">Add Funds</div>
- </button>
- </a>
-</div>
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ class="invert text-black peer-placeholder-shown:text-gray-300 h-6 w-6 my-auto"
+ fill="none"
+ viewBox="0 0 24 24"
+ stroke="currentColor"
+ >
+ <path
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ stroke-width="2"
+ d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z"
+ />
+ </svg>
+ <div class="my-auto">Add Funds</div>
+ </button>
+ </a>
+ </div>
</div>
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte
index 33bf64c4..b9274434 100644
--- a/src/routes/(app)/[username]/generate/+page.svelte
+++ b/src/routes/(app)/[username]/generate/+page.svelte
@@ -14,10 +14,10 @@
let gen = async () => {
if (!browser) return;
- if (user.pubkey) {
- goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
- return;
- }
+ if (user.pubkey) {
+ goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
+ return;
+ }
if (!$password) $passwordPrompt = true;
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+layout.server.js b/src/routes/(app)/[username]/invoice/[id]/+layout.server.js
index eef24555..4d7fd3b8 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+layout.server.js
+++ b/src/routes/(app)/[username]/invoice/[id]/+layout.server.js
@@ -6,20 +6,26 @@ export async function load({ depends, params, url, parent }) {
depends('app:invoice');
let { user } = await parent();
- let { hash } = params;
- let invoice = await get(`/invoice/${hash}`);
+ let { id } = params;
+ let invoice = await get(`/invoice/${id}`);
+ let options = !!url.searchParams.get('options');
- if (user && invoice.uid !== user.id && !url.pathname.includes('tip') && !url.searchParams.get('options'))
- throw redirect(307, `/send/invoice/${hash}`);
+ if (user && invoice.uid !== user.id && !url.pathname.includes('tip') && !options) {
+ throw redirect(307, `/send/invoice/${id}`);
+ }
let { amount, pending, received } = invoice;
amount = parseInt(amount);
let paid = (!amount && received) || (amount > 0 && (pending >= amount || received >= amount));
- if (paid && !url.pathname.endsWith('paid'))
- throw redirect(307, `/${params.username}/invoice/${hash}/paid`);
+ if (paid && !url.pathname.endsWith('paid')) {
+ throw redirect(
+ 307,
+ `/${params.username}/invoice/${id}/paid` + (options ? '?options=true' : '')
+ );
+ }
let sm = Qr.drawImg(invoice.text || '', { size: 300 });
- return { hash, invoice, sm, lg: sm };
+ return { id, invoice, sm, lg: sm };
}
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+layout.svelte b/src/routes/(app)/[username]/invoice/[id]/+layout.svelte
index 4fa864ce..4fa864ce 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+layout.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+layout.svelte
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+page.server.js b/src/routes/(app)/[username]/invoice/[id]/+page.server.js
index 1068f273..1068f273 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+page.server.js
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.server.js
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
index 508550ba..2d204255 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
@@ -101,12 +101,12 @@
let toggleType = async () => {
invoice.type = invoice.type === types.lightning ? types.bitcoin : types.lightning;
- ({ hash } = await post(`/${username}/invoice`, {
+ ({ id } = await post(`/${username}/invoice`, {
invoice,
user: { username, currency }
}));
- goto(`./${hash}`, { invalidateAll: true });
+ goto(`./${id}`, { invalidateAll: true });
};
</script>
diff --git a/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
index 969fb6c7..84e493d9 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
@@ -5,7 +5,6 @@
import { browser } from '$app/environment';
import { t } from '$lib/translations';
import { fiat, f, s, sat, sats } from '$lib/utils';
- import { goto } from '$app/navigation';
export let data;
let amount, currency, rate, received, pending, tip, user, id;
diff --git a/src/routes/(app)/[username]/invoice/[hash]/tip/+page.server.js b/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js
index 814900fb..814900fb 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/tip/+page.server.js
+++ b/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js
diff --git a/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
index fe6c67be..fe6c67be 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
diff --git a/src/routes/(app)/[username]/map/+page.server.js b/src/routes/(app)/[username]/map/+page.server.js
new file mode 100644
index 00000000..7936e88b
--- /dev/null
+++ b/src/routes/(app)/[username]/map/+page.server.js
@@ -0,0 +1,12 @@
+import { get } from '$lib/utils';
+
+// export const prerender = true;
+export let load = async () => {
+ let data = { locations: [] };
+
+ try {
+ data = await get('/locations');
+ } catch (e) {}
+
+ return data;
+};
diff --git a/src/routes/(app)/[username]/map/+page.svelte b/src/routes/(app)/[username]/map/+page.svelte
new file mode 100644
index 00000000..99c822d3
--- /dev/null
+++ b/src/routes/(app)/[username]/map/+page.svelte
@@ -0,0 +1,8 @@
+<script>
+ import { LocationsMap } from '$comp';
+ export let data;
+
+ let { locations } = data;
+</script>
+
+<LocationsMap {locations} />
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.server.js b/src/routes/(app)/[username]/payments/[...page]/+page.server.js
index cb94d71d..a3b0ad6f 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.server.js
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.server.js
@@ -2,7 +2,9 @@ import { get, auth } from '$lib/utils';
let limit = 25;
-export async function load({ cookies, params, request }) {
+export async function load({ cookies, depends, params, request }) {
+ depends('app:payments');
+
let parts = params.page.split('/');
let start, end, page;
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
index 69f51f37..2ea225ad 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
@@ -2,7 +2,7 @@
import { Avatar, Icon } from '$comp';
import { onMount } from 'svelte';
import { format } from 'date-fns';
- import { newPayment, payments } from '$lib/store';
+ import { newPayment } from '$lib/store';
import { t } from '$lib/translations';
import { get, f, s, sat, sats, types } from '$lib/utils';
import { page } from '$app/stores';
@@ -11,7 +11,7 @@
export let data;
- let { start, end, user, rates } = data;
+ let { start, end, user, rates, payments } = data;
let change = ({ target: { value } }) => goto(value);
let link = (p) => {
@@ -34,7 +34,7 @@
let p,
totals,
pages = [];
- $: data && ({ page: p, pages, start, end, totals, payments: $payments } = data);
+ $: data && ({ page: p, pages, start, end, totals, payments } = data);
$: $page && ($newPayment = false);
$: $newPayment && invalidate(`/users/${user.username}`);
@@ -136,7 +136,7 @@
</div>
<div class="text-base">
- {#each $payments as p}
+ {#each payments as p}
<a href={`/payment/${p.id}`}>
<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
<div class="whitespace-nowrap my-auto">
@@ -216,7 +216,7 @@
</div>
<div class="grid grid-cols-3 w-full text-center">
- <span class="text-lg text-secondary">{$t('payments.total')}</span>
+ <span class="text-lg text-secondary">{$t('payments.total')}</span>
<span class="text-lg text-secondary">{$t('payments.presentValue')}</span>
<span class="text-lg text-secondary">{$t('payments.gainLoss')}</span>
@@ -226,7 +226,9 @@
{@const gain = (pv * 100) / total - 100}
<span class="text-lg"><b>{f(total, c)}</b></span>
<span class="text-lg"><b>{f(pv, c)}</b></span>
- <span class="text-lg" class:text-red-800={gain < 0}><b>{Math.abs(gain).toFixed(2)}%</b></span>
+ <span class="text-lg" class:text-red-800={gain < 0}
+ ><b>{Math.abs(gain).toFixed(2)}%</b></span
+ >
{/each}
</div>
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
index a97dc776..d7001079 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
@@ -5,7 +5,6 @@
import { page } from '$app/stores';
import { requestRedirect } from '$lib/store';
import { browser } from '$app/environment';
- import { goto } from '$app/navigation';
export let data;
let type = 'lightning';
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index 842c2eba..762e836e 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -138,7 +138,9 @@
<div class="font-bold flex justify-around items-center border-b pb-3 text-secondary">
{#each tabs.filter((t) => t.name !== 'shopify') as { name, key }}
<a href={`/${user.username}/settings/${name}`}>
- <button class="hover:opacity-80" class:text-black={tab === name || (tab === "shopify" && name === "pos")}
+ <button
+ class="hover:opacity-80"
+ class:text-black={tab === name || (tab === 'shopify' && name === 'pos')}
>{$t(`user.settings.${key}`)}</button
>
</a>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
index 34399ad5..47c4c4c6 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
@@ -64,28 +64,32 @@
$: url = `${$page.url.host}/${user.username}`;
$: full = `${$page.url.protocol}//${url}`;
- $: addr = `${user.username}@${$page.url.host}`;
+ $: addr = `${user.username}@${$page.url.host}`;
</script>
<div>
<label for="username" class="font-bold mb-1 block">{$t('user.settings.username')}</label>
<div class="flex mb-2">
- <input
- type="text"
- name="username"
- bind:value={user.username}
- class="border-r-0 rounded-r-none w-auto min-w-0 pr-1 grow"
- />
- <div class="text-gray-600 p-4 my-auto bg-gray-100 border border-r-0 pl-1">@{$page.url.host}</div>
- <div class="text-gray-600 border-l-0 bg-gray-100 rounded-r-2xl p-4 my-auto border w-16" >
- <a href={`/qr/${encodeURIComponent(addr)}`}>
- <Icon icon="qr" style="invert" />
- </a>
+ <input
+ type="text"
+ name="username"
+ bind:value={user.username}
+ class="border-r-0 rounded-r-none w-auto min-w-0 pr-1 grow"
+ />
+ <div class="text-gray-600 p-4 my-auto bg-gray-100 border border-r-0 pl-1">
+ @{$page.url.host}
+ </div>
+ <div class="text-gray-600 border-l-0 bg-gray-100 rounded-r-2xl p-4 my-auto border w-16">
+ <a href={`/qr/${encodeURIComponent(addr)}`}>
+ <Icon icon="qr" style="invert" />
+ </a>
</div>
</div>
<div class="flex mb-2">
- <div class="text-gray-600 rounded-l-2xl p-4 my-auto border bg-gray-100 pr-1">{$page.url.host}/</div>
+ <div class="text-gray-600 rounded-l-2xl p-4 my-auto border bg-gray-100 pr-1">
+ {$page.url.host}/
+ </div>
<input
type="text"
name="username"
@@ -93,9 +97,9 @@
class="grow border-l-0 rounded-l-none border-r-0 rounded-r-none w-auto pl-1 min-w-0"
/>
<div class="text-gray-600 rounded-r-2xl p-4 my-auto border bg-gray-100 w-16">
- <a href={`/qr/${encodeURIComponent(full)}`}>
- <Icon icon="qr" style="invert" />
- </a>
+ <a href={`/qr/${encodeURIComponent(full)}`}>
+ <Icon icon="qr" style="invert" />
+ </a>
</div>
</div>
</div>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index ef5b7869..057d8c20 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -33,7 +33,9 @@
</div>
<a href="./shopify">
- <button class="flex rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full gap-2 my-5 justify-center">
+ <button
+ class="flex rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full gap-2 my-5 justify-center"
+ >
<img src="/icons/shopify.svg" class="w-8" />
<div class="my-auto">Shopify Integration</div>
</button>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index 40947bda..c01db734 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -52,10 +52,12 @@
return true;
};
+ let disablingPin = false;
+
let togglePin = async () => {
if (user.haspin) {
try {
- pin = null;
+ disablingPin = true;
await tick();
submit.click();
} catch (e) {
@@ -120,7 +122,7 @@
};
</script>
-<input type="hidden" name="newpin" value={pin} />
+<input type="hidden" name="newpin" value={disablingPin ? 'delete' : pin} />
<input type="hidden" name="confirm" bind:value={password} />
<div class="relative mb-5">
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
index 7b9cc40b..aeecc4d7 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
@@ -4,15 +4,23 @@
import { page } from '$app/stores';
export let user;
- $: paymentsUrl = user.shopifyStore && "https://admin.shopify.com/store/" + user.shopifyStore + "/settings/payments";
- $: checkoutUrl = user.shopifyStore && "https://admin.shopify.com/store/" + user.shopifyStore + "/settings/checkout";
- $: appsUrl = user.shopifyStore && "https://admin.shopify.com/store/" + user.shopifyStore + "/settings/apps/development";
+ $: paymentsUrl =
+ user.shopifyStore &&
+ 'https://admin.shopify.com/store/' + user.shopifyStore + '/settings/payments';
+ $: checkoutUrl =
+ user.shopifyStore &&
+ 'https://admin.shopify.com/store/' + user.shopifyStore + '/settings/checkout';
+ $: appsUrl =
+ user.shopifyStore &&
+ 'https://admin.shopify.com/store/' + user.shopifyStore + '/settings/apps/development';
</script>
<div>
<label for="shopifyStore" class="font-bold mb-1 block">Store ID</label>
<div class="flex mb-2">
- <div class="text-gray-600 p-4 my-auto bg-gray-100 border rounded-l-2xl border-r-0 pr-1">admin.shopify.com/store/</div>
+ <div class="text-gray-600 p-4 my-auto bg-gray-100 border rounded-l-2xl border-r-0 pr-1">
+ admin.shopify.com/store/
+ </div>
<input
type="text"
name="shopifyStore"
@@ -21,34 +29,41 @@
/>
</div>
<p class="text-secondary my-2">
- Add Bitcoin under <a class:active={!!paymentsUrl} href={paymentsUrl || undefined}>Payments > Manual payment methods</a> with a description like "Pay with Bitcoin".
+ Add Bitcoin under <a class:active={!!paymentsUrl} href={paymentsUrl || undefined}
+ >Payments > Manual payment methods</a
+ > with a description like "Pay with Bitcoin".
</p>
</div>
<div>
- <label for="shopifyToken" class="font-bold mb-1 block">Admin API token</label>
- <input type="text" name="shopifyToken" bind:value={user.shopifyToken} />
-
-<p class="text-secondary my-2">
-Create an app named Coinos under <a class:active={!!appsUrl} href={appsUrl || undefined}>Apps > App Development</a>
-</p>
-
-<p class="text-secondary my-2">
-Edit the Admin API scopes to enable <code class="text-black">write_orders</code> then
-install the app into your store and copy the Admin API access token here.
+ <label for="display" class="font-bold mb-1 block">Additional scripts</label>
+ <p class="text-secondary my-2">
+ Copy this into <a class:active={!!paymentsUrl} href={checkoutUrl}
+ >Checkout -> Additional scripts</a
+ >
+ </p>
+ <textarea rows={5} type="text" name="shopifyScripts" readonly><script src="{`${$page.url.protocol}//${$page.url.host}/${user.username}/shopify.js`}"> </script></textarea>
</div>
<div>
- <label for="display" class="font-bold mb-1 block">Additional scripts</label>
- <textarea rows={5} type="text" name="shopifyScripts" readonly><script src="{`${$page.url.protocol}//${$page.url.host}/${user.username}/shopify.js`}"> </script></textarea>
+ <label for="shopifyToken" class="font-bold mb-1 block">Admin API token <span class="font-normal">(Optional)</span></label>
+ <p class="text-secondary my-2">Coinos can automatically mark orders as Paid if you provide an API token.
+ <input class="my-4" type="text" name="shopifyToken" bind:value={user.shopifyToken} />
+
+ <p class="text-secondary my-2">
+ Create a new app in <a class:active={!!appsUrl} href={appsUrl || undefined}
+ >Apps > App Development</a
+ >
+ </p>
<p class="text-secondary my-2">
- Copy this into <a class:active={!!paymentsUrl} href={checkoutUrl}>Checkout -> Additional scripts</a>
+ Edit the Admin API scopes to enable <code class="text-black">write_orders</code> permission then install the
+ app into your store and copy the Admin API access token here.
</p>
</div>
<style>
- .active {
- @apply text-blue-500;
- }
+ .active {
+ @apply text-blue-500;
+ }
</style>
diff --git a/src/routes/(app)/[username]/shopify.js/+server.js b/src/routes/(app)/[username]/shopify.js/+server.js
index 963b92a1..7b5c9d41 100644
--- a/src/routes/(app)/[username]/shopify.js/+server.js
+++ b/src/routes/(app)/[username]/shopify.js/+server.js
@@ -46,8 +46,6 @@ window.addEventListener('load', async () => {
let s = (s) => new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format(s);
- let base64 = drawImg('test', { size: 300 });
-
let link = document.createElement('link');
link.setAttribute('rel', 'stylesheet');
link.setAttribute('type', 'text/css');
@@ -92,6 +90,8 @@ window.addEventListener('load', async () => {
})
.catch(console.log);
+ let base64 = drawImg(data.hash, { size: 300 });
+
main.innerHTML = \`<a href="lightning:\${data.hash}">
<div style="display: flex; margin-top: 50px; margin-bottom: 80px; position: relative;">
<img id="qrcode" src="\${base64}" />
diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte
index dce523cb..84ecc3ad 100644
--- a/src/routes/(app)/login/+page.svelte
+++ b/src/routes/(app)/login/+page.svelte
@@ -4,7 +4,7 @@
import { animatedRate, pin } from '$lib/store';
onMount(() => {
- $animatedRate = 0;
+ $animatedRate = 0;
$pin = undefined;
localStorage.clear();
sessionStorage.clear();
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 5037eec2..12bb1c2d 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -45,10 +45,10 @@
{#if p.type === types.pot}
<div>
<span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
- <a href={`/pot/${p.memo}`}>
+ <a href={`/pot/${p.memo}`}>
<div class="flex">
<div class="my-auto">
- <img src="/images/moneypot.png" class="w-12" alt="Pot" />
+ <img src="/images/moneypot.png" class="w-12" alt="Pot" />
</div>
<div class="my-auto ml-1">{p.memo}</div>
</div>
@@ -126,7 +126,7 @@
</div>
{/if}
- {#if ['laughingbean', 'burnabyartigiano', 'milanowestend', 'eotl', 'bigbite', 'edgemontartigiano'].includes(user.username.toLowerCase()) }
+ {#if ['laughingbean', 'burnabyartigiano', 'milanowestend', 'eotl', 'bigbite', 'edgemontartigiano'].includes(user.username.toLowerCase())}
<button
class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px] bg-black text-white"
on:click={print}>Print Receipt</button
diff --git a/src/routes/(app)/pot/[name]/+page.svelte b/src/routes/(app)/pot/[name]/+page.svelte
index 31e439d3..ea1e45f2 100644
--- a/src/routes/(app)/pot/[name]/+page.svelte
+++ b/src/routes/(app)/pot/[name]/+page.svelte
@@ -30,14 +30,14 @@
<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
<div class="relative flex justify-center gap-2">
<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
- {#if name.split('-').length === 4}
- <h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {name}</h1>
+ {#if name.split('-').length === 4}
+ <h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {name}</h1>
{:else}
<img src="/images/moneypot.jpg" class="w-24" alt="Pot" />
- <div class="my-auto">
- <h1 class="text-2xl font-semibold my-auto">{$t('payments.moneyPot')}</h1>
- <h1 class="text-secondary my-auto">{name}</h1>
- </div>
+ <div class="my-auto">
+ <h1 class="text-2xl font-semibold my-auto">{$t('payments.moneyPot')}</h1>
+ <h1 class="text-secondary my-auto">{name}</h1>
+ </div>
{/if}
</div>
{#if show}
@@ -60,7 +60,7 @@
class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
>
<Icon icon="plus" />
- {$t('payments.addFunds')}
+ {$t('payments.addFunds')}
</button>
</a>
</div>
@@ -70,7 +70,7 @@
class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
>
<Icon icon="minus" style="rotate-180" />
- {$t('payments.takeFunds')}
+ {$t('payments.takeFunds')}
</button>
</a>
</div>
@@ -85,10 +85,10 @@
</button>
<button
class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
- on:click={() => copy($page.url.host + $page.url.pathname)}
+ on:click={() => copy($page.url.host + $page.url.pathname)}
>
<Icon icon="copy" style="w-6" />
- {$t('payments.copyLink')}
+ {$t('payments.copyLink')}
</button>
</div>
<div class="text-base">
diff --git a/src/routes/(app)/pot/[name]/sweep/+page.svelte b/src/routes/(app)/pot/[name]/sweep/+page.svelte
index 17d707cc..9b473af3 100644
--- a/src/routes/(app)/pot/[name]/sweep/+page.svelte
+++ b/src/routes/(app)/pot/[name]/sweep/+page.svelte
@@ -4,14 +4,13 @@
import { Icon } from '$comp';
import { t } from '$lib/translations';
- export let data;
+ export let data;
- let { amount, name, user, rates } = data;
- let { currency } = user;
- $: rate = rates[currency];
+ let { amount, name, user, rates } = data;
+ let { currency } = user;
+ $: rate = rates[currency];
</script>
-
<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
<div class="w-full flex">
<a href="/" class="mx-auto">
@@ -19,17 +18,17 @@
</a>
</div>
- <div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
- <Icon icon="check" style="mx-auto" />
- </div>
- <h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
- <h2 class="text-2xl md:text-3xl font-semibold">
- {f(fiat(amount, rate), currency)}
- </h2>
- <h3 class="text-secondary md:text-lg mb-6 mt-1">
- ⚡️{s(amount)}
- </h3>
- </div>
+ <div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
+ <Icon icon="check" style="mx-auto" />
+ </div>
+ <h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
+ <h2 class="text-2xl md:text-3xl font-semibold">
+ {f(fiat(amount, rate), currency)}
+ </h2>
+ <h3 class="text-secondary md:text-lg mb-6 mt-1">
+ ⚡️{s(amount)}
+ </h3>
+</div>
<a href={`/${user.username}/payments`}>
<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
diff --git a/src/routes/(app)/pot/[name]/withdraw/+page.svelte b/src/routes/(app)/pot/[name]/withdraw/+page.svelte
index da564709..7be643a9 100644
--- a/src/routes/(app)/pot/[name]/withdraw/+page.svelte
+++ b/src/routes/(app)/pot/[name]/withdraw/+page.svelte
@@ -9,7 +9,7 @@
export let data;
export let form;
- let { rates } = data;
+ let { rates } = data;
let { amount, name } = $page.params;
let { currency } = data.user;
let loading;
@@ -35,7 +35,7 @@
{/if}
<div class="container px-4 mt-20 max-w-xl mx-auto">
- <Numpad bind:amount bind:currency bind:rate {submit} />
+ <Numpad bind:amount bind:currency bind:rate {submit} />
<form method="POST" use:enhance on:submit={submit}>
<input name="name" value={name} type="hidden" />
diff --git a/src/routes/(app)/qr/[text]/+page.svelte b/src/routes/(app)/qr/[text]/+page.svelte
index d903da0e..9e56ab29 100644
--- a/src/routes/(app)/qr/[text]/+page.svelte
+++ b/src/routes/(app)/qr/[text]/+page.svelte
@@ -7,5 +7,5 @@
<Qr {src} />
<div class="text-center w-full font-bold">
- {text}
+ {text}
</div>
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index 554eef6f..a558895c 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -28,12 +28,13 @@
let submit = () => (loading = true);
let external = async () => {
- let invoice = { type: 'lightning', amount };
- let { hash } = await post(`/${recipient.username}/invoice`, {
- invoice
+ let invoice = { type: 'lightning', amount, currency };
+ let { id } = await post(`/${recipient.username}/invoice`, {
+ invoice,
+ user: { username: recipient.username }
});
- goto(`/${recipient.username}/invoice/${hash}`, { invalidateAll: true });
+ goto(`/${recipient.username}/invoice/${id}?options=true`, { invalidateAll: true });
};
$: rate = data.rate * (rates[user.currency] / rates[data.currency]);
@@ -139,7 +140,7 @@
{/if}
</div>
</form>
- <div class="flex my-20">
- <button class="mx-auto" on:click={external}>{$t('payments.moreOptions')}</button>
- </div>
+ <div class="flex my-20">
+ <button class="mx-auto" on:click={external}>{$t('payments.moreOptions')}</button>
+ </div>
</div>