From 3ada11ea58c3fc190f3785d7aaa6ab5e86a551a4 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 4 Aug 2024 17:20:25 -0700 Subject: [PATCH] design: redesign credentials page --- bun.lockb | Bin 173521 -> 173932 bytes package.json | 2 + src/lib/components/ui/EntityHeader.svelte | 4 +- .../components/ui/layout/pages/Header.svelte | 2 +- .../ui/sidebar/SidebarButton.svelte | 6 +- src/lib/i18n/en.json | 11 +- .../(local_user)/password/+layout.svelte | 52 ++++ .../(local_user)/password/+page.svelte | 265 +++++++----------- .../(local_user)/password/2fa/+page.svelte | 102 +++++++ .../(local_user)/password/change/+page.svelte | 77 +++++ .../(local_user)/password/delete/+page.svelte | 140 +++++++++ .../(local_user)/password/logins/+page.svelte | 64 +++++ .../(local_user)/password/logins/+page.ts | 11 + .../(local_user)/settings/+page.svelte | 110 -------- tailwind.config.js | 1 + 15 files changed, 558 insertions(+), 289 deletions(-) create mode 100644 src/routes/profile/(local_user)/password/+layout.svelte create mode 100644 src/routes/profile/(local_user)/password/2fa/+page.svelte create mode 100644 src/routes/profile/(local_user)/password/change/+page.svelte create mode 100644 src/routes/profile/(local_user)/password/delete/+page.svelte create mode 100644 src/routes/profile/(local_user)/password/logins/+page.svelte create mode 100644 src/routes/profile/(local_user)/password/logins/+page.ts diff --git a/bun.lockb b/bun.lockb index 671aff545a555e4d6962b5fa296d5489d0c7369c..ba3ab49919f1d6e94b17f65b68ebe010e8c63856 100755 GIT binary patch delta 28661 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 US6EaVd7**Ys5E$rx;pfK0TyKm;{X5v delta 28575 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 diff --git a/package.json b/package.json index e3ab664e..9bafa498 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@tailwindcss/container-queries": "^0.1.1", "@tanstack/svelte-virtual": "^3.8.1", "@types/nprogress": "^0.2.0", + "@types/ua-parser-js": "^0.7.39", "autoprefixer": "^10.4.16", "jsdom": "^22.1.0", "lemmy-js-client": "latest", @@ -32,6 +33,7 @@ "tailwindcss": "^3.3.3", "tslib": "^2.4.1", "typescript": "^5.0.0", + "ua-parser-js": "^1.0.38", "vite": "^5.0.0", "vitest": "^1.0.0" }, diff --git a/src/lib/components/ui/EntityHeader.svelte b/src/lib/components/ui/EntityHeader.svelte index 61b5b1f0..c6b62708 100644 --- a/src/lib/components/ui/EntityHeader.svelte +++ b/src/lib/components/ui/EntityHeader.svelte @@ -14,7 +14,7 @@ }[] = [] - + {#if banner}
- + {name}

{#if icon} diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 05aee9b5..2a0799fb 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -197,7 +197,7 @@ "user": "User", "settings": "Settings", "blocks": "Blocks", - "credentials": "Credentials", + "credentials": "Account", "moderates": "Moderating", "favorites": "Favorites", "upvoted": "Upvoted", @@ -205,6 +205,12 @@ "media": { "title": "Media", "download": "Download" + }, + "logins": "Logins", + "welcome": "Welcome, {{default}}!", + "delete": { + "title": "Delete account", + "warning": "This is permanent. Are you sure you want to do this?" } }, "translators": "Translators", @@ -532,7 +538,8 @@ "disable": "Disable", "add": "Add", "cancel": "Cancel", - "send": "Send" + "send": "Send", + "general": "General" }, "message": { "success": "Success", diff --git a/src/routes/profile/(local_user)/password/+layout.svelte b/src/routes/profile/(local_user)/password/+layout.svelte new file mode 100644 index 00000000..f2c2c350 --- /dev/null +++ b/src/routes/profile/(local_user)/password/+layout.svelte @@ -0,0 +1,52 @@ + + +
+ {routes.find((r) => $page.url.pathname == r.url)?.name} +
+
+ +
+ +
+
diff --git a/src/routes/profile/(local_user)/password/+page.svelte b/src/routes/profile/(local_user)/password/+page.svelte index 49dda70b..505d1880 100644 --- a/src/routes/profile/(local_user)/password/+page.svelte +++ b/src/routes/profile/(local_user)/password/+page.svelte @@ -1,178 +1,103 @@ -
{$t('routes.profile.credentials')}
- diff --git a/src/routes/profile/(local_user)/password/2fa/+page.svelte b/src/routes/profile/(local_user)/password/2fa/+page.svelte new file mode 100644 index 00000000..874dace7 --- /dev/null +++ b/src/routes/profile/(local_user)/password/2fa/+page.svelte @@ -0,0 +1,102 @@ + + +
+

+ + {totpEnabled ? $t('common.enabled') : $t('common.disabled')} + +

+ {#if totpEnabled || totpLink} + {#if totpLink && !totpEnabled} + + + + + + + {$t('form.profile.2fa.paste')} + + + {/if} +
{}} + > + + {#if totpEnabled} + + {:else} + + {/if} + + {:else} + + {/if} +
diff --git a/src/routes/profile/(local_user)/password/change/+page.svelte b/src/routes/profile/(local_user)/password/change/+page.svelte new file mode 100644 index 00000000..caf2b08a --- /dev/null +++ b/src/routes/profile/(local_user)/password/change/+page.svelte @@ -0,0 +1,77 @@ + + +
+ + + + + diff --git a/src/routes/profile/(local_user)/password/delete/+page.svelte b/src/routes/profile/(local_user)/password/delete/+page.svelte new file mode 100644 index 00000000..bfe317cf --- /dev/null +++ b/src/routes/profile/(local_user)/password/delete/+page.svelte @@ -0,0 +1,140 @@ + + +{#if deletion.modal} + deleteAccount(4)} + > + {$t('form.profile.deleteAccount.label')} + + + {$t('form.profile.deleteAccount.deleteContent')} + + {$t('form.profile.deleteAccount.warning')} + + + +{/if} + + +
+ {$t('routes.profile.delete.title')} +
+

+ {$t('routes.profile.delete.warning')} +

+ + {$t('form.profile.deleteAccount.deleteContent')} + + {$t('form.profile.deleteAccount.warning')} + + + +
diff --git a/src/routes/profile/(local_user)/password/logins/+page.svelte b/src/routes/profile/(local_user)/password/logins/+page.svelte new file mode 100644 index 00000000..7d4dc730 --- /dev/null +++ b/src/routes/profile/(local_user)/password/logins/+page.svelte @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + {#each data.tokens as token} + {@const ua = new UAParser(token.user_agent).getResult()} + + + + + + + + + + {/each} + +
User AgentIPDate
+ + +
{ua.os.name} {ua.os.version}
+
{ua.browser.name}
+
+ {token.ip} + + +
+
diff --git a/src/routes/profile/(local_user)/password/logins/+page.ts b/src/routes/profile/(local_user)/password/logins/+page.ts new file mode 100644 index 00000000..bb97d8c1 --- /dev/null +++ b/src/routes/profile/(local_user)/password/logins/+page.ts @@ -0,0 +1,11 @@ +import { client } from '$lib/lemmy.js' + +export async function load({ fetch, parent }) { + const user = await parent() + + const response = await client({ func: fetch }).listLogins() + + return { + tokens: response, + } +} diff --git a/src/routes/profile/(local_user)/settings/+page.svelte b/src/routes/profile/(local_user)/settings/+page.svelte index 7997ff13..65622c7d 100644 --- a/src/routes/profile/(local_user)/settings/+page.svelte +++ b/src/routes/profile/(local_user)/settings/+page.svelte @@ -1,5 +1,4 @@ -{#if deletion.modal} - deleteAccount(4)} - > - {$t('form.profile.deleteAccount.label')} - - - {$t('form.profile.deleteAccount.deleteContent')} - - {$t('form.profile.deleteAccount.warning')} - - - -{/if} -
{$t('routes.profile.settings')}
{#if data.my_user?.local_user_view?.local_user && formData} @@ -206,12 +104,4 @@ {$t('common.save')} {/if} -
diff --git a/tailwind.config.js b/tailwind.config.js index cb0b044c..e78c4289 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -15,6 +15,7 @@ export default { inter: ['Inter', 'system-ui', 'sans-serif'], nunito: ['Nunito', 'system-ui', 'sans-serif'], display: ['Satoshi', 'system-ui', 'sans-serif'], + mono: ['monospace'], }, extend: { animation: {