From 7782f0c277db0b35c7d724d7b0807fa6cb0a2e35 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 12 Nov 2022 23:17:10 -0800 Subject: team mobile styles --- src/app.css | 3 +- src/components/About.svelte | 50 ++++++------ src/lib/invoice.js | 2 +- src/routes/(app)/[username]/dashboard/+page.svelte | 92 +++++++++++----------- src/routes/(app)/invoice/[id]/tip/+page.svelte | 4 +- src/routes/(app)/send/[...text]/+page.server.js | 2 +- src/routes/(app)/send/[...text]/+page.svelte | 2 +- src/routes/(app)/support/+page.svelte | 8 +- 8 files changed, 82 insertions(+), 81 deletions(-) (limited to 'src') diff --git a/src/app.css b/src/app.css index 1689e207..12fad732 100644 --- a/src/app.css +++ b/src/app.css @@ -20,7 +20,8 @@ html { background-color: white; } -input, textarea { +input, +textarea { @apply block border rounded-2xl px-5 py-4 w-full; } diff --git a/src/components/About.svelte b/src/components/About.svelte index 4e3b7d25..317c190e 100644 --- a/src/components/About.svelte +++ b/src/components/About.svelte @@ -49,33 +49,35 @@
{#each team as member} -
-
- +
+
+
+ -
- {$t(`about.team.${member.name}.name`)} - {$t(`about.team.${member.name}.position`)} -
- -
- {#each member.socials as social} - + {$t(`about.team.${member.name}.name`)} + {$t(`about.team.${member.name}.position`)} - {/each} +
+ +
+ {#each member.socials as social} + + {/each} +
+
+
+ {$t(`about.team.${member.name}.bio`)}
-
-
- {$t(`about.team.${member.name}.bio`)}
{/each} diff --git a/src/lib/invoice.js b/src/lib/invoice.js index 3f4504f2..657da735 100644 --- a/src/lib/invoice.js +++ b/src/lib/invoice.js @@ -22,7 +22,7 @@ export default async ({ cookies, request, url }) => { let { uuid } = await post('/invoice', { invoice, user }, auth(cookies)); if (request_id) { - console.log("HERE", request_id) + console.log('HERE', request_id); if (url.pathname.endsWith('tip')) throw redirect(307, `/send/${uuid}`); throw redirect(307, `/${user.username}/request/${request_id}`); } diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte index 1672c439..7acae7bd 100644 --- a/src/routes/(app)/[username]/dashboard/+page.svelte +++ b/src/routes/(app)/[username]/dashboard/+page.svelte @@ -91,50 +91,30 @@
-
- {#each invoices as { request_id, amount, currency, rate, user: recipient, requester, uuid }} -
-
-
- {#if user.username === requester.username} -
- -
-

Invoice from

-

{recipient.username}

-
-
- {:else} -
- -
-

You invoiced

-

{requester.username}

+
+ {#each invoices as { request_id, amount, currency, rate, user: recipient, requester, uuid }} +
+
+
+ {#if user.username === requester.username} +
+ +
+

Invoice from

+

{recipient.username}

+
-
- {/if} -
-
-
-
- {#if user.username === requester.username} - -
- -
-
- {/if} -
- -
- + {:else} +
+ +
+

You invoiced

+

{requester.username}

- -
+
+ {/if}
-
+
{f(amount * (rate / sats), currency)}
@@ -142,10 +122,34 @@
{sat(amount)}
+
+
+ {#if user.username === requester.username} + +
+
+ +
Pay
+
+
+
+ {/if} +
+ +
+ +
+
+
+
-
- {/each} -
+ {/each} +
{#each requests as { id, invoice, memo, requester: r }} diff --git a/src/routes/(app)/invoice/[id]/tip/+page.svelte b/src/routes/(app)/invoice/[id]/tip/+page.svelte index 34393827..625248a0 100644 --- a/src/routes/(app)/invoice/[id]/tip/+page.svelte +++ b/src/routes/(app)/invoice/[id]/tip/+page.svelte @@ -1,5 +1,5 @@