aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2023-02-27 19:28:59 -0800
committerAdam Soltys <[email protected]>2023-02-27 19:28:59 -0800
commit301770cb05331c8cbb32f60b11c62a79c9d28df3 (patch)
treeacd4126b1f0d2e893719468135fbf439e916c4bb
parent34bc1c031378f8333819f2b46fb74f46634fb639 (diff)
downloadcoinos-ui-301770cb05331c8cbb32f60b11c62a79c9d28df3.tar.gz
coinos-ui-301770cb05331c8cbb32f60b11c62a79c9d28df3.zip
prettier
-rw-r--r--src/components/AppHeader.svelte1
-rw-r--r--src/components/LandingHeader.svelte26
-rw-r--r--src/routes/(app)/[username]/invoice/[hash]/+page.svelte36
-rw-r--r--src/routes/(app)/payment/[id]/+page.svelte37
-rw-r--r--src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte10
-rw-r--r--src/routes/(app)/sent/+page.svelte2
6 files changed, 52 insertions, 60 deletions
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 74afd7b9..51c70851 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -15,7 +15,6 @@
let menuButtons;
if (user)
menuButtons = [
- { key: 'nav.profile', icon: 'profile', href: `/${user.username}` },
{ key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` },
{ key: 'nav.support', icon: 'support', href: `/support` },
{ key: 'nav.signOut', icon: 'logout', href: `/logout` }
diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte
index f9db5ea0..ed7907c1 100644
--- a/src/components/LandingHeader.svelte
+++ b/src/components/LandingHeader.svelte
@@ -40,29 +40,29 @@
<button class="hover:opacity-80" on:click={() => scroll(about)}>{$t('about.header')}</button
>
{/if}
- {#if !user}
+ {#if user}
<button
- class="border rounded-full px-6 py-2 font-bold hover:opacity-80"
- on:click={() => goto('/register')}
- >{$t('nav.startInSeconds')}
+ class="border rounded-full px-6 py-2 font-bold"
+ on:click={() => goto(`/${user.username}`)}
+ >Home
</button>
<button
- class="bg-black text-white border rounded-full px-6 py-2 font-bold hover:opacity-80"
- on:click={() => goto('/login')}
+ class="bg-black text-white border rounded-full px-6 py-2 font-bold"
+ on:click={() => goto('/logout')}
>
- {$t('nav.signIn')}
+ {$t('nav.signOut')}
</button>
{:else}
<button
- class="border rounded-full px-6 py-2 font-bold"
- on:click={() => goto(`/${user.username}`)}
- >{$t('nav.account')}
+ class="border rounded-full px-6 py-2 font-bold hover:opacity-80"
+ on:click={() => goto('/register')}
+ >{$t('nav.startInSeconds')}
</button>
<button
- class="bg-black text-white border rounded-full px-6 py-2 font-bold"
- on:click={() => goto('/logout')}
+ class="bg-black text-white border rounded-full px-6 py-2 font-bold hover:opacity-80"
+ on:click={() => goto('/login')}
>
- {$t('nav.signOut')}
+ {$t('nav.signIn')}
</button>
{/if}
</div>
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
index 2ff92687..fff2b22c 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
@@ -7,7 +7,6 @@
import { last } from '$lib/store';
import { Avatar, Icon, Heart, Image } from '$comp';
import { t } from '$lib/translations';
- import screenfull from 'screenfull';
import { goto, invalidate } from '$app/navigation';
export let data;
@@ -67,14 +66,6 @@
$: link = type === 'bitcoin' ? text : `lightning:${text}`;
$: txt = type === 'bitcoin' ? hash : text;
- let full;
- let toggle = () => {
- screenfull.toggle(qr);
- full = !full;
- if (full) src = lg;
- else src = sm;
- };
-
let toggleType = async () => {
invoice.type = invoice.type === types.lightning ? types.bitcoin : types.lightning;
({ hash } = await post(`/${username}/invoice`, {
@@ -111,21 +102,18 @@
<div class="my-auto">Bitcoin</div>
</button>
</div>
- <div class="relative flex">
- <div class="flex mx-auto w-[360px] h-[360px]">
- <img
- {src}
- class:p-4={full}
- class="w-[300px] h-[300px] mx-auto z-10 mt-[20px]"
- bind:this={qr}
- on:click={toggle}
- on:keydown={toggle}
- alt={txt}
- />
- </div>
- <div
- class="absolute m-auto left-0 right-0 w-[340px] h-[340px] rounded-full bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] z-0"
- />
+
+ <div>
+ <a href={invoice.type === 'bitcoin' ? invoice.text : 'lightning:' + invoice.text}>
+ <div class="relative flex">
+ <div class="flex mx-auto w-[360px] h-[360px]">
+ <img {src} class="w-[300px] h-[300px] mx-auto z-10 mt-[20px]" bind:this={qr} alt={txt} />
+ </div>
+ <div
+ class="absolute m-auto left-0 right-0 w-[340px] h-[340px] rounded-full bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] z-0"
+ />
+ </div>
+ </a>
</div>
{#if amount > 0}
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index b8a23605..2e170a43 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -26,14 +26,14 @@
{#if p.with}
<div>
<span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
- <a href={`/${p.with.username}`}>
- <div class="flex">
- <div class="my-auto">
- <Avatar user={p.with} size={20} />
+ <a href={`/${p.with.username}`}>
+ <div class="flex">
+ <div class="my-auto">
+ <Avatar user={p.with} size={20} />
+ </div>
+ <div class="my-auto ml-1">{p.with.username}</div>
</div>
- <div class="my-auto ml-1">{p.with.username}</div>
- </div>
- </a>
+ </a>
</div>
{/if}
@@ -42,18 +42,19 @@
<div>
{f(fiat(a, rate), currency)}
{#if tip}
- <span class="text-lg">
- + {f(fiat(tip, rate), currency)}
- </span>
+ <span class="text-lg">
+ + {f(fiat(tip, rate), currency)}
+ </span>
{/if}
- <span class="text-secondary">⚡️{`${s(a)}`}
-
- {#if tip}
- <span class="text-lg">
- + ⚡️{s(tip)}
- </span>
- {/if}
- </span>
+ <span class="text-secondary"
+ >⚡️{`${s(a)}`}
+
+ {#if tip}
+ <span class="text-lg">
+ + ⚡️{s(tip)}
+ </span>
+ {/if}
+ </span>
</div>
</div>
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index b3a944f4..77d5fde6 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -22,7 +22,7 @@
loading = false;
if (form?.message?.includes('pin')) $pin = undefined;
if (form) ({ min, max, feeRate, fee, ourfee, subtract } = form);
- if (!ourfee) ourfee = 0;
+ if (!ourfee) ourfee = 0;
if (feeRate) confirmed = true;
stale = false;
};
@@ -77,7 +77,9 @@
{f(toFiat(fee + ourfee, $selectedRate), currency)}
</h2>
<h3 class="text-secondary mb-6 mt-1">⚡️{s(fee + ourfee)}</h3>
- <button class="absolute right-1/4 top-0 text-secondary p-4" on:click={toggleAdjusting}><Icon icon="settings" style="opacity-30" /></button>
+ <button class="absolute right-1/4 top-0 text-secondary p-4" on:click={toggleAdjusting}
+ ><Icon icon="settings" style="opacity-30" /></button
+ >
</div>
</div>
{:else}
@@ -104,7 +106,9 @@
<div class="my-auto">
<Toggle id="subtract" checked={subtract} bind:value={subtract} />
</div>
- <label for="subtract" class="text-secondary text-lg my-auto mb-2">Take fee from amount</label>
+ <label for="subtract" class="text-secondary text-lg my-auto mb-2"
+ >Take fee from amount</label
+ >
</div>
{/if}
diff --git a/src/routes/(app)/sent/+page.svelte b/src/routes/(app)/sent/+page.svelte
index 72511487..760d2e1d 100644
--- a/src/routes/(app)/sent/+page.svelte
+++ b/src/routes/(app)/sent/+page.svelte
@@ -7,7 +7,7 @@
export let data;
let { payments, user } = data;
- let { currency, username } = user;
+ let { currency, username } = user;
let payment = payments[0];
let { amount, rate, tip } = payment;