From f4dead26c92e2ef6be45af0eb56d12bb3a00d983 Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Sat, 24 Sep 2022 22:20:18 -0600 Subject: lots of style updates after design review, bug fixes, and more improve --- src/routes/+layout.server.js | 8 ++-- src/routes/+layout.svelte | 2 +- src/routes/+page.svelte | 11 ++--- src/routes/[username]/+page.svelte | 48 ++++++++++--------- src/routes/[username]/dashboard/+page.svelte | 39 +++++++++++++-- src/routes/[username]/receive/+page.svelte | 4 +- src/routes/[username]/settings/+page.svelte | 14 ++++-- src/routes/[username]/settings/_account.svelte | 3 +- src/routes/[username]/settings/_security.svelte | 11 +++-- src/routes/[username]/support/+page.svelte | 2 +- .../[username]/transactions/[...page]/+page.svelte | 4 +- src/routes/invoice/[id]/+page.svelte | 13 +++-- src/routes/launch-party/+page.svelte | 2 +- src/routes/news/+page.svelte | 56 +++++++++++----------- 14 files changed, 127 insertions(+), 90 deletions(-) (limited to 'src/routes') diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js index b9df94c1..77ca7eaa 100644 --- a/src/routes/+layout.server.js +++ b/src/routes/+layout.server.js @@ -9,11 +9,11 @@ export async function load({ request, setHeaders, url, params }) { let { token } = cookie.parse(request.headers.get('cookie') || ''); let user; let rates; - let subject; + let subject; - if (params.username) { - subject = await get(`/users/${params.username}`); - } + if (params.username) { + subject = await get(`/users/${params.username}`); + } if (token) { try { diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index e260af38..bf347292 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -15,7 +15,7 @@ export let data; - $: $subject = data.subject; + $: $subject = data.subject; $: $token = data.token; $: $user = data.user; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 5d00f272..09d7ff54 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -28,11 +28,12 @@

- Welcome to the new and improved coinos, focused on merchant adoption! Looking for the old coinos? Visit - classic.coinos.ioclassic.coinos.io.

@@ -72,9 +73,7 @@

{$t('howItWorks.header')}

-
+
{#each howItWorksSteps as step} {/each} diff --git a/src/routes/[username]/+page.svelte b/src/routes/[username]/+page.svelte index de8c3a26..1bbd6e66 100644 --- a/src/routes/[username]/+page.svelte +++ b/src/routes/[username]/+page.svelte @@ -35,16 +35,18 @@ let followed = false; - + -
-
-
-

{$subject.username}

+
+
+
+

{$subject.username}

-

{$subject.address && $subject.address !== "null" ? $subject.address : ''}

+

+ {$subject.address && $subject.address !== 'null' ? $subject.address : ''} +

- -
+
-
-
copy(lightningAddress)} - id="qr" - class=" cursor-pointer w-[292px] md:w-[342px] h-[342px] border border-lightgrey rounded-3xl flex p-5 justify-center items-center relative" - /> +
+
copy(lightningAddress)} + id="qr" + class="cursor-pointer w-[292px] md:w-[342px] h-[342px] border border-lightgrey rounded-3xl flex p-5 justify-center items-center relative" + /> -

{$t('user.scanToPayBTC')}

+

{$t('user.scanToPayBTC')}

-
- {lightningAddress} - -
+
+ {lightningAddress} +
+
diff --git a/src/routes/[username]/dashboard/+page.svelte b/src/routes/[username]/dashboard/+page.svelte index 7e424819..4c0917dc 100644 --- a/src/routes/[username]/dashboard/+page.svelte +++ b/src/routes/[username]/dashboard/+page.svelte @@ -11,7 +11,8 @@ let payreq = '', payreqField, - withdrawing; + withdrawing, + loading; let toggle = async () => { payreq = ''; @@ -21,11 +22,14 @@ }; let withdraw = async () => { + loading = true; try { await post('/withdraw', { payreq }); withdrawing = false; + loading = false; } catch (e) { failure(e.message); + loading = false; } }; @@ -40,8 +44,8 @@ -
-

{user.username}

+
+

{user.username}

{user.address}
@@ -81,7 +85,7 @@ {:else}
@@ -110,8 +114,33 @@ class="{!payreq ? 'opacity-50' : 'opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold w-full mt-2 bg-black text-white" - on:click={withdraw}>{$t('user.dashboard.send')} + {#if loading} + + + + + {:else} + {$t('user.dashboard.send')} + {/if} +
{/if}
diff --git a/src/routes/[username]/receive/+page.svelte b/src/routes/[username]/receive/+page.svelte index 6a286071..ba443ff2 100644 --- a/src/routes/[username]/receive/+page.svelte +++ b/src/routes/[username]/receive/+page.svelte @@ -87,7 +87,7 @@ {#if $user} -
+
{#if $selectedRate}
@@ -172,7 +172,7 @@
diff --git a/src/routes/[username]/settings/_account.svelte b/src/routes/[username]/settings/_account.svelte index dbaea87e..ff7676f4 100644 --- a/src/routes/[username]/settings/_account.svelte +++ b/src/routes/[username]/settings/_account.svelte @@ -213,6 +213,7 @@ {/if}
+ diff --git a/src/routes/[username]/settings/_security.svelte b/src/routes/[username]/settings/_security.svelte index b74193cf..1b8fb125 100644 --- a/src/routes/[username]/settings/_security.svelte +++ b/src/routes/[username]/settings/_security.svelte @@ -36,7 +36,7 @@ toggleEnabling(); } } catch (e) { - failure('Failed to enable 2fa, try again'); + failure('Failed to enable 2FA, try again'); } }; @@ -50,13 +50,14 @@ toggleDisabling(); } } catch (e) { - failure('Failed to disable 2fa, try again'); + failure('Failed to disable 2FA, try again'); } }; $: otpUri = `otpauth://totp/coinos:${$user.username}?secret=${$user.otpsecret}&period=30&digits=6&algorithm=SHA1&issuer=coinos`; + - +
{$t('user.settings.twofa')} diff --git a/src/routes/[username]/support/+page.svelte b/src/routes/[username]/support/+page.svelte index acaa8d2b..663ba8a6 100644 --- a/src/routes/[username]/support/+page.svelte +++ b/src/routes/[username]/support/+page.svelte @@ -10,7 +10,7 @@ {#if $user} -
+

{$t('user.support.header')}

diff --git a/src/routes/[username]/transactions/[...page]/+page.svelte b/src/routes/[username]/transactions/[...page]/+page.svelte index 2e9cb70e..0eef04fe 100644 --- a/src/routes/[username]/transactions/[...page]/+page.svelte +++ b/src/routes/[username]/transactions/[...page]/+page.svelte @@ -17,7 +17,7 @@ -
+

{$t('user.transactions.header')}

@@ -36,7 +36,7 @@
-
+

{$t('user.transactions.AMOUNT')}

{$t('user.transactions.TYPE')}

diff --git a/src/routes/invoice/[id]/+page.svelte b/src/routes/invoice/[id]/+page.svelte index 67cd8efa..d935affb 100644 --- a/src/routes/invoice/[id]/+page.svelte +++ b/src/routes/invoice/[id]/+page.svelte @@ -181,7 +181,8 @@ > (showCustomAmount = false)} + >

{$t('invoice.addTipq')}

@@ -258,7 +259,7 @@ /> -
+