diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/routes/(app)/[username]/dashboard/+page.server.js | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/dashboard/+page.svelte | 53 | ||||
| -rw-r--r-- | src/routes/(app)/send/[...text]/+page.svelte | 36 |
3 files changed, 41 insertions, 50 deletions
diff --git a/src/routes/(app)/[username]/dashboard/+page.server.js b/src/routes/(app)/[username]/dashboard/+page.server.js index f73c8209..f7e276a0 100644 --- a/src/routes/(app)/[username]/dashboard/+page.server.js +++ b/src/routes/(app)/[username]/dashboard/+page.server.js @@ -1,6 +1,6 @@ import { auth, get } from '$lib/utils'; -export async function load({ cookies, depends}) { +export async function load({ cookies, depends }) { depends('app:invoice'); return get('/requests', auth(cookies)); } diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte index e18b55bb..e9a96243 100644 --- a/src/routes/(app)/[username]/dashboard/+page.svelte +++ b/src/routes/(app)/[username]/dashboard/+page.svelte @@ -93,38 +93,39 @@ <div> {#each invoices as { request_id, amount, currency, rate, user: recipient, requester, uuid }} - <a href={`/invoice/${uuid}/tip`} class:pointer-events-none={user.username === recipient.username}> - <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> + {@const requested = user.username === requester.username} + <a href={`/invoice/${uuid}` + (requested ? '/tip' : '')}> + <div class="border-b p-2 last:border-b-0 hover:bg-gray-100"> + <div class="flex gap-2"> + <div> + {#if requested} + <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> - {: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> + {: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> </div> - </div> - {/if} - </div> - <div class="whitespace-nowrap my-auto ml-auto flex gap-2"> - <div class="font-bold"> - {f(amount * (rate / sats), currency)} + {/if} </div> + <div class="whitespace-nowrap my-auto ml-auto flex gap-2"> + <div class="font-bold"> + {f(amount * (rate / sats), currency)} + </div> - <div class="text-secondary">{sat(amount)}</div> + <div class="text-secondary">{sat(amount)}</div> + </div> </div> </div> - </div> - </a> + </a> {/each} </div> diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte index 7232b307..b2d3d764 100644 --- a/src/routes/(app)/send/[...text]/+page.svelte +++ b/src/routes/(app)/send/[...text]/+page.svelte @@ -88,33 +88,23 @@ <h1 class="px-3 md:px-0 text-xl font-semibold mt-10">Contacts</h1> <div> {#each contacts as c} - <div class="border-b p-2 last:border-b-0 hover:bg-gray-100"> - <div class="flex"> - <div> - <div class="flex"> - <Avatar user={c} size={20} disabled={true} /> - <div class="my-auto text-left"> - <p class="ml-1 text-lg break-words">{c.username}</p> - <p class="ml-1 text-secondary"> - {format(parseISO(c.last), 'MMM d')} - </p> + <a href={`/send/user/${c.username}`}> + <div class="border-b p-2 last:border-b-0 hover:bg-gray-100"> + <div class="flex"> + <div> + <div class="flex"> + <Avatar user={c} size={20} /> + <div class="my-auto text-left"> + <p class="ml-1 text-lg break-words">{c.username}</p> + <p class="ml-1 text-secondary"> + {format(parseISO(c.last), 'MMM d')} + </p> + </div> </div> </div> </div> - <div class="flex ml-auto my-auto gap-2"> - <a href={`/${c.username}/request`}> - <div class="my-auto p-2 border rounded-xl bg-white opacity-50 hover:opacity-100"> - <Icon icon="support" style="w-8" /> - </div> - </a> - <a href={`/${c.username}/receive`}> - <div class="my-auto p-2 border rounded-xl bg-white opacity-50 hover:opacity-100"> - <Icon icon="send" style="w-8" /> - </div> - </a> - </div> </div> - </div> + </a> {/each} </div> </div> |