From a550abba16b321be7c65e14f8e6c24cc261a16c3 Mon Sep 17 00:00:00 2001 From: drake Date: Sat, 1 Feb 2025 00:46:11 -0600 Subject: [PATCH] base route impl --- src/app.css | 2 +- src/lib/db/index.server.ts | 5 +++-- src/routes/+layout.svelte | 2 +- src/routes/+page.svelte | 17 +++++++++++++++-- src/routes/admin/users/create/+page.server.ts | 2 +- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/app.css b/src/app.css index 43e2536..b51136b 100644 --- a/src/app.css +++ b/src/app.css @@ -405,7 +405,7 @@ h2 { } .details-height { - max-height: calc(100vh - 200px); + max-height: calc(100vh - 265px); } .top-with-navbar { diff --git a/src/lib/db/index.server.ts b/src/lib/db/index.server.ts index 598a07a..83acb91 100644 --- a/src/lib/db/index.server.ts +++ b/src/lib/db/index.server.ts @@ -39,8 +39,8 @@ export async function updateUser(user: User): Promise { const response = await sql`UPDATE users SET username = ${user.username}, - perms = ${user.perms}, - active = ${user.active}, + ${user.perms !== undefined ? sql`perms = ${user.perms},` : sql``} + ${user.active !== undefined ? sql`active = ${user.active},` : sql``} ${password_hash !== null ? sql`password_hash = ${password_hash},` : sql``} email = ${user.email}, phone = ${user.phone}, @@ -190,6 +190,7 @@ export async function getUserWithCompanyAndApplications( ), user_data AS ( SELECT + id, username, perms, email, diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index a7bcd83..b3c9d77 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -39,7 +39,7 @@ href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..40,400,0,0&display=block&icon_names=account_circle,arrow_drop_down,arrow_drop_up,calendar_today,call,check,close,dark_mode,delete,description,edit,group,info,light_mode,login,mail,person,search,sell,store,visibility,visibility_off,work" /> -
+