...and more!
diff --git a/src/routes/approved-editors/+page.svelte b/src/routes/approved-editors/+page.svelte index 2e4effd..555dd8c 100644 --- a/src/routes/approved-editors/+page.svelte +++ b/src/routes/approved-editors/+page.svelte @@ -46,7 +46,8 @@Want to get something else added here? Ask in #construct-help#construct-help!
diff --git a/src/routes/auth/create-hackatime-account/+page.svelte b/src/routes/auth/create-hackatime-account/+page.svelte index 62d3c53..2e73338 100644 --- a/src/routes/auth/create-hackatime-account/+page.svelte +++ b/src/routes/auth/create-hackatime-account/+page.svelte @@ -1,13 +1,13 @@Make sure you have a Hackatime account associated with your Slack account.
- Make one? - Try again -Make sure you have a Hackatime account associated with your Slack account.
+ Make one? + Try again +Sorry, you're ineligible to take part in this event until you get verified.
- Get verified -Sorry, you're ineligible to take part in this event until you get verified.
+ Get verified +oh no!!!
{page.error?.message}
-
+
Go back home
diff --git a/src/routes/dashboard/+layout.svelte b/src/routes/dashboard/+layout.svelte
index fcbefe3..5448dd9 100644
--- a/src/routes/dashboard/+layout.svelte
+++ b/src/routes/dashboard/+layout.svelte
@@ -1,6 +1,6 @@
diff --git a/src/routes/dashboard/Sidebar.svelte b/src/routes/dashboard/Sidebar.svelte
index be067c1..750c02a 100644
--- a/src/routes/dashboard/Sidebar.svelte
+++ b/src/routes/dashboard/Sidebar.svelte
@@ -8,12 +8,8 @@
ClipboardPen,
ClipboardPenLine,
Store,
-
ShieldUser,
-
Box
-
-
} from '@lucide/svelte';
import { page } from '$app/state';
import logo from '$lib/assets/logo.png';
@@ -37,9 +33,7 @@
Item orders
+ +Impersonate logs
+ diff --git a/src/routes/dashboard/admin/admin/impersonate-logs/+page.server.ts b/src/routes/dashboard/admin/admin/impersonate-logs/+page.server.ts new file mode 100644 index 0000000..ac7d1d8 --- /dev/null +++ b/src/routes/dashboard/admin/admin/impersonate-logs/+page.server.ts @@ -0,0 +1,55 @@ +import { db } from '$lib/server/db/index.js'; +import { impersonateAuditLog, user } from '$lib/server/db/schema.js'; +import { error } from '@sveltejs/kit'; +import { desc, eq, inArray } from 'drizzle-orm'; + +export async function load({ locals }) { + if (!locals.user) { + throw error(500); + } + if (!locals.user.hasAdmin) { + throw error(403, { message: 'oi get out' }); + } + + const logs = await db + .select({ + id: impersonateAuditLog.id, + timestamp: impersonateAuditLog.timestamp, + adminUser: { + id: user.id, + name: user.name, + profilePicture: user.profilePicture + }, + targetUserId: impersonateAuditLog.targetUserId + }) + .from(impersonateAuditLog) + .leftJoin(user, eq(impersonateAuditLog.adminUserId, user.id)) + .orderBy(desc(impersonateAuditLog.timestamp)); + + // Fetch target users in a single query + const targetUserIds = [...new Set(logs.map((log) => log.targetUserId))]; + const targetUsers = + targetUserIds.length > 0 + ? await db + .select({ + id: user.id, + name: user.name, + profilePicture: user.profilePicture + }) + .from(user) + .where(inArray(user.id, targetUserIds)) + : []; + + // Create a map for efficient lookup + const targetUserMap = new Map(targetUsers.map((u) => [u.id, u])); + + // Merge the data + const logsWithUsers = logs.map((log) => ({ + ...log, + targetUser: targetUserMap.get(log.targetUserId) + })); + + return { + logs: logsWithUsers + }; +} diff --git a/src/routes/dashboard/admin/admin/impersonate-logs/+page.svelte b/src/routes/dashboard/admin/admin/impersonate-logs/+page.svelte new file mode 100644 index 0000000..0ec407b --- /dev/null +++ b/src/routes/dashboard/admin/admin/impersonate-logs/+page.svelte @@ -0,0 +1,74 @@ + + +Showing {data.logs.length} impersonation events
+ + {#if data.logs.length == 0} +
+ No impersonation events found 
+
Admin
+ + {log.adminUser?.name} + +Impersonated
+ + {log.targetUser?.name} + +
Created
@@ -109,7 +109,7 @@
- A higher market score: -
+A higher market score:
...and more!
diff --git a/src/routes/approved-editors/+page.svelte b/src/routes/approved-editors/+page.svelte index 555dd8c..2e4effd 100644 --- a/src/routes/approved-editors/+page.svelte +++ b/src/routes/approved-editors/+page.svelte @@ -46,8 +46,7 @@Want to get something else added here? Ask in #construct-help#construct-help!
diff --git a/src/routes/auth/create-hackatime-account/+page.svelte b/src/routes/auth/create-hackatime-account/+page.svelte index 2e73338..62d3c53 100644 --- a/src/routes/auth/create-hackatime-account/+page.svelte +++ b/src/routes/auth/create-hackatime-account/+page.svelte @@ -1,13 +1,13 @@ -Make sure you have a Hackatime account associated with your Slack account.
- Make one? - Try again -Make sure you have a Hackatime account associated with your Slack account.
+ Make one? + Try again +Sorry, you're ineligible to take part in this event until you get verified.
- Get verified -Sorry, you're ineligible to take part in this event until you get verified.
+ Get verified +oh no!!!
{page.error?.message}
-
+
Go back home
diff --git a/src/routes/dashboard/+layout.svelte b/src/routes/dashboard/+layout.svelte
index 5448dd9..fcbefe3 100644
--- a/src/routes/dashboard/+layout.svelte
+++ b/src/routes/dashboard/+layout.svelte
@@ -1,6 +1,6 @@
diff --git a/src/routes/dashboard/Sidebar.svelte b/src/routes/dashboard/Sidebar.svelte
index 750c02a..be067c1 100644
--- a/src/routes/dashboard/Sidebar.svelte
+++ b/src/routes/dashboard/Sidebar.svelte
@@ -8,8 +8,12 @@
ClipboardPen,
ClipboardPenLine,
Store,
+
ShieldUser,
+
Box
+
+
} from '@lucide/svelte';
import { page } from '$app/state';
import logo from '$lib/assets/logo.png';
@@ -33,7 +37,9 @@
Created
@@ -109,7 +109,7 @@
A higher market score:
++ A higher market score: +
Hackatime: {user.hackatimeTrust}
Trust: {user.trust}
-{user.clay} clay, {user.brick} brick, {user.shopScore} market
++ {Math.round(user.clay * 10) / 10} clay, {Math.round(user.brick * 10) / 10} brick, {Math.round( + user.shopScore * 10 + ) / 10} market +