From 3596a5dcd65b9292fb2a608a0fe2252b1c103449 Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Tue, 27 Feb 2024 22:49:21 -0800 Subject: [PATCH] Fix profile update and toast works now. --- package.json | 6 +-- pnpm-lock.yaml | 39 ++++++-------- .../(app)/(protected)/profile/+page.server.ts | 22 +++++--- .../(app)/(protected)/profile/+page.svelte | 53 +++++++------------ src/routes/(auth)/login/+page.svelte | 2 +- src/routes/+layout.svelte | 22 ++++++-- 6 files changed, 73 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 6560473..f309e3c 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "satori": "^0.10.13", "satori-html": "^0.3.2", "svelte": "^4.2.12", - "svelte-check": "^3.6.4", + "svelte-check": "^3.6.5", "svelte-meta-tags": "^3.1.0", "svelte-preprocess": "^5.1.3", "svelte-sequential-preprocessor": "^2.0.1", @@ -85,7 +85,7 @@ "@lucia-auth/adapter-drizzle": "^1.0.2", "@lucia-auth/adapter-prisma": "4.0.0", "@lukeed/uuid": "^2.0.1", - "@neondatabase/serverless": "^0.8.1", + "@neondatabase/serverless": "^0.9.0", "@paralleldrive/cuid2": "^2.2.2", "@planetscale/database": "^1.16.0", "@prisma/client": "^5.9.1", @@ -93,7 +93,7 @@ "@sveltejs/adapter-vercel": "^5.1.0", "@types/feather-icons": "^4.29.4", "@vercel/og": "^0.5.20", - "bits-ui": "^0.18.3", + "bits-ui": "^0.18.4", "boardgamegeekclient": "^1.9.1", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 80c8f7f..1397c78 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ dependencies: specifier: ^2.0.1 version: 2.0.1 '@neondatabase/serverless': - specifier: ^0.8.1 - version: 0.8.1 + specifier: ^0.9.0 + version: 0.9.0 '@paralleldrive/cuid2': specifier: ^2.2.2 version: 2.2.2 @@ -48,8 +48,8 @@ dependencies: specifier: ^0.5.20 version: 0.5.20 bits-ui: - specifier: ^0.18.3 - version: 0.18.3(svelte@4.2.12) + specifier: ^0.18.4 + version: 0.18.4(svelte@4.2.12) boardgamegeekclient: specifier: ^1.9.1 version: 1.9.1 @@ -64,7 +64,7 @@ dependencies: version: 0.6.0 drizzle-orm: specifier: ^0.29.4 - version: 0.29.4(@neondatabase/serverless@0.8.1)(@planetscale/database@1.16.0)(@types/pg@8.11.2)(mysql2@3.9.2)(pg@8.11.3)(postgres@3.4.3) + version: 0.29.4(@neondatabase/serverless@0.9.0)(@planetscale/database@1.16.0)(@types/pg@8.11.2)(mysql2@3.9.2)(pg@8.11.3)(postgres@3.4.3) feather-icons: specifier: ^4.29.1 version: 4.29.1 @@ -227,8 +227,8 @@ devDependencies: specifier: ^4.2.12 version: 4.2.12 svelte-check: - specifier: ^3.6.4 - version: 3.6.4(postcss-load-config@5.0.3)(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.12) + specifier: ^3.6.5 + version: 3.6.5(postcss-load-config@5.0.3)(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.12) svelte-meta-tags: specifier: ^3.1.0 version: 3.1.0(svelte@4.2.12)(typescript@5.3.3) @@ -1915,13 +1915,6 @@ packages: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 - /@jridgewell/trace-mapping@0.3.22: - resolution: {integrity: sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==} - dependencies: - '@jridgewell/resolve-uri': 3.1.1 - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - /@jridgewell/trace-mapping@0.3.23: resolution: {integrity: sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==} dependencies: @@ -2033,8 +2026,8 @@ packages: dev: false optional: true - /@neondatabase/serverless@0.8.1: - resolution: {integrity: sha512-nxZfTLbGqvDrw0W9WnQxzoPn4KC6SLjkvK4grdf6eWVMQSc24X+8udz9inZWOGu8f0O3wJAq586fCZ32r22lwg==} + /@neondatabase/serverless@0.9.0: + resolution: {integrity: sha512-mmJnUAzlzvxNSZuuhI6kgJjH+JgFdBMYUWxihtq/nj0Tjt+Y5UU3W+SvRFoucnd5NObYkuLYQzk+zV5DGFKGJg==} dependencies: '@types/pg': 8.6.6 dev: false @@ -3793,8 +3786,8 @@ packages: file-uri-to-path: 1.0.0 dev: false - /bits-ui@0.18.3(svelte@4.2.12): - resolution: {integrity: sha512-kcEJWiOHlHv1R3EAmkVDdTnvucT3A5VL4h5ORkJjGUDrpCtPFoMO7jDF6P9XwpD3qVfIVQhN4OldPRNMXW9/RQ==} + /bits-ui@0.18.4(svelte@4.2.12): + resolution: {integrity: sha512-Xw0DdjT21rJ1ICTy3CHXAKy6is3phXRqjpNwRZldC3A316thRCJn+viEtTifgh4kI+qCm5VutzBqsrimFd+CSA==} peerDependencies: svelte: ^4.0.0 dependencies: @@ -4302,7 +4295,7 @@ packages: - supports-color dev: true - /drizzle-orm@0.29.4(@neondatabase/serverless@0.8.1)(@planetscale/database@1.16.0)(@types/pg@8.11.2)(mysql2@3.9.2)(pg@8.11.3)(postgres@3.4.3): + /drizzle-orm@0.29.4(@neondatabase/serverless@0.9.0)(@planetscale/database@1.16.0)(@types/pg@8.11.2)(mysql2@3.9.2)(pg@8.11.3)(postgres@3.4.3): resolution: {integrity: sha512-ZnSM8TAxFhzH7p1s3+w3pRE/eKaOeNkH9SKitm717pubDVVcV2I0BCDBPGKV+pe02+wMfw37ntlTcCyo2rA3IA==} peerDependencies: '@aws-sdk/client-rds-data': '>=3' @@ -4373,7 +4366,7 @@ packages: sqlite3: optional: true dependencies: - '@neondatabase/serverless': 0.8.1 + '@neondatabase/serverless': 0.9.0 '@planetscale/database': 1.16.0 '@types/pg': 8.11.2 mysql2: 3.9.2 @@ -7113,13 +7106,13 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - /svelte-check@3.6.4(postcss-load-config@5.0.3)(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.12): - resolution: {integrity: sha512-mY/dqucqm46p72M8yZmn81WPZx9mN6uuw8UVfR3ZKQeLxQg5HDGO3HHm5AZuWZPYNMLJ+TRMn+TeN53HfQ/vsw==} + /svelte-check@3.6.5(postcss-load-config@5.0.3)(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.12): + resolution: {integrity: sha512-5aLgoQEdadvp8ypvKQ2avhnQ+V9YPQQaWrTFlXFw5g/v8xIQBvo+X/WqxTyD+V/ItDqXg3+abUA53rdDHgUjCA==} hasBin: true peerDependencies: svelte: ^3.55.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0 dependencies: - '@jridgewell/trace-mapping': 0.3.22 + '@jridgewell/trace-mapping': 0.3.23 chokidar: 3.6.0 fast-glob: 3.3.2 import-fresh: 3.3.0 diff --git a/src/routes/(app)/(protected)/profile/+page.server.ts b/src/routes/(app)/(protected)/profile/+page.server.ts index 7a9dfc6..2a67b51 100644 --- a/src/routes/(app)/(protected)/profile/+page.server.ts +++ b/src/routes/(app)/(protected)/profile/+page.server.ts @@ -16,16 +16,22 @@ export const load: PageServerLoad = async (event) => { const { user } = event.locals; + const dbUser = await db.query + .users + .findFirst({ + where: eq(users.id, user.id) + }); + const profileForm = await superValidate(zod(profileSchema), { defaults: { - firstName: user.firstName, - lastName: user.lastName, - username: user.username + firstName: dbUser?.first_name || '', + lastName: dbUser?.last_name || '', + username: dbUser?.username || '', } }); const emailForm = await superValidate(zod(changeEmailSchema), { defaults: { - email: user.email + email: dbUser?.email || '', } }); @@ -36,7 +42,7 @@ export const load: PageServerLoad = async (event) => { }; export const actions: Actions = { - default: async (event) => { + profileUpdate: async (event) => { const form = await superValidate(event, zod(profileSchema)); if (!form.valid) { @@ -82,7 +88,7 @@ export const actions: Actions = { } console.log('profile updated successfully'); - return message(form, 'Profile updated successfully.'); + return message(form, { type: 'success', message: 'Profile updated successfully!' }); }, changeEmail: async (event) => { const form = await superValidate(event, zod(changeEmailSchema)); @@ -104,7 +110,7 @@ export const actions: Actions = { }); if (existingUser && existingUser.id !== user.id) { - return setError(form, 'email', 'That email is already taken'); + return setError(form, 'email', { type: 'error', message: 'That email is already taken' }); } await db @@ -127,5 +133,7 @@ export const actions: Actions = { // receiveEmail: false // }); } + + return message(form, { type: 'success', message: 'Email updated successfully!' }); } }; diff --git a/src/routes/(app)/(protected)/profile/+page.svelte b/src/routes/(app)/(protected)/profile/+page.svelte index 015ea2d..4957247 100644 --- a/src/routes/(app)/(protected)/profile/+page.svelte +++ b/src/routes/(app)/(protected)/profile/+page.svelte @@ -1,9 +1,11 @@ -
- +

Your Profile

- {#if $message} - - {/if}
@@ -56,6 +54,7 @@ {$profileErrors.lastName} {/if}
+
@@ -65,24 +64,17 @@ id="email" name="email" placeholder="Email Address" - autocorrect="off" - autocomplete="email" - data-invalid={$profileErrors.email} - bind:value={$profileForm.email} - /> - - {#if $profileErrors.email} - {$profileErrors.email} + autocomplete="email" + data-invalid={$emailErrors.email} + bind:value={$emailForm.email} + /> + {#if $emailErrors.email} + {$emailErrors.email} {/if} - {#if !$profileForm.email} + + {#if !$emailForm.email} Heads up! @@ -92,6 +84,7 @@ {/if}
+
-
- - -
- -