From d24443114bccd4109df1dd6df621738f3f5e84ed Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Wed, 31 Aug 2022 17:39:16 -0400 Subject: style adjustments for settings --- src/routes/+layout.svelte | 4 +- src/routes/[username]/dashboard/+page.svelte | 2 +- src/routes/[username]/settings/+page.svelte | 5 +- src/routes/[username]/settings/_pos.svelte | 2 +- src/routes/[username]/settings/_security.svelte | 94 +++++++++++++------------ src/routes/disable2fa/+server.js | 2 +- src/routes/enable2fa/+server.js | 2 +- 7 files changed, 57 insertions(+), 54 deletions(-) (limited to 'src/routes') diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 80f233bb..ed26835d 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -52,5 +52,7 @@ --toastBackground: #292929; } - button.primary { @apply rounded-full border py-2 font-bold my-4 flex px-4 bg-white mx-auto hover:bg-primary } + button.primary { + @apply rounded-full border py-2 font-bold my-4 flex px-4 bg-white mx-auto hover:bg-primary; + } diff --git a/src/routes/[username]/dashboard/+page.svelte b/src/routes/[username]/dashboard/+page.svelte index bd5f2bba..e61360c9 100644 --- a/src/routes/[username]/dashboard/+page.svelte +++ b/src/routes/[username]/dashboard/+page.svelte @@ -48,7 +48,7 @@

{user.username}

- {user.address} + {user.address}
diff --git a/src/routes/[username]/settings/+page.svelte b/src/routes/[username]/settings/+page.svelte index 8270ad51..037d44a5 100644 --- a/src/routes/[username]/settings/+page.svelte +++ b/src/routes/[username]/settings/+page.svelte @@ -30,7 +30,7 @@ -
+

{$t('user.settings.header')} @@ -46,11 +46,10 @@

-
+
- diff --git a/src/routes/[username]/settings/_pos.svelte b/src/routes/[username]/settings/_pos.svelte index f44f8312..83a942bc 100644 --- a/src/routes/[username]/settings/_pos.svelte +++ b/src/routes/[username]/settings/_pos.svelte @@ -10,7 +10,7 @@ try { $user.currency = e.target.value; let r = await put('/' + $user.username, { user: $user }); - success('Local currency updated!'); + success('Local currency updated'); } catch (e) { failure(e.message); } diff --git a/src/routes/[username]/settings/_security.svelte b/src/routes/[username]/settings/_security.svelte index dd184fe4..5b7aaf8e 100644 --- a/src/routes/[username]/settings/_security.svelte +++ b/src/routes/[username]/settings/_security.svelte @@ -27,7 +27,7 @@ await put('/enable2fa', { token }); success('2fa enabled'); $user.twofa = 1; - toggleEnabling(); + toggleEnabling(); } } catch (e) { failure('Failed to enable 2fa, try again'); @@ -41,7 +41,7 @@ await put('/disable2fa', { token }); success('2fa disabled'); $user.twofa = 0; - toggleDisabling(); + toggleDisabling(); } } catch (e) { failure('Failed to disable 2fa, try again'); @@ -88,50 +88,52 @@
-{#if setting2fa} - +
+ {#if setting2fa} + -
- {$t('user.settings.accountId')}
- {$user.otpsecret} -
-
- {$t('user.settings.oneTimeCode')}
- - - - - - - - -
-{:else if disabling2fa} -
- {$t('user.settings.oneTimeCode')}
- - - - - - - - -
-{:else} - {$t('user.settings.twofa')} -

- {$t('user.settings.twofaDescription')} -

- {#if $user.twofa} - +
+ {$t('user.settings.accountId')}
+ {$user.otpsecret} +
+
+ {$t('user.settings.oneTimeCode')}
+ + + + + + + + +
+ {:else if disabling2fa} +
+ {$t('user.settings.oneTimeCode')}
+ + + + + + + + +
{:else} - + {$t('user.settings.twofa')} +

+ {$t('user.settings.twofaDescription')} +

+ {#if $user.twofa} + + {:else} + + {/if} {/if} -{/if} +
diff --git a/src/routes/disable2fa/+server.js b/src/routes/disable2fa/+server.js index 98063773..be09f3f4 100644 --- a/src/routes/disable2fa/+server.js +++ b/src/routes/disable2fa/+server.js @@ -1,7 +1,7 @@ import { auth, post } from '$lib/utils'; export async function PUT({ request }) { - let body = await request.json(); + let body = await request.json(); let res = await post('/disable2fa', body, auth(request)); return new Response(JSON.stringify(res)); diff --git a/src/routes/enable2fa/+server.js b/src/routes/enable2fa/+server.js index 7bee4f4b..eb69a341 100644 --- a/src/routes/enable2fa/+server.js +++ b/src/routes/enable2fa/+server.js @@ -1,7 +1,7 @@ import { auth, post } from '$lib/utils'; export async function PUT({ request }) { - let body = await request.json(); + let body = await request.json(); let res = await post('/2fa', body, auth(request)); return new Response(JSON.stringify(res)); -- cgit v1.2.3