diff options
| author | Adam Soltys <[email protected]> | 2022-11-12 23:17:10 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-11-12 23:17:10 -0800 |
| commit | 7782f0c277db0b35c7d724d7b0807fa6cb0a2e35 (patch) | |
| tree | c64febe3fb537bd796d4a76d0f5cb016e650e799 /src/routes/(app) | |
| parent | 3df97cfcedac087ee0c719bfbda938f68e8996f4 (diff) | |
| download | coinos-ui-7782f0c277db0b35c7d724d7b0807fa6cb0a2e35.tar.gz coinos-ui-7782f0c277db0b35c7d724d7b0807fa6cb0a2e35.zip | |
team mobile styles
Diffstat (limited to 'src/routes/(app)')
| -rw-r--r-- | src/routes/(app)/[username]/dashboard/+page.svelte | 92 | ||||
| -rw-r--r-- | src/routes/(app)/invoice/[id]/tip/+page.svelte | 4 | ||||
| -rw-r--r-- | src/routes/(app)/send/[...text]/+page.server.js | 2 | ||||
| -rw-r--r-- | src/routes/(app)/send/[...text]/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/support/+page.svelte | 8 |
5 files changed, 53 insertions, 55 deletions
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 @@ </a> </div> - <div> - {#each invoices as { request_id, amount, currency, rate, user: recipient, requester, uuid }} - <div class="border-b p-2 last:border-b-0 hover:bg-gray-100"> - <div class="flex gap-2"> - <div> - {#if user.username === requester.username} - <div class="flex"> - <Avatar user={recipient} size={20} /> - <div class="my-auto text-left"> - <p class="text-secondary">Invoice from</p> - <p class="ml-1 text-lg break-words">{recipient.username}</p> - </div> - </div> - {:else} - <div class="flex"> - <Avatar user={requester} size={20} /> - <div class="my-auto text-left"> - <p class="text-secondary">You invoiced</p> - <p class="ml-1 text-lg break-words">{requester.username}</p> + <div> + {#each invoices as { request_id, amount, currency, rate, user: recipient, requester, uuid }} + <div class="border-b p-2 last:border-b-0 hover:bg-gray-100"> + <div class="flex gap-2"> + <div> + {#if user.username === requester.username} + <div class="flex"> + <Avatar user={recipient} size={20} /> + <div class="my-auto text-left"> + <p class="text-secondary">Invoice from</p> + <p class="ml-1 text-lg break-words">{recipient.username}</p> + </div> </div> - </div> - {/if} - </div> - <div class="ml-auto space-y-2"> - <div class="w-full flex"> - <div class="flex ml-auto my-auto gap-2"> - {#if user.username === requester.username} - <a href={`/invoice/${uuid}/tip`}> - <div class="p-2 border rounded-xl bg-white flex"> - <Icon icon="send" style="w-6 opacity-50 hover:opacity-100" /> - </div> - </a> - {/if} - <form action={`/${user.username}/request?/delete`} method="POST" use:enhance> - <input type="hidden" name="request_id" value={request_id} /> - <div class="p-2 border rounded-xl bg-white flex"> - <button type="submit"> - <Icon icon="close" style="w-6 opacity-50 hover:opacity-100" /> - </button> + {:else} + <div class="flex"> + <Avatar user={requester} size={20} /> + <div class="my-auto text-left"> + <p class="text-secondary">You invoiced</p> + <p class="ml-1 text-lg break-words">{requester.username}</p> </div> - </form> - </div> + </div> + {/if} </div> - <div class="whitespace-nowrap my-auto mx-auto flex gap-2"> + <div class="whitespace-nowrap my-auto ml-auto flex gap-2"> <div class="font-bold"> {f(amount * (rate / sats), currency)} </div> @@ -142,10 +122,34 @@ <div class="text-secondary">{sat(amount)}</div> </div> </div> + <div class="w-full flex"> + <div class="flex mx-auto my-auto gap-2"> + {#if user.username === requester.username} + <a href={`/invoice/${uuid}/tip`}> + <div class="p-2 border rounded-full"> + <div class="flex"> + <Icon icon="send" style="w-6" /> + <div>Pay</div> + </div> + </div> + </a> + {/if} + <form action={`/${user.username}/request?/delete`} method="POST" use:enhance> + <input type="hidden" name="request_id" value={request_id} /> + <div class="p-2 border rounded-full bg-white flex"> + <button type="submit"> + <div class="flex"> + <Icon icon="close" style="w-6" /> + <div>Dismiss</div> + </div> + </button> + </div> + </form> + </div> + </div> </div> - </div> - {/each} - </div> + {/each} + </div> <div> {#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 @@ <script> - import { onMount } from "svelte"; + import { onMount } from 'svelte'; import { browser } from '$app/environment'; import { invoice as inv, invoices, request } from '$lib/store'; import { back, copy, f, sat, get, reverseFormat, s, sats } from '$lib/utils'; @@ -114,7 +114,7 @@ $: invoiceAmountFiatFormatted = f(amountFiat, currency); - onMount(() => ($request = undefined)); + onMount(() => ($request = undefined)); </script> <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}> diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js index 2a93186d..a99e9c59 100644 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ b/src/routes/(app)/send/[...text]/+page.server.js @@ -25,7 +25,7 @@ let parse = async (t, host) => { } } - if (t.includes("/voucher")) throw redirect(307, t.substring(t.indexOf('/voucher'))); + if (t.includes('/voucher')) throw redirect(307, t.substring(t.indexOf('/voucher'))); if (t.toLowerCase().startsWith('lnurl')) throw redirect(307, `/ln/${t}`); if (t.includes(':')) t = t.split(':')[1]; diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte index d63b09ec..7232b307 100644 --- a/src/routes/(app)/send/[...text]/+page.svelte +++ b/src/routes/(app)/send/[...text]/+page.svelte @@ -11,7 +11,7 @@ export let data; export let form; - data.subject = data.user; + data.subject = data.user; let { contacts } = data; let w; diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte index 996788b7..0d2c2e5b 100644 --- a/src/routes/(app)/support/+page.svelte +++ b/src/routes/(app)/support/+page.svelte @@ -61,13 +61,7 @@ <div class="mb-4"> <label for="email" class="font-semibold">{$t('user.support.email')}</label> - <input - class="bg-primary" - type="email" - name="email" - bind:value={email} - required - /> + <input class="bg-primary" type="email" name="email" bind:value={email} required /> </div> <div class="mb-4"> |
