diff --git a/package-lock.json b/package-lock.json index 2e78dd8..baffb49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "adventurelog", - "version": "0.1.0", + "version": "0.1.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "adventurelog", - "version": "0.1.0", + "version": "0.1.6", "dependencies": { "@lucia-auth/adapter-drizzle": "^1.0.7", "@vercel/analytics": "^1.2.2", diff --git a/src/lib/components/UserCard.svelte b/src/lib/components/UserCard.svelte new file mode 100644 index 0000000..74097f2 --- /dev/null +++ b/src/lib/components/UserCard.svelte @@ -0,0 +1,17 @@ + + +
+
+

{user.first_name} {user.last_name}

+

{user.username}

+

Last Login: {user.last_login}

+

Created: {user.signup_date}

+
+ +
+
+
diff --git a/src/routes/settings/admin/+page.server.ts b/src/routes/settings/admin/+page.server.ts index 888ea6e..ca0bda1 100644 --- a/src/routes/settings/admin/+page.server.ts +++ b/src/routes/settings/admin/+page.server.ts @@ -1,16 +1,24 @@ import { error, redirect, type Actions, type Handle } from "@sveltejs/kit"; import type { PageServerLoad } from "./$types"; import { db } from "$lib/db/db.server"; -import { sessionTable } from "$lib/db/schema"; +import { sessionTable, userTable } from "$lib/db/schema"; +import type { DatabaseUser } from "$lib/server/auth"; export const load: PageServerLoad = async (event) => { + let users: DatabaseUser[] = []; if (!event.locals.user) { return redirect(302, "/login"); - } else { - if (event.locals.user.role !== "admin") { - return redirect(302, "/settings"); - } } + if (event.locals.user.role !== "admin") { + return redirect(302, "/settings"); + } + if (event.locals.user.role === "admin") { + users = (await db.select().from(userTable).execute()) as DatabaseUser[]; + console.log(users); + } + return { + users, + }; }; export const actions: Actions = { diff --git a/src/routes/settings/admin/+page.svelte b/src/routes/settings/admin/+page.svelte index d79147d..189f49b 100644 --- a/src/routes/settings/admin/+page.svelte +++ b/src/routes/settings/admin/+page.svelte @@ -1,13 +1,18 @@