diff --git a/src/routes/(admin)/admin/+page.server.ts b/src/routes/(admin)/admin/+page.server.ts
index b75ff84..876512a 100644
--- a/src/routes/(admin)/admin/+page.server.ts
+++ b/src/routes/(admin)/admin/+page.server.ts
@@ -23,6 +23,11 @@ type Session = {
completedAt?: string;
playerCount?: number;
expiresAt: string;
+ progression?: {
+ currentStep: number;
+ completedSteps: number;
+ totalSteps: number;
+ };
};
type ResolutionMetric = {
@@ -98,22 +103,38 @@ export const load: PageServerLoad = async () => {
const currentAndIncomingRaw = await db.query.gameSession.findMany({
where: and(eq(gameSession.isActive, 1), gt(gameSession.expiresAt, new Date())),
with: {
- escapeGame: true,
- players: true
+ escapeGame: {
+ with: {
+ steps: true
+ }
+ },
+ players: true,
+ progress: true
}
});
const currentAndIncomingSessions: Session[] = currentAndIncomingRaw
- .map((session) => ({
- id: session.id,
- code: session.code,
- gameName: session.escapeGame.title,
- isActive: session.isActive === 1,
- startedAt: session.startedAt ? new Date(session.startedAt).toISOString() : undefined,
- completedAt: session.completedAt ? new Date(session.completedAt).toISOString() : undefined,
- playerCount: session.players.length,
- expiresAt: session.expiresAt.toISOString()
- }))
+ .map((session) => {
+ const totalSteps = session.escapeGame.steps.length;
+ const completedSteps = session.progress.filter((p) => p.completedAt !== null).length;
+ const currentStep = completedSteps + 1;
+
+ return {
+ id: session.id,
+ code: session.code,
+ gameName: session.escapeGame.title,
+ isActive: session.isActive === 1,
+ startedAt: session.startedAt ? new Date(session.startedAt).toISOString() : undefined,
+ completedAt: session.completedAt ? new Date(session.completedAt).toISOString() : undefined,
+ playerCount: session.players.length,
+ expiresAt: session.expiresAt.toISOString(),
+ progression: totalSteps > 0 ? {
+ currentStep,
+ completedSteps,
+ totalSteps
+ } : undefined
+ };
+ })
.sort((a, b) => {
const aIsCurrent = Boolean(a.startedAt) && !a.completedAt;
const bIsCurrent = Boolean(b.startedAt) && !b.completedAt;
diff --git a/src/routes/(admin)/admin/+page.svelte b/src/routes/(admin)/admin/+page.svelte
index 40cf939..379e00d 100644
--- a/src/routes/(admin)/admin/+page.svelte
+++ b/src/routes/(admin)/admin/+page.svelte
@@ -96,6 +96,9 @@
|
{$t.admin.players}
|
+
+ Progression
+ |
{$t.admin.expires}
|
@@ -122,6 +125,28 @@
{session.playerCount || 0}
|
+
+ {#if session.progression}
+
+
+
+ Step {session.progression.currentStep} of {session.progression.totalSteps}
+
+
+ {Math.round((session.progression.completedSteps / session.progression.totalSteps) * 100)}%
+
+
+
+ |
{new Date(session.expiresAt).toLocaleString()}
|
diff --git a/src/routes/(game)/game/play/[sessionCode]/+layout.svelte b/src/routes/(game)/game/play/[sessionCode]/+layout.svelte
index aa3e79b..ef86570 100644
--- a/src/routes/(game)/game/play/[sessionCode]/+layout.svelte
+++ b/src/routes/(game)/game/play/[sessionCode]/+layout.svelte
@@ -7,6 +7,7 @@
let { data, children }: { data: LayoutData; children: import('svelte').Snippet } = $props();
let inventoryOpen = $state(false);
+ let tutorialOpen = $state(false);
let dragStartY = $state(0);
let dragCurrentY = $state(0);
@@ -23,6 +24,14 @@
dragCurrentY = 0;
};
+ const toggleTutorial = () => {
+ tutorialOpen = !tutorialOpen;
+ };
+
+ const closeTutorial = () => {
+ tutorialOpen = false;
+ };
+
const handleTouchStart = (e: TouchEvent) => {
dragStartY = e.touches[0].clientY;
dragCurrentY = e.touches[0].clientY;
@@ -71,15 +80,16 @@
-
-
+
{#if data.previousStepId}