diff --git a/apps/server/src/db/quiz-repo.ts b/apps/server/src/db/quiz-repo.ts index f27136e..1c39a17 100644 --- a/apps/server/src/db/quiz-repo.ts +++ b/apps/server/src/db/quiz-repo.ts @@ -9,10 +9,23 @@ import type { QuizQuestion } from "../game/modes/quiz/questions" * Pool de questions mcq/truefalse non encore jouées par cette room, * mélangées et limitées. Tableau vide si pas de DB ou rien à servir. */ +/** Catégories existantes (pour le filtre du lobby). */ +export async function listCategories(): Promise { + if (!db) { + return [] + } + const rows = await db + .select({ name: quizCategory.name }) + .from(quizCategory) + .orderBy(quizCategory.name) + return rows.map((r) => r.name) +} + export async function loadQuizPool( roomCode: string, limit: number, - formats: string[] + formats: string[], + categories: string[] = [] ): Promise { if (!db || formats.length === 0) { return [] @@ -39,6 +52,9 @@ export async function loadQuizPool( .where( and( inArray(quizQuestion.format, formats), + categories.length > 0 + ? inArray(quizCategory.name, categories) + : undefined, notInArray(quizQuestion.id, alreadyPlayed) ) ) diff --git a/apps/server/src/game/modes/blindtest/blindtest-round.ts b/apps/server/src/game/modes/blindtest/blindtest-round.ts index 20a46c9..c78ae68 100644 --- a/apps/server/src/game/modes/blindtest/blindtest-round.ts +++ b/apps/server/src/game/modes/blindtest/blindtest-round.ts @@ -175,7 +175,7 @@ export class BlindtestRound implements GameRound { artist?: string guessedPlayerId?: string } - let text = "" + let text: string if (mode === "who_added") { text = nameOf(a.guessedPlayerId) } else if (mode === "title_artist") { diff --git a/apps/server/src/game/modes/quiz/pool.ts b/apps/server/src/game/modes/quiz/pool.ts index aadb522..ccefa1f 100644 --- a/apps/server/src/game/modes/quiz/pool.ts +++ b/apps/server/src/game/modes/quiz/pool.ts @@ -1,42 +1,22 @@ -// File d'attente de questions par room. Préchargée au lancement de la partie -// depuis la DB (si dispo), sinon depuis la banque en dur. Le QuizRound y pioche. -// Les formats servis dépendent du type de partie (quiz / images / mixte). +// File d'attente de questions par room. Préchargée au lancement : on respecte +// le sous-pool de chaque manche quiz (quiz "classique" vs images), dans l'ordre +// de la séquence. DB si dispo, sinon banque en dur (pas d'images en dur). -import type { QuizFormat, RoomSettings } from "@nerdware/shared" +import type { QuizFormat } from "@nerdware/shared" import { hasDb } from "../../../db" import { loadQuizPool } from "../../../db/quiz-repo" import type { ServerRoom } from "../../../rooms" import { QUIZ_QUESTIONS, type QuizQuestion } from "./questions" -interface RoomPool { - queue: QuizQuestion[] - /** true si les questions viennent de la DB (→ marquer jouées). */ +interface QueueItem { + question: QuizQuestion fromDb: boolean - formats: QuizFormat[] } -const poolByRoom = new WeakMap() +const poolByRoom = new WeakMap() const QUIZ_FORMATS: QuizFormat[] = ["mcq", "truefalse", "free"] - -/** Formats de quiz autorisés selon le type de partie (et les sous-modes mixtes). */ -function quizFormatsFor(settings: RoomSettings): QuizFormat[] { - if (settings.gameType === "image") { - return ["image_reveal"] - } - if (settings.gameType === "mixed") { - const formats: QuizFormat[] = [] - if (settings.mixedModes.includes("quiz")) { - formats.push(...QUIZ_FORMATS) - } - if (settings.mixedModes.includes("image")) { - formats.push("image_reveal") - } - return formats.length > 0 ? formats : QUIZ_FORMATS - } - // quiz, ou blindtest retombé sur du quiz (<3 joueurs) - return QUIZ_FORMATS -} +const IMAGE_FORMATS: QuizFormat[] = ["image_reveal"] function shuffle(items: T[]): T[] { const arr = [...items] @@ -47,44 +27,74 @@ function shuffle(items: T[]): T[] { return arr } -/** Précharge les questions de la partie. À appeler avant de lancer le moteur. */ -export async function prepareQuizForRoom(room: ServerRoom): Promise { - const formats = quizFormatsFor(room.settings) - const needed = room.settings.rounds.filter((r) => r.type === "quiz").length - let queue: QuizQuestion[] = [] - let fromDb = false - +/** Charge un sous-pool (DB puis complément banque en dur) pour `need` manches. */ +async function loadGroup( + room: ServerRoom, + need: number, + formats: QuizFormat[], + isImage: boolean, + categories: string[] +): Promise { + if (need <= 0) { + return [] + } + let items: QueueItem[] = [] if (hasDb) { try { - queue = await loadQuizPool(room.code, Math.max(needed, 1), formats) - fromDb = queue.length > 0 + const rows = await loadQuizPool(room.code, need, formats, categories) + items = rows.map((question) => ({ question, fromDb: true })) } catch (err) { console.error("[quiz] chargement DB échoué, fallback banque en dur", err) } } - - if (queue.length === 0) { - queue = shuffle(QUIZ_QUESTIONS.filter((q) => formats.includes(q.format))) - fromDb = false + if (items.length < need && !isImage) { + // Complément depuis la banque en dur (uniquement le quiz, pas d'images en dur). + const bank = shuffle( + QUIZ_QUESTIONS.filter( + (q) => + formats.includes(q.format) && + (categories.length === 0 || categories.includes(q.category)) + ) + ) + for (const question of bank) { + if (items.length >= need) break + items.push({ question, fromDb: false }) + } } - - poolByRoom.set(room, { queue, fromDb, formats }) + return items } -/** Pioche la prochaine question. Fallback aléatoire (formats autorisés) si vide. */ +/** Précharge les questions de la partie. À appeler avant de lancer le moteur. */ +export async function prepareQuizForRoom(room: ServerRoom): Promise { + const quizRounds = room.settings.rounds.filter((r) => r.type === "quiz") + const needImage = quizRounds.filter((r) => r.pool === "image").length + const needQuiz = quizRounds.length - needImage + + const cats = room.settings.categories + const quizGroup = await loadGroup(room, needQuiz, QUIZ_FORMATS, false, cats) + const imageGroup = await loadGroup(room, needImage, IMAGE_FORMATS, true, cats) + + // On assemble la file dans l'ordre des manches (chacune pioche dans son sous-pool). + const queue: QueueItem[] = [] + for (const r of quizRounds) { + const group = r.pool === "image" ? imageGroup : quizGroup + const item = group.shift() + if (item) { + queue.push(item) + } + } + poolByRoom.set(room, queue) +} + +/** Pioche la prochaine question. Fallback aléatoire (banque en dur) si vide. */ export function takeQuestion(room: ServerRoom): { question: QuizQuestion fromDb: boolean } { - const pool = poolByRoom.get(room) - if (pool && pool.queue.length > 0) { - return { question: pool.queue.shift()!, fromDb: pool.fromDb } - } - const formats = pool?.formats ?? ["mcq", "truefalse", "free"] - const candidates = QUIZ_QUESTIONS.filter((q) => formats.includes(q.format)) - const bank = candidates.length > 0 ? candidates : QUIZ_QUESTIONS - return { - question: bank[Math.floor(Math.random() * bank.length)], - fromDb: false, + const queue = poolByRoom.get(room) + if (queue && queue.length > 0) { + return queue.shift()! } + const q = QUIZ_QUESTIONS[Math.floor(Math.random() * QUIZ_QUESTIONS.length)] + return { question: q, fromDb: false } } diff --git a/apps/server/src/handlers.ts b/apps/server/src/handlers.ts index 3184db6..2a39854 100644 --- a/apps/server/src/handlers.ts +++ b/apps/server/src/handlers.ts @@ -110,6 +110,7 @@ export function registerRoomHandlers( blindtestMode: payload.blindtestMode, roundDuration: payload.roundDuration, tracksPerPlayer: payload.tracksPerPlayer, + categories: payload.categories, rounds: payload.rounds, } broadcastState(room) diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts index 6d5c675..f0f9390 100644 --- a/apps/server/src/index.ts +++ b/apps/server/src/index.ts @@ -7,6 +7,7 @@ import fastifyStatic from "@fastify/static" import { env, isDev } from "./env" import { createSocketServer } from "./socket" import { adminRoutes } from "./admin/routes" +import { listCategories } from "./db/quiz-repo" import "./game/modes" // enregistre les épreuves (registerRound) const app = Fastify({ @@ -25,6 +26,9 @@ await app.register(fastifyStatic, { root: uploadsRoot, prefix: "/uploads/" }) app.get("/health", async () => ({ status: "ok", uptime: process.uptime() })) +// Catégories de quiz disponibles (public, pour le filtre du lobby). +app.get("/api/categories", async () => listCategories()) + await app.register(adminRoutes, { prefix: "/api/admin" }) // Socket.IO se greffe sur le serveur HTTP sous-jacent de Fastify. diff --git a/apps/web/src/components/blindtest-view.tsx b/apps/web/src/components/blindtest-view.tsx index a96ea40..cfc2a76 100644 --- a/apps/web/src/components/blindtest-view.tsx +++ b/apps/web/src/components/blindtest-view.tsx @@ -65,7 +65,7 @@ export function BlindtestView({ snapshot }: { snapshot: RoomSnapshot }) { }, [showReveal, ready, api]) return ( -
+
Blindtest {snapshot.currentRound + 1} / {snapshot.totalRounds} diff --git a/apps/web/src/components/game-end-view.tsx b/apps/web/src/components/game-end-view.tsx index 1f2a5a4..5e5bd39 100644 --- a/apps/web/src/components/game-end-view.tsx +++ b/apps/web/src/components/game-end-view.tsx @@ -180,7 +180,8 @@ export function GameEndView({ snapshot }: { snapshot: RoomSnapshot }) { const rest = ranked.slice(3) return ( -
+
+

Partie terminée @@ -253,16 +254,22 @@ export function GameEndView({ snapshot }: { snapshot: RoomSnapshot }) { {gameRecap && gameRecap.length > 0 && ( )} +

- {gameTracks && gameTracks.length > 0 && ( - + {/* Détails (musiques + récap) côte à côte sur desktop. */} + {((gameTracks && gameTracks.length > 0) || + (gameRecap && gameRecap.length > 0)) && ( +
+ {gameTracks && gameTracks.length > 0 && ( + + )} + {gameRecap && gameRecap.length > 0 && ( + + )} +
)} - {gameRecap && gameRecap.length > 0 && ( - - )} - -
+
+ {allCategories.map((c) => ( + + ))}
- {effectiveType === "image" && ( -

- Crée des questions « Image » dans le back-office au préalable. -

- )}
)} @@ -373,6 +433,7 @@ export function LobbyView({ snapshot }: { snapshot: RoomSnapshot }) { )} {error &&

{error}

} +
) } diff --git a/apps/web/src/components/quiz-view.tsx b/apps/web/src/components/quiz-view.tsx index 4a5d31b..124f89c 100644 --- a/apps/web/src/components/quiz-view.tsx +++ b/apps/web/src/components/quiz-view.tsx @@ -59,7 +59,7 @@ export function QuizView({ snapshot }: { snapshot: RoomSnapshot }) { } return ( -
+
Question {snapshot.currentRound + 1} / {snapshot.totalRounds} diff --git a/apps/web/src/lib/categories.ts b/apps/web/src/lib/categories.ts new file mode 100644 index 0000000..69913d4 --- /dev/null +++ b/apps/web/src/lib/categories.ts @@ -0,0 +1,15 @@ +// Liste publique des catégories de quiz (pour le filtre du lobby). + +const SERVER_URL = import.meta.env.VITE_SERVER_URL ?? "http://localhost:3001" + +export async function fetchCategories(): Promise { + try { + const res = await fetch(`${SERVER_URL}/api/categories`) + if (!res.ok) { + return [] + } + return (await res.json()) as string[] + } catch { + return [] + } +} diff --git a/apps/web/src/pages/admin.tsx b/apps/web/src/pages/admin.tsx index 149b17c..4bf1d3d 100644 --- a/apps/web/src/pages/admin.tsx +++ b/apps/web/src/pages/admin.tsx @@ -90,7 +90,7 @@ function AdminPanel({ onLogout }: { onLogout: () => void }) { questions.isError && /401|autoris/i.test(String(questions.error)) return ( -
+

Back-office quiz

) : ( - <> +
qc.invalidateQueries({ queryKey: ["admin-questions"] }) @@ -131,7 +131,7 @@ function AdminPanel({ onLogout }: { onLogout: () => void }) { ))} - +
)}
) diff --git a/apps/web/src/pages/room.tsx b/apps/web/src/pages/room.tsx index f9edea7..81bfb56 100644 --- a/apps/web/src/pages/room.tsx +++ b/apps/web/src/pages/room.tsx @@ -63,8 +63,21 @@ export function RoomPage({ code }: { code: string }) { : "game" return ( -
-
+
+ {/* Halo d'ambiance en fond */} +
+
((set, get) => ({ blindtestMode: partial.blindtestMode ?? current.blindtestMode, roundDuration: partial.roundDuration ?? current.roundDuration, tracksPerPlayer: partial.tracksPerPlayer ?? current.tracksPerPlayer, + categories: partial.categories ?? current.categories, rounds: partial.rounds ?? current.rounds, }) }, diff --git a/packages/shared/src/domain.ts b/packages/shared/src/domain.ts index 8afd99e..8c98ea2 100644 --- a/packages/shared/src/domain.ts +++ b/packages/shared/src/domain.ts @@ -29,6 +29,8 @@ export interface Player { /** Configuration d'une épreuve planifiée dans la séquence de la partie. */ export interface RoundConfig { type: RoundType + /** Pour une manche quiz : dans quel sous-pool piocher (quiz "classique" ou images). */ + pool?: "quiz" | "image" } /** Réglages de la room, modifiables dans le lobby par l'hôte. */ @@ -42,6 +44,8 @@ export interface RoomSettings { roundDuration: number /** Nombre de titres que chaque joueur soumet (blindtest). */ tracksPerPlayer: number + /** Catégories de quiz autorisées (vide = toutes). */ + categories: string[] /** Séquence d'épreuves de la partie. */ rounds: RoundConfig[] } @@ -53,6 +57,7 @@ export const DEFAULT_ROOM_SETTINGS: RoomSettings = { blindtestMode: "title_artist", roundDuration: 60, tracksPerPlayer: 2, + categories: [], rounds: [], } diff --git a/packages/shared/src/events.ts b/packages/shared/src/events.ts index c52c11e..62cd0df 100644 --- a/packages/shared/src/events.ts +++ b/packages/shared/src/events.ts @@ -40,6 +40,7 @@ export interface UpdateSettingsPayload { blindtestMode: BlindtestMode roundDuration: number tracksPerPlayer: number + categories: string[] rounds: RoundConfig[] }