Compare commits

..

No commits in common. "main" and "v0.1.0" have entirely different histories.
main ... v0.1.0

44 changed files with 93 additions and 820 deletions

View file

@ -4,55 +4,6 @@ Toutes les évolutions notables de NerdWare. Format basé sur
[Keep a Changelog](https://keepachangelog.com/fr/1.1.0/), versionné en
[SemVer](https://semver.org/lang/fr/).
## [0.1.4] — 2026-06-12
### Ajouté
- **Mode Rébus** : devine l'œuvre geek à partir d'un rébus emoji (réponse libre,
matching tolérant). Implémenté comme format de quiz `rebus` (réutilise pool,
anti-doublons, scoring, récap, bots, back-office). Tuile dédiée au lobby,
affichage emoji en grand, transition 🧩, 9 rébus fournis + création au back-office.
## [0.1.3] — 2026-06-12
### Ajouté
- **Notes de version « Nouveautés »** : modale sur l'accueil listant les nouveautés
par version (curées, FR/EN), avec une pastille tant que la dernière version n'a
pas été vue. Composant `Dialog` réutilisable ajouté à `@workspace/ui`.
## [0.1.2] — 2026-06-12
### Ajouté
- **Umami analytics** (optionnel) : suivi d'audience injecté seulement si
`VITE_UMAMI_SRC` + `VITE_UMAMI_WEBSITE_ID` sont définis au build (sinon désactivé,
pas de suivi en dev). L'ID de site est public, pas un secret.
## [0.1.1] — 2026-06-12
Correctifs et améliorations issus des premières parties entre amis.
### Corrigé
- **DB** : connexion via variables `PG*` (au lieu d'un DSN inline) — robuste aux
caractères spéciaux dans le mot de passe Postgres.
- **Blindtest** : son débloqué côté non-DJ via un geste « Activer le son »
(politique d'autoplay) + `origin`/`enablejsapi` du lecteur ; état de vote
masqué en mode « qui l'a ajouté » (le contributeur ne se trahit plus).
- **Blindtest** : liste de ses titres rendue depuis le serveur (autoritaire) —
fin du « 3/3 mais 2 affichés » après remount/reconnexion.
- **Quiz** : le champ de réponse libre se réinitialise entre les questions.
- **Décompte** : synchro d'horloge serveur → le timer est identique sur tous les
appareils (fini les écarts dus au décalage d'horloge).
### Ajouté / changé
- **Blindtest** : le DJ peut être n'importe qui, y compris le contributeur ;
manches blindtest portées à 90 s.
- **Volume** audio réglable par joueur (mémorisé).
- **Thème** clair / sombre / système (sélecteur sur l'accueil et la room).
## [0.1.0] — 2026-06-11
Première version déployable. Cycle de jeu temps réel complet (lobby → manches →
@ -80,8 +31,4 @@ fin), trois modes, back-office et internationalisation.
- **Déploiement** : Dockerfiles (serveur Bun, client nginx) + `docker-compose.prod.yml`
prêt pour Dokploy.
[0.1.4]: https://git.ayoubbenziza.dev/ayoub/nerdware/src/tag/v0.1.4
[0.1.3]: https://git.ayoubbenziza.dev/ayoub/nerdware/src/tag/v0.1.3
[0.1.2]: https://git.ayoubbenziza.dev/ayoub/nerdware/src/tag/v0.1.2
[0.1.1]: https://git.ayoubbenziza.dev/ayoub/nerdware/src/tag/v0.1.1
[0.1.0]: https://git.ayoubbenziza.dev/ayoub/nerdware/src/tag/v0.1.0

View file

@ -1,6 +1,6 @@
{
"name": "@nerdware/server",
"version": "0.1.4",
"version": "0.1.0",
"type": "module",
"private": true,
"scripts": {

View file

@ -10,7 +10,7 @@ import { env } from "../env"
import { db } from "../db"
import { quizCategory, quizQuestion, type NewQuizQuestion } from "../db/schema"
const FORMATS = ["mcq", "truefalse", "free", "image_reveal", "rebus"] as const
const FORMATS = ["mcq", "truefalse", "free", "image_reveal"] as const
type AdminFormat = (typeof FORMATS)[number]
const IMAGE_EXT = [".jpg", ".jpeg", ".png", ".webp", ".gif", ".avif"]
@ -56,7 +56,7 @@ function validate(
lang: body.lang === "en" ? "en" : "fr",
}
if (format === "free" || format === "image_reveal" || format === "rebus") {
if (format === "free" || format === "image_reveal") {
const answers = (body.acceptedAnswers ?? [])
.map((a) => a.trim())
.filter(Boolean)

View file

@ -1,21 +0,0 @@
// Création du client postgres-js. Deux modes :
// 1. DATABASE_URL (DSN complet) — pratique en dev.
// 2. Variables PG* (PGHOST/PGPORT/PGUSER/PGPASSWORD/PGDATABASE) — recommandé en
// prod : le mot de passe est passé tel quel (pas d'encodage d'URL à gérer).
// postgres-js lit automatiquement les PG* de l'environnement quand on ne lui
// passe pas de DSN.
import postgres from "postgres"
import { env } from "../env"
export const hasDbConfig = !!env.databaseUrl || !!process.env.PGHOST
export function createSqlClient(opts: { max?: number } = {}) {
if (env.databaseUrl) {
return postgres(env.databaseUrl, opts)
}
if (process.env.PGHOST) {
return postgres(opts)
}
return null
}

View file

@ -2,16 +2,17 @@
// le jeu retombe sur la banque de questions en dur (dev sans infra).
import { drizzle } from "drizzle-orm/postgres-js"
import { createSqlClient } from "./client"
import postgres from "postgres"
import { env } from "../env"
import * as schema from "./schema"
export type Database = ReturnType<typeof drizzle<typeof schema>>
function createDb(): Database | null {
const client = createSqlClient()
if (!client) {
if (!env.databaseUrl) {
return null
}
const client = postgres(env.databaseUrl)
return drizzle(client, { schema })
}

View file

@ -2,13 +2,15 @@
// bun run db:migrate
import { drizzle } from "drizzle-orm/postgres-js"
import { migrate } from "drizzle-orm/postgres-js/migrator"
import { createSqlClient } from "./client"
import postgres from "postgres"
import { env } from "../env"
const client = createSqlClient({ max: 1 })
if (!client) {
console.error("Aucune config DB (DATABASE_URL ou PG*) — rien à migrer.")
if (!env.databaseUrl) {
console.error("DATABASE_URL manquant — rien à migrer.")
process.exit(1)
}
const client = postgres(env.databaseUrl, { max: 1 })
const db = drizzle(client)
await migrate(db, { migrationsFolder: "./drizzle" })

View file

@ -6,19 +6,21 @@
import { eq } from "drizzle-orm"
import { drizzle } from "drizzle-orm/postgres-js"
import { createSqlClient } from "./client"
import postgres from "postgres"
import { env } from "../env"
import { quizCategory, quizQuestion, type NewQuizQuestion } from "./schema"
if (!env.databaseUrl) {
console.error("DATABASE_URL manquant — impossible de seeder.")
process.exit(1)
}
const COUNT = Number(process.env.IMAGE_SEED_COUNT ?? 151)
const CATEGORY = "Pokémon"
const PROMPT = "Quel est ce Pokémon ?"
const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms))
const client = createSqlClient({ max: 1 })
if (!client) {
console.error("Aucune config DB (DATABASE_URL ou PG*) — impossible de seeder.")
process.exit(1)
}
const client = postgres(env.databaseUrl, { max: 1 })
const db = drizzle(client, { schema: { quizCategory, quizQuestion } })
async function upsertCategory(name: string): Promise<string> {

View file

@ -5,7 +5,8 @@
import { eq } from "drizzle-orm"
import { drizzle } from "drizzle-orm/postgres-js"
import { createSqlClient } from "./client"
import postgres from "postgres"
import { env } from "../env"
import {
quizCategory,
quizQuestion,
@ -13,11 +14,12 @@ import {
} from "./schema"
import { QUIZ_QUESTIONS } from "../game/modes/quiz/questions"
const client = createSqlClient({ max: 1 })
if (!client) {
console.error("Aucune config DB (DATABASE_URL ou PG*) — impossible de seeder.")
if (!env.databaseUrl) {
console.error("DATABASE_URL manquant — impossible de seeder.")
process.exit(1)
}
const client = postgres(env.databaseUrl, { max: 1 })
const db = drizzle(client, { schema: { quizCategory, quizQuestion } })
// Catégories Open Trivia DB pertinentes (id OpenTDB → nom affiché).

View file

@ -44,7 +44,7 @@ describe("match", () => {
})
describe("BlindtestRound", () => {
test("start : le DJ est un humain connecté (le contributeur peut tomber DJ)", () => {
test("start : le DJ est neutre (jamais le contributeur)", () => {
const rooms = new RoomManager()
const { room, player: a } = rooms.create("Alice", "sa")
const { player: b } = rooms.join(room.code, "Bob", "sb")
@ -53,24 +53,10 @@ describe("BlindtestRound", () => {
const round = new BlindtestRound()
const start = round.start(room)
// N'importe quel humain (Alice incluse), jamais un bot ni null.
expect([a.id, b.id]).toContain(start.djId!)
expect(start.djId).toBe(b.id) // Bob (pas Alice, la contributrice)
expect(start.payload).toEqual({ trackId: "t1", youtubeId: "abc12345678" })
})
test("start : un bot n'est jamais DJ", () => {
const rooms = new RoomManager()
const { room, player: a } = rooms.create("Alice", "sa")
rooms.addBot(room)
rooms.addBot(room)
room.blindtestTracks = [track(a.id)]
prepareBlindtestForRoom(room)
const round = new BlindtestRound()
// Alice est la seule humaine → DJ forcément Alice (les bots sont exclus).
expect(round.start(room).djId).toBe(a.id)
})
test("who_added : le contributeur gagne par tromperie (mauvaises devinettes)", () => {
const rooms = new RoomManager()
const { room, player: a } = rooms.create("Alice", "sa")

View file

@ -32,14 +32,10 @@ interface BlindtestRoundData {
track: BlindtestTrack
}
// Le blindtest dure plus longtemps (écoute + saisie).
const BLINDTEST_DURATION_SEC = 90
/** Tire un DJ : n'importe quel humain connecté (y compris le contributeur, pour
* ne pas donner d'« immunité » à celui qui n'est jamais tiré). */
function pickDj(room: ServerRoom): string | null {
/** Tire un DJ neutre : un humain connecté qui n'a pas soumis ce titre. */
function pickDj(room: ServerRoom, submittedBy: string): string | null {
const eligible = [...room.players.values()].filter(
(p) => p.connected && !p.isBot
(p) => p.connected && !p.isBot && p.id !== submittedBy
)
if (eligible.length === 0) {
return null
@ -81,14 +77,13 @@ export class BlindtestRound implements GameRound {
start(room: ServerRoom): RoundStart {
const track = takeTrack(room)
// DJ = n'importe quel humain (le contributeur peut tomber DJ).
const djId = track ? pickDj(room) : null
// DJ neutre (jamais le contributeur) : il pilote la lecture et vote à l'aveugle.
const djId = track ? pickDj(room, track.submittedBy) : null
const payload: BlindtestRoundPayload | null = track
? { trackId: track.id, youtubeId: track.youtubeId }
: null
return {
djId,
durationSec: BLINDTEST_DURATION_SEC,
payload,
secretPlayerId: track?.submittedBy,
data: track ? { track } : null,

View file

@ -17,7 +17,6 @@ const poolByRoom = new WeakMap<ServerRoom, QueueItem[]>()
const QUIZ_FORMATS: QuizFormat[] = ["mcq", "truefalse", "free"]
const IMAGE_FORMATS: QuizFormat[] = ["image_reveal"]
const REBUS_FORMATS: QuizFormat[] = ["rebus"]
function shuffle<T>(items: T[]): T[] {
const arr = [...items]
@ -33,7 +32,7 @@ async function loadGroup(
room: ServerRoom,
need: number,
formats: QuizFormat[],
allowHardcoded: boolean,
isImage: boolean,
categories: string[]
): Promise<QueueItem[]> {
if (need <= 0) {
@ -48,8 +47,8 @@ async function loadGroup(
console.error("[quiz] chargement DB échoué, fallback banque en dur", err)
}
}
if (items.length < need && allowHardcoded) {
// Complément depuis la banque en dur (quiz + rébus ; pas d'images en dur).
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) =>
@ -69,24 +68,16 @@ async function loadGroup(
export async function prepareQuizForRoom(room: ServerRoom): Promise<void> {
const quizRounds = room.settings.rounds.filter((r) => r.type === "quiz")
const needImage = quizRounds.filter((r) => r.pool === "image").length
const needRebus = quizRounds.filter((r) => r.pool === "rebus").length
const needQuiz = quizRounds.length - needImage - needRebus
const needQuiz = quizRounds.length - needImage
const cats = room.settings.categories
const quizGroup = await loadGroup(room, needQuiz, QUIZ_FORMATS, true, cats)
const imageGroup = await loadGroup(room, needImage, IMAGE_FORMATS, false, cats)
// Les rébus ne sont pas filtrés par catégorie (catégorie « Rébus » à part).
const rebusGroup = await loadGroup(room, needRebus, REBUS_FORMATS, true, [])
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
: r.pool === "rebus"
? rebusGroup
: quizGroup
const group = r.pool === "image" ? imageGroup : quizGroup
const item = group.shift()
if (item) {
queue.push(item)

View file

@ -154,82 +154,4 @@ export const QUIZ_QUESTIONS: QuizQuestion[] = [
category: "Manga",
difficulty: 3,
},
// Rébus : devine l'œuvre à partir des emojis (réponse libre, matching tolérant).
{
id: "r-sonic",
format: "rebus",
prompt: "🦔 + 💨 + 💍",
acceptedAnswers: ["Sonic", "Sonic the Hedgehog"],
category: "Rébus",
difficulty: 1,
},
{
id: "r-mario",
format: "rebus",
prompt: "🍄 + 🔨 + 🐢",
acceptedAnswers: ["Mario", "Super Mario", "Super Mario Bros"],
category: "Rébus",
difficulty: 1,
},
{
id: "r-pacman",
format: "rebus",
prompt: "🟡 + 👻 + 🕹️",
acceptedAnswers: ["Pac-Man", "Pacman", "Pac Man"],
category: "Rébus",
difficulty: 1,
},
{
id: "r-pokemon",
format: "rebus",
prompt: "⚡ + 🐭 + 🔴⚪",
acceptedAnswers: ["Pokémon", "Pokemon"],
category: "Rébus",
difficulty: 1,
},
{
id: "r-harry-potter",
format: "rebus",
prompt: "⚡ + 🧙‍♂️ + 🎓",
acceptedAnswers: ["Harry Potter", "Harry"],
category: "Rébus",
difficulty: 2,
},
{
id: "r-lotr",
format: "rebus",
prompt: "💍 + 🌋 + 🧙‍♂️",
acceptedAnswers: [
"Le Seigneur des Anneaux",
"Seigneur des Anneaux",
"Lord of the Rings",
"LOTR",
],
category: "Rébus",
difficulty: 2,
},
{
id: "r-star-wars",
format: "rebus",
prompt: "⭐ + ⚔️ + 🌌",
acceptedAnswers: ["Star Wars", "La Guerre des Étoiles"],
category: "Rébus",
difficulty: 1,
},
{
id: "r-minecraft",
format: "rebus",
prompt: "⛏️ + 🟩 + 🧟",
acceptedAnswers: ["Minecraft"],
category: "Rébus",
difficulty: 1,
},
{
id: "r-zelda",
format: "rebus",
prompt: "🗡️ + 🛡️ + 🧝‍♂️ + 🐴",
acceptedAnswers: ["Zelda", "The Legend of Zelda", "Legend of Zelda"],
category: "Rébus",
difficulty: 2,
},
]

View file

@ -44,11 +44,7 @@ function asText(answer: Answer): string | null {
/** Formats à réponse libre (saisie texte + matching tolérant). */
function isTextFormat(question: QuizQuestion): boolean {
return (
question.format === "free" ||
question.format === "image_reveal" ||
question.format === "rebus"
)
return question.format === "free" || question.format === "image_reveal"
}
/** Réponse correcte ? Selon le format de la question. */

View file

@ -52,18 +52,6 @@ export function registerRoomHandlers(
io.to(room.code).emit("room:state", rooms.toSnapshot(room))
}
// Renvoie au joueur SES propres titres (source de vérité, anti-désync client).
const emitMyTracks = (room: ServerRoom, playerId: string) => {
socket.emit("blindtest:myTracks", {
tracks: room.blindtestTracks
.filter((t) => t.submittedBy === playerId)
.map((t) => ({ trackId: t.id, title: t.title, youtubeId: t.youtubeId })),
})
}
// Synchro d'horloge : le client mesure l'offset avec l'horloge serveur.
socket.on("time:sync", (ack) => ack(Date.now()))
socket.on("room:create", (payload, ack) => {
// Le pseudo est choisi dans la room (player:setName) : on crée sans nom.
const name = cleanName(payload?.playerName) ?? ""
@ -123,7 +111,6 @@ export function registerRoomHandlers(
})
io.to(room.code).emit("player:rejoined", { playerId: player.id })
broadcastState(room)
emitMyTracks(room, player.id)
// Re-pousse la manche en cours au socket reconnecté (si partie en cours).
room.game?.resync(socket.id, player.id)
})
@ -306,7 +293,6 @@ export function registerRoomHandlers(
title: meta.title,
count: mine.length + 1,
})
emitMyTracks(room, playerId)
broadcastState(room)
})
@ -325,7 +311,6 @@ export function registerRoomHandlers(
const removed = room.blindtestTracks.length < before
ack({ ok: removed })
if (removed) {
emitMyTracks(room, playerId)
broadcastState(room)
}
})

View file

@ -1,5 +1 @@
VITE_SERVER_URL=http://localhost:3001
# Umami analytics (optionnel, prod). Vide en dev = pas de suivi.
VITE_UMAMI_SRC=
VITE_UMAMI_WEBSITE_ID=

View file

@ -15,11 +15,6 @@ COPY apps/web apps/web
ARG VITE_SERVER_URL
ENV VITE_SERVER_URL=$VITE_SERVER_URL
# Umami analytics (optionnel) — figé au build.
ARG VITE_UMAMI_SRC
ENV VITE_UMAMI_SRC=$VITE_UMAMI_SRC
ARG VITE_UMAMI_WEBSITE_ID
ENV VITE_UMAMI_WEBSITE_ID=$VITE_UMAMI_WEBSITE_ID
RUN bun run --filter web build
FROM nginx:1.27-alpine AS runner

View file

@ -1,6 +1,6 @@
{
"name": "web",
"version": "0.1.4",
"version": "0.1.0",
"type": "module",
"private": true,
"scripts": {

View file

@ -1,6 +1,6 @@
import { useEffect, useState } from "react"
import { motion } from "framer-motion"
import { Disc3, Pause, Play, Rewind, Volume2 } from "lucide-react"
import { Disc3, Pause, Play, Rewind } from "lucide-react"
import type {
BlindtestAnswer,
BlindtestMode,
@ -15,7 +15,6 @@ import { useYoutube, type YoutubeApi } from "@/lib/youtube"
import { Countdown } from "@/components/countdown"
import { Avatar } from "@/components/avatar"
import { useI18n } from "@/i18n/context"
import { serverNow } from "@/lib/clock"
const inputClass =
"border-input bg-background h-10 w-full rounded-md border px-3 py-2 text-sm focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none disabled:opacity-50"
@ -43,56 +42,22 @@ export function BlindtestView({ snapshot }: { snapshot: RoomSnapshot }) {
const truth = reveal ? (reveal.truth as BlindtestRevealTruth) : null
const showReveal = truth !== null
// Les navigateurs bloquent la lecture audible sans geste utilisateur : le non-DJ
// doit "armer" le son une fois (le DJ a déjà cliqué Play, donc dispensé).
const [audioArmed, setAudioArmed] = useState(false)
// Volume local (par joueur), mémorisé entre les manches/parties.
const [volume, setVolume] = useState(() => {
const v = Number(localStorage.getItem("nerdware-volume"))
return Number.isFinite(v) && v >= 0 && v <= 100 ? v : 100
})
useEffect(() => {
if (ready) {
api.setVolume(volume)
}
}, [ready, volume, api])
function changeVolume(v: number) {
setVolume(v)
try {
localStorage.setItem("nerdware-volume", String(v))
} catch {
// ignore
}
}
// Non-DJ : on suit le DJ via media:sync (avec compensation de latence).
useEffect(() => {
if (isDj || !ready || !mediaSync) {
return
}
const elapsed = (serverNow() - mediaSync.atServerTs) / 1000
const elapsed = (Date.now() - mediaSync.atServerTs) / 1000
if (mediaSync.action === "play") {
api.seek(mediaSync.positionSec + Math.max(0, elapsed))
if (audioArmed) {
api.play()
}
} else if (mediaSync.action === "pause") {
api.seek(mediaSync.positionSec)
api.pause()
} else {
api.seek(mediaSync.positionSec)
}
}, [mediaSync, isDj, ready, api, audioArmed])
function armAudio() {
setAudioArmed(true)
if (mediaSync && mediaSync.action !== "pause") {
const elapsed = (serverNow() - mediaSync.atServerTs) / 1000
api.seek(mediaSync.positionSec + Math.max(0, elapsed))
}
api.play()
}
}, [mediaSync, isDj, ready, api])
// Au reveal, on coupe le son.
useEffect(() => {
@ -133,36 +98,8 @@ export function BlindtestView({ snapshot }: { snapshot: RoomSnapshot }) {
</motion.div>
</div>
)}
{/* Non-DJ : geste requis pour débloquer l'audio (autoplay policy). */}
{!showReveal && !isDj && !audioArmed && (
<button
onClick={armAudio}
className="absolute inset-0 z-10 flex flex-col items-center justify-center gap-2 bg-black/60 text-white backdrop-blur-sm"
>
<Volume2 className="size-10" />
<span className="font-heading font-bold">{t.blindtest.enableSound}</span>
</button>
)}
</div>
{!showReveal && (
<div className="flex items-center gap-2">
<Volume2 className="text-muted-foreground size-4 shrink-0" />
<input
type="range"
min={0}
max={100}
value={volume}
onChange={(e) => changeVolume(Number(e.target.value))}
className="accent-primary flex-1"
aria-label={t.blindtest.volume}
/>
<span className="text-muted-foreground w-8 text-right text-xs tabular-nums">
{volume}
</span>
</div>
)}
{isDj && !showReveal && (
<DjControls ready={ready} api={api} mediaControl={mediaControl} />
)}

View file

@ -1,17 +1,15 @@
import { useEffect, useRef, useState } from "react"
import { motion } from "framer-motion"
import { useRoomStore } from "@/store/room"
import { serverNow } from "@/lib/clock"
const DANGER_FROM = 10 // secondes : seuil d'entrée en mode "bombe"
/**
* Secondes restantes, basées sur l'horloge serveur (serverNow) pour que tous les
* clients affichent le même décompte. Avant `startsAt` (préparation), on affiche
* la durée pleine sans décompter.
* Secondes restantes. Avant `startsAt` (phase de préparation / transition),
* on affiche la durée pleine sans décompter.
*/
function secondsLeft(startsAt: number, endsAt: number): number {
const now = serverNow()
const now = Date.now()
if (now < startsAt) {
return Math.ceil((endsAt - startsAt) / 1000)
}

View file

@ -10,7 +10,6 @@ import {
Music,
Play,
Plus,
Puzzle,
Shuffle,
Trash2,
type LucideIcon,
@ -44,7 +43,6 @@ const GAME_TYPES: {
{ value: "mixed", Icon: Shuffle, needsThree: false },
{ value: "quiz", Icon: Brain, needsThree: false },
{ value: "image", Icon: ImageIcon, needsThree: false },
{ value: "rebus", Icon: Puzzle, needsThree: false },
{ value: "blindtest", Icon: Headphones, needsThree: true },
]
const BOT_DIFFICULTIES = ["easy", "normal", "hard"] as const
@ -112,7 +110,6 @@ function shuffle<T>(items: T[]): T[] {
function buildRounds(opts: {
quiz: number
image: number
rebus: number
tracks: number
shuffleOrder: boolean
}): RoundConfig[] {
@ -125,10 +122,6 @@ function buildRounds(opts: {
type: "quiz" as const,
pool: "image" as const,
})),
...Array.from({ length: opts.rebus }, () => ({
type: "quiz" as const,
pool: "rebus" as const,
})),
...Array.from({ length: opts.tracks }, () => ({ type: "blindtest" as const })),
]
return opts.shuffleOrder ? shuffle(rounds) : rounds
@ -161,7 +154,6 @@ export function LobbyView({ snapshot }: { snapshot: RoomSnapshot }) {
const [quizCount, setQuizCount] = useState(5)
const [imageCount, setImageCount] = useState(5)
const [rebusCount, setRebusCount] = useState(5)
const [busy, setBusy] = useState(false)
const [error, setError] = useState<string | null>(null)
@ -187,8 +179,6 @@ export function LobbyView({ snapshot }: { snapshot: RoomSnapshot }) {
effectiveType === "quiz" || (isMixed && mixedModes.includes("quiz"))
const showImage =
effectiveType === "image" || (isMixed && mixedModes.includes("image"))
const showRebus =
effectiveType === "rebus" || (isMixed && mixedModes.includes("rebus"))
const showBlindtest =
effectiveType === "blindtest" ||
(isMixed && mixedModes.includes("blindtest") && blindtestAvailable)
@ -196,7 +186,6 @@ export function LobbyView({ snapshot }: { snapshot: RoomSnapshot }) {
const rounds = buildRounds({
quiz: showQuiz ? quizCount : 0,
image: showImage ? imageCount : 0,
rebus: showRebus ? rebusCount : 0,
tracks: showBlindtest ? totalTracks : 0,
shuffleOrder: isMixed,
})
@ -306,7 +295,7 @@ export function LobbyView({ snapshot }: { snapshot: RoomSnapshot }) {
{/* Mode de jeu */}
<div className="flex flex-col gap-2">
<span className="text-sm font-medium">{t.lobby.gameMode}</span>
<div className="grid grid-cols-3 gap-2">
<div className="grid grid-cols-4 gap-2">
{GAME_TYPES.map(({ value, Icon, needsThree }) => {
const locked = needsThree && !blindtestAvailable
const active = effectiveType === value
@ -350,7 +339,7 @@ export function LobbyView({ snapshot }: { snapshot: RoomSnapshot }) {
<div className="flex flex-col gap-2">
<span className="text-sm font-medium">{t.lobby.subModes}</span>
<div className="flex gap-2">
{(["quiz", "image", "rebus", "blindtest"] as const).map((m) => {
{(["quiz", "image", "blindtest"] as const).map((m) => {
const locked = m === "blindtest" && !blindtestAvailable
const on = mixedModes.includes(m) && !locked
const tile = (
@ -411,21 +400,6 @@ export function LobbyView({ snapshot }: { snapshot: RoomSnapshot }) {
</div>
)}
{/* Nombre de rébus */}
{showRebus && (
<div className="flex items-center justify-between">
<span className="flex items-center gap-1.5 text-sm font-medium">
<Puzzle className="size-4" /> {t.lobby.rebusCount}
</span>
<Stepper
value={rebusCount}
min={1}
max={20}
onChange={setRebusCount}
/>
</div>
)}
{/* Filtre de catégories (quiz / images) */}
{(showQuiz || showImage) && allCategories.length > 0 && (
<div className="flex flex-col gap-1.5">
@ -576,6 +550,12 @@ export function LobbyView({ snapshot }: { snapshot: RoomSnapshot }) {
)
}
interface MyTrack {
trackId: string
title: string
youtubeId: string
}
function TrackSubmission({
tracksPerPlayer,
myCount,
@ -585,12 +565,11 @@ function TrackSubmission({
}) {
const submitTrack = useRoomStore((s) => s.submitTrack)
const removeTrack = useRoomStore((s) => s.removeTrack)
// Source de vérité : le serveur renvoie nos titres (anti-désync au remount).
const myTracks = useRoomStore((s) => s.myTracks)
const { t } = useI18n()
const [url, setUrl] = useState("")
const [submitting, setSubmitting] = useState(false)
const [feedback, setFeedback] = useState<string | null>(null)
const [tracks, setTracks] = useState<MyTrack[]>([])
const quotaReached = myCount >= tracksPerPlayer
async function submit() {
@ -600,8 +579,11 @@ function TrackSubmission({
setSubmitting(true)
setFeedback(null)
const res = await submitTrack(url.trim())
if (res.accepted) {
// La liste se met à jour via l'event serveur blindtest:myTracks.
if (res.accepted && res.trackId && res.youtubeId) {
setTracks((t) => [
...t,
{ trackId: res.trackId!, title: res.title ?? "", youtubeId: res.youtubeId! },
])
setUrl("")
} else {
setFeedback(res.reason ?? t.lobby.rejected)
@ -610,7 +592,10 @@ function TrackSubmission({
}
async function remove(trackId: string) {
await removeTrack(trackId)
const ok = await removeTrack(trackId)
if (ok) {
setTracks((t) => t.filter((x) => x.trackId !== trackId))
}
}
return (
@ -619,9 +604,9 @@ function TrackSubmission({
{t.lobby.myTracks(myCount, tracksPerPlayer)}
</span>
{myTracks.length > 0 && (
{tracks.length > 0 && (
<ul className="flex flex-col gap-2">
{myTracks.map((track) => (
{tracks.map((track) => (
<li
key={track.trackId}
className="bg-muted/40 flex items-center gap-3 rounded-lg p-2"

View file

@ -35,8 +35,7 @@ export function QuizView({ snapshot }: { snapshot: RoomSnapshot }) {
const truth = reveal ? (reveal.truth as QuizRevealTruth) : null
const showReveal = truth !== null
const isImage = question.format === "image_reveal"
const isRebus = question.format === "rebus"
const isText = question.format === "free" || isImage || isRebus
const isText = question.format === "free" || isImage
const myResult = reveal
? (reveal.perPlayerResult as QuizPerPlayerResult)[playerId ?? ""]
: undefined
@ -75,15 +74,9 @@ export function QuizView({ snapshot }: { snapshot: RoomSnapshot }) {
)}
</header>
{isRebus ? (
<div className="bg-card flex min-h-32 items-center justify-center rounded-2xl p-6 text-center text-4xl leading-relaxed text-balance sm:text-5xl">
{question.prompt}
</div>
) : (
<h2 className="font-heading text-xl font-semibold text-balance">
{question.prompt}
</h2>
)}
{isImage && question.imageUrl && (
<ImageReveal
@ -99,12 +92,7 @@ export function QuizView({ snapshot }: { snapshot: RoomSnapshot }) {
)}
{isText ? (
<FreeAnswer
key={round.endsAt}
disabled={showReveal || hasVoted}
onSubmit={voteText}
t={t}
/>
<FreeAnswer disabled={showReveal || hasVoted} onSubmit={voteText} t={t} />
) : (
<div className="flex flex-col gap-2">
{(question.choices ?? []).map((choice, index) => (

View file

@ -4,7 +4,7 @@ import { AnimatePresence, motion } from "framer-motion"
import { useI18n } from "@/i18n/context"
/** Catégorie visuelle de la transition (image_reveal est distinct du quiz). */
export type TransitionKind = "quiz" | "image" | "rebus" | "blindtest"
export type TransitionKind = "quiz" | "image" | "blindtest"
const VISIBLE_MS = 1300 // durée d'affichage avant le wipe de sortie (≈ leadMs serveur)
@ -19,17 +19,11 @@ const ALL_MEDIA = import.meta.glob(
{ eager: true, import: "default" }
) as Record<string, string>
const MEDIA: Record<TransitionKind, string[]> = {
quiz: [],
image: [],
rebus: [],
blindtest: [],
}
const MEDIA: Record<TransitionKind, string[]> = { quiz: [], image: [], blindtest: [] }
const SHARED_MEDIA: string[] = []
for (const [path, url] of Object.entries(ALL_MEDIA)) {
if (path.includes("/transitions/quiz/")) MEDIA.quiz.push(url)
else if (path.includes("/transitions/image/")) MEDIA.image.push(url)
else if (path.includes("/transitions/rebus/")) MEDIA.rebus.push(url)
else if (path.includes("/transitions/blindtest/")) MEDIA.blindtest.push(url)
else SHARED_MEDIA.push(url)
}
@ -52,13 +46,6 @@ const THEME: Record<
kind: "Image",
emoji: "🖼️",
},
rebus: {
gradient: "from-amber-500 via-orange-600 to-rose-600",
accent: "text-yellow-200",
label: "RÉBUS",
kind: "Rébus",
emoji: "🧩",
},
blindtest: {
gradient: "from-fuchsia-500 via-purple-600 to-indigo-700",
accent: "text-yellow-300",

View file

@ -1,31 +0,0 @@
import { Monitor, Moon, Sun } from "lucide-react"
import { useTheme } from "@/components/theme-provider"
const OPTIONS = [
{ value: "light", Icon: Sun },
{ value: "dark", Icon: Moon },
{ value: "system", Icon: Monitor },
] as const
/** Sélecteur de thème : clair / sombre / système. */
export function ThemeToggle({ className = "" }: { className?: string }) {
const { theme, setTheme } = useTheme()
return (
<div className={`flex gap-1 ${className}`}>
{OPTIONS.map(({ value, Icon }) => (
<button
key={value}
onClick={() => setTheme(value)}
title={value}
className={`rounded-md p-1.5 transition-colors ${
theme === value
? "bg-primary/10 text-foreground"
: "text-muted-foreground hover:text-foreground"
}`}
>
<Icon className="size-4" />
</button>
))}
</div>
)
}

View file

@ -1,79 +0,0 @@
import { useState } from "react"
import { Sparkles } from "lucide-react"
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogTrigger,
} from "@workspace/ui/components/dialog"
import { PATCH_NOTES } from "@/lib/patch-notes"
import { useI18n } from "@/i18n/context"
const SEEN_KEY = "nerdware-seen-version"
/** Bouton « Nouveautés » + modale des notes de version (pastille si version vue ≠ actuelle). */
export function WhatsNew({ className = "" }: { className?: string }) {
const { t, lang } = useI18n()
const [seen, setSeen] = useState<string | null>(() => {
try {
return localStorage.getItem(SEEN_KEY)
} catch {
return null
}
})
const hasNew = seen !== __APP_VERSION__
function markSeen() {
try {
localStorage.setItem(SEEN_KEY, __APP_VERSION__)
} catch {
// ignore
}
setSeen(__APP_VERSION__)
}
return (
<Dialog
onOpenChange={(open) => {
if (open) {
markSeen()
}
}}
>
<DialogTrigger asChild>
<button
className={`text-muted-foreground hover:text-foreground relative inline-flex items-center gap-1 rounded-md px-2 py-1 text-xs font-medium transition-colors ${className}`}
>
<Sparkles className="size-4" /> {t.whatsNew.button}
{hasNew && (
<span className="bg-primary absolute -top-0.5 -right-0.5 size-2 rounded-full" />
)}
</button>
</DialogTrigger>
<DialogContent>
<DialogHeader>
<DialogTitle>{t.whatsNew.title}</DialogTitle>
</DialogHeader>
<div className="flex max-h-[60vh] flex-col gap-4 overflow-y-auto">
{PATCH_NOTES.map((note) => (
<div key={note.version} className="flex flex-col gap-1">
<p className="font-heading text-sm font-bold">
v{note.version}
<span className="text-muted-foreground text-xs font-normal">
{" "}
· {note.date}
</span>
</p>
<ul className="text-muted-foreground list-disc pl-5 text-sm">
{(lang === "fr" ? note.fr : note.en).map((line, i) => (
<li key={i}>{line}</li>
))}
</ul>
</div>
))}
</div>
</DialogContent>
</Dialog>
)
}

View file

@ -10,10 +10,6 @@ export const en: Dict = {
loading: "Loading…",
error: "Error",
},
whatsNew: {
button: "What's new",
title: "What's new",
},
home: {
tagline: "Geek culture party game",
create: "Create a room",
@ -60,7 +56,6 @@ export const en: Dict = {
quizCount: "Quiz questions",
imageCount: "Images to guess",
imageHint: "Requires “Image” questions created in the back-office.",
rebusCount: "Rebuses to guess",
categories: "Categories",
allCategories: "All",
botLevel: "🤖 Bot difficulty",
@ -84,13 +79,11 @@ export const en: Dict = {
mixed: "Mixed",
quiz: "Quiz",
image: "Images",
rebus: "Rebus",
blindtest: "Blindtest",
},
mixModes: {
quiz: "Quiz",
image: "Images",
rebus: "Rebus",
blindtest: "Blindtest",
},
blindtestModes: {
@ -116,8 +109,6 @@ export const en: Dict = {
validate: "Submit",
},
blindtest: {
enableSound: "Enable sound",
volume: "Volume",
djHint: "You're the DJ 🎧 — control playback (and vote like everyone)",
play: "Play",
pause: "Pause",
@ -145,7 +136,6 @@ export const en: Dict = {
kind: {
quiz: "Question",
image: "Image",
rebus: "Rebus",
blindtest: "Track",
},
ready: "READY ?!",

View file

@ -8,10 +8,6 @@ export const fr = {
loading: "Chargement…",
error: "Erreur",
},
whatsNew: {
button: "Nouveautés",
title: "Nouveautés",
},
home: {
tagline: "Party game culture geek",
create: "Créer une room",
@ -58,7 +54,6 @@ export const fr = {
quizCount: "Questions de quiz",
imageCount: "Images à deviner",
imageHint: "Nécessite des questions « Image » créées dans le back-office.",
rebusCount: "Rébus à deviner",
categories: "Catégories",
allCategories: "Toutes",
botLevel: "🤖 Niveau des bots",
@ -82,13 +77,11 @@ export const fr = {
mixed: "Mixte",
quiz: "Quiz",
image: "Images",
rebus: "Rébus",
blindtest: "Blindtest",
},
mixModes: {
quiz: "Quiz",
image: "Images",
rebus: "Rébus",
blindtest: "Blindtest",
},
blindtestModes: {
@ -114,8 +107,6 @@ export const fr = {
validate: "Valider",
},
blindtest: {
enableSound: "Activer le son",
volume: "Volume",
djHint: "Tu es le DJ 🎧 — pilote la lecture (et vote comme les autres)",
play: "Play",
pause: "Pause",
@ -144,7 +135,6 @@ export const fr = {
kind: {
quiz: "Question",
image: "Image",
rebus: "Rébus",
blindtest: "Titre",
},
ready: "PRÊT ?!",

View file

@ -1,20 +0,0 @@
// Umami analytics : on injecte le script seulement si les variables de build
// sont présentes (donc pas en dev → pas de trafic local dans les stats).
// L'ID de site est public (visible dans le HTML), ce n'est pas un secret.
const SRC = import.meta.env.VITE_UMAMI_SRC
const WEBSITE_ID = import.meta.env.VITE_UMAMI_WEBSITE_ID
export function initAnalytics(): void {
if (!SRC || !WEBSITE_ID) {
return
}
if (document.querySelector("script[data-website-id]")) {
return
}
const script = document.createElement("script")
script.defer = true
script.src = SRC
script.setAttribute("data-website-id", WEBSITE_ID)
document.head.appendChild(script)
}

View file

@ -1,45 +0,0 @@
// Synchro d'horloge avec le serveur : on estime l'offset (horloge serveur
// horloge locale) pour que tous les clients affichent le même décompte, quel que
// soit le décalage d'horloge de chaque machine.
import { socket } from "./socket"
let offset = 0
/** Instant courant aligné sur l'horloge serveur. */
export function serverNow(): number {
return Date.now() + offset
}
/** Une mesure : renvoie [rtt, offset estimé]. */
async function syncOnce(): Promise<[number, number]> {
const t0 = Date.now()
const serverTime = await new Promise<number>((resolve) =>
socket.emit("time:sync", resolve)
)
const t1 = Date.now()
const rtt = t1 - t0
// Au moment de la réponse (t1), l'horloge serveur valait ~ serverTime + rtt/2.
return [rtt, serverTime + rtt / 2 - t1]
}
/** Plusieurs mesures : on garde celle de plus faible latence (plus fiable). */
async function sync(): Promise<void> {
let bestRtt = Infinity
for (let i = 0; i < 3; i++) {
try {
const [rtt, est] = await syncOnce()
if (rtt < bestRtt) {
bestRtt = rtt
offset = est
}
} catch {
return
}
}
}
socket.on("connect", () => void sync())
if (socket.connected) {
void sync()
}

View file

@ -1,56 +0,0 @@
// Notes de version côté joueur (curées, bilingues). Sous-ensemble grand public
// du CHANGELOG.md (qui reste la source de vérité technique).
export interface PatchNote {
version: string
date: string
fr: string[]
en: string[]
}
export const PATCH_NOTES: PatchNote[] = [
{
version: "0.1.4",
date: "2026-06-12",
fr: ["Nouveau mode Rébus 🧩 : devine l'œuvre à partir des emojis !"],
en: ["New Rebus mode 🧩: guess the work from emojis!"],
},
{
version: "0.1.2",
date: "2026-06-12",
fr: ["Statistiques d'audience (Umami)."],
en: ["Audience analytics (Umami)."],
},
{
version: "0.1.1",
date: "2026-06-12",
fr: [
"Blindtest : bouton « Activer le son » et volume réglable.",
"Blindtest porté à 90 s ; le DJ peut désormais être n'importe qui.",
"« Qui l'a ajouté ? » : l'état de validation est caché (plus de triche).",
"Thème clair / sombre / système.",
"Décompte synchronisé sur tous les appareils.",
],
en: [
"Blindtest: “Enable sound” button and volume control.",
"Blindtest is now 90 s; the DJ can be anyone.",
"“Who added it?”: vote status is hidden (no more giveaway).",
"Light / dark / system theme.",
"Countdown synced across all devices.",
],
},
{
version: "0.1.0",
date: "2026-06-11",
fr: [
"Première version : Quiz, Images, Blindtest et mode Mixte.",
"Reconnexion après refresh, bots, historique des parties.",
"Interface FR / EN.",
],
en: [
"First release: Quiz, Images, Blindtest and Mixed mode.",
"Reconnect after refresh, bots, game history.",
"FR / EN interface.",
],
},
]

View file

@ -29,8 +29,6 @@ export interface YoutubeApi {
seek: (seconds: number) => void
time: () => number
duration: () => number
/** Volume 0100. */
setVolume: (v: number) => void
}
/**
@ -67,10 +65,6 @@ export function useYoutube(youtubeId: string) {
modestbranding: 1,
rel: 0,
playsinline: 1,
// Évite l'avertissement postMessage "target origin does not match"
// et fiabilise la transmission des commandes au lecteur.
enablejsapi: 1,
origin: window.location.origin,
},
events: {
onReady: () => {
@ -97,7 +91,6 @@ export function useYoutube(youtubeId: string) {
seek: (seconds) => playerRef.current?.seekTo(seconds, true),
time: () => playerRef.current?.getCurrentTime() ?? 0,
duration: () => playerRef.current?.getDuration() ?? 0,
setVolume: (v) => playerRef.current?.setVolume(v),
}),
[]
)

View file

@ -6,9 +6,6 @@ import "@workspace/ui/globals.css"
import { App } from "./App.tsx"
import { ThemeProvider } from "@/components/theme-provider.tsx"
import { I18nProvider } from "@/i18n/provider"
import { initAnalytics } from "@/lib/analytics"
initAnalytics()
const queryClient = new QueryClient()

View file

@ -180,9 +180,7 @@ function QuestionRow({
{q.lang.toUpperCase()} · {q.source}
{!q.active && " · désactivée"}
</p>
{q.format === "free" ||
q.format === "image_reveal" ||
q.format === "rebus" ? (
{q.format === "free" || q.format === "image_reveal" ? (
<p className="text-muted-foreground text-xs">
{q.acceptedAnswers?.join(", ")}
</p>
@ -260,7 +258,7 @@ function QuestionForm({ onCreated }: { onCreated: () => void }) {
function submit() {
const input: NewQuestionInput = { format, prompt, category, difficulty, lang }
if (format === "free" || format === "rebus") {
if (format === "free") {
input.acceptedAnswers = answers
.split("\n")
.map((a) => a.trim())
@ -298,7 +296,6 @@ function QuestionForm({ onCreated }: { onCreated: () => void }) {
<option value="truefalse">Vrai / Faux</option>
<option value="free">Réponse libre</option>
<option value="image_reveal">Image à deviner</option>
<option value="rebus">Rébus</option>
</select>
<select
className={inputClass}
@ -415,7 +412,7 @@ function QuestionForm({ onCreated }: { onCreated: () => void }) {
</div>
)}
{(format === "free" || format === "image_reveal" || format === "rebus") && (
{(format === "free" || format === "image_reveal") && (
<textarea
className={`${inputClass} h-24 py-2`}
placeholder="Réponses acceptées (une par ligne)"

View file

@ -7,8 +7,6 @@ import { useRoomStore } from "@/store/room"
import { useI18n } from "@/i18n/context"
import { errorMessage } from "@/i18n/error"
import { LanguageToggle } from "@/i18n/language-toggle"
import { ThemeToggle } from "@/components/theme-toggle"
import { WhatsNew } from "@/components/whats-new"
const inputClass =
"border-input bg-background ring-offset-background focus-visible:ring-ring h-10 w-full rounded-md border px-3 py-2 text-sm focus-visible:ring-2 focus-visible:outline-none disabled:opacity-50"
@ -62,11 +60,7 @@ export function HomePage() {
return (
<div className="relative flex min-h-svh items-center justify-center overflow-hidden p-6">
<div className="absolute top-4 right-4 z-10 flex items-center gap-2">
<WhatsNew />
<ThemeToggle />
<LanguageToggle />
</div>
<LanguageToggle className="absolute top-4 right-4 z-10" />
{/* Halo animé */}
<motion.div
aria-hidden

View file

@ -19,7 +19,6 @@ import { RoundTransition } from "@/components/round-transition"
import { PseudoScreen } from "@/components/pseudo-screen"
import { useI18n } from "@/i18n/context"
import { LanguageToggle } from "@/i18n/language-toggle"
import { ThemeToggle } from "@/components/theme-toggle"
export function RoomPage({ code }: { code: string }) {
const [, navigate] = useLocation()
@ -101,7 +100,6 @@ export function RoomPage({ code }: { code: string }) {
{connected ? t.room.connected : t.room.disconnected}
</TooltipContent>
</Tooltip>
<ThemeToggle />
<LanguageToggle />
<Button
size="sm"
@ -131,15 +129,7 @@ export function RoomPage({ code }: { code: string }) {
<PlayerCards
snapshot={snapshot}
playerId={playerId}
// En blindtest "qui l'a ajouté" (et mixte), on cache l'état de
// vote : le contributeur ne vote jamais → sinon il est repérable.
showVoteStatus={
snapshot.status === "in_round" &&
!(
round?.type === "blindtest" &&
snapshot.settings.blindtestMode !== "title_artist"
)
}
showVoteStatus={snapshot.status === "in_round"}
votedIds={voteProgress?.voted}
/>
{round?.type === "blindtest" ? (

View file

@ -6,7 +6,6 @@ import {
type ErrorPayload,
type MediaControlPayload,
type MediaSyncPayload,
type MyTrackInfo,
type PlayerScore,
type RoomCreatedPayload,
type RoomSnapshot,
@ -18,7 +17,6 @@ import {
type VoteAckPayload,
} from "@nerdware/shared"
import { socket } from "@/lib/socket"
import "@/lib/clock" // démarre la synchro d'horloge avec le serveur
import {
clearSession,
getSession,
@ -53,8 +51,6 @@ interface RoomState {
pseudoSet: boolean
snapshot: RoomSnapshot | null
lastError: ErrorPayload | null
/** Mes titres blindtest (renvoyés par le serveur, source de vérité). */
myTracks: MyTrackInfo[]
// État de jeu (poussé par le moteur serveur).
round: ActiveRound | null
@ -68,8 +64,8 @@ interface RoomState {
mediaSync: MediaSyncPayload | null
boomKey: number
roundKey: number
/** Catégorie visuelle de la manche (image_reveal / rébus distincts du quiz). */
roundKind: "quiz" | "image" | "rebus" | "blindtest"
/** Catégorie visuelle de la manche (image_reveal distinct du quiz). */
roundKind: "quiz" | "image" | "blindtest"
/** Le mode a-t-il changé par rapport à la manche précédente ? */
roundModeChanged: boolean
@ -100,7 +96,6 @@ export const useRoomStore = create<RoomState>((set, get) => ({
pseudoSet: !!saved?.name,
snapshot: null,
lastError: null,
myTracks: [],
round: null,
voteProgress: null,
reveal: null,
@ -247,7 +242,6 @@ export const useRoomStore = create<RoomState>((set, get) => ({
pseudoSet: false,
snapshot: null,
lastError: null,
myTracks: [],
round: null,
voteProgress: null,
reveal: null,
@ -309,9 +303,6 @@ socket.on("room:state", (snapshot) =>
)
)
socket.on("error", (error) => useRoomStore.setState({ lastError: error }))
socket.on("blindtest:myTracks", ({ tracks }) =>
useRoomStore.setState({ myTracks: tracks })
)
socket.on("round:start", (payload) =>
useRoomStore.setState((s) => {
@ -321,8 +312,6 @@ socket.on("round:start", (payload) =>
? "blindtest"
: fmt === "image_reveal"
? "image"
: fmt === "rebus"
? "rebus"
: "quiz"
return {
round: {

View file

@ -1,2 +0,0 @@
// Version de l'app injectée par Vite (define), depuis apps/web/package.json.
declare const __APP_VERSION__: string

View file

@ -24,7 +24,6 @@ declare global {
getCurrentTime(): number
getDuration(): number
getPlayerState(): number
setVolume(volume: number): void
loadVideoById(id: string): void
destroy(): void
}

View file

@ -1,19 +1,11 @@
import path from "path"
import { readFileSync } from "node:fs"
import tailwindcss from "@tailwindcss/vite"
import react from "@vitejs/plugin-react"
import { defineConfig } from "vite"
const pkg = JSON.parse(
readFileSync(path.resolve(__dirname, "package.json"), "utf-8")
) as { version: string }
// https://vite.dev/config/
export default defineConfig({
plugins: [react(), tailwindcss()],
define: {
__APP_VERSION__: JSON.stringify(pkg.version),
},
resolve: {
alias: {
"@": path.resolve(__dirname, "./src"),

View file

@ -34,12 +34,7 @@ services:
NODE_ENV: production
HOST: 0.0.0.0
PORT: 3001
# Connexion via PG* (mot de passe passé tel quel, pas d'encodage d'URL).
PGHOST: postgres
PGPORT: 5432
PGUSER: ${POSTGRES_USER:-nerdware}
PGPASSWORD: ${POSTGRES_PASSWORD:-nerdware}
PGDATABASE: ${POSTGRES_DB:-nerdware}
DATABASE_URL: postgres://${POSTGRES_USER:-nerdware}:${POSTGRES_PASSWORD:-nerdware}@postgres:5432/${POSTGRES_DB:-nerdware}
ADMIN_TOKEN: ${ADMIN_TOKEN}
CORS_ORIGINS: ${CORS_ORIGINS}
UPLOADS_DIR: /data/uploads
@ -54,8 +49,6 @@ services:
dockerfile: apps/web/Dockerfile
args:
VITE_SERVER_URL: ${VITE_SERVER_URL}
VITE_UMAMI_SRC: ${VITE_UMAMI_SRC:-}
VITE_UMAMI_WEBSITE_ID: ${VITE_UMAMI_WEBSITE_ID:-}
restart: unless-stopped
depends_on:
- server

View file

@ -1,6 +1,6 @@
{
"name": "nerdware",
"version": "0.1.4",
"version": "0.1.0",
"private": true,
"scripts": {
"build": "turbo build",

View file

@ -1,6 +1,6 @@
{
"name": "@nerdware/shared",
"version": "0.1.4",
"version": "0.1.0",
"type": "module",
"private": true,
"scripts": {

View file

@ -8,10 +8,10 @@ export type RoomStatus = "lobby" | "in_round" | "reveal" | "scores" | "ended"
export type RoundType = "blindtest" | "quiz"
/** Type de partie choisi au lobby : mélange par défaut, ou un seul mode. */
export type GameType = "mixed" | "quiz" | "image" | "rebus" | "blindtest"
export type GameType = "mixed" | "quiz" | "image" | "blindtest"
/** Sous-modes activables quand la partie est "mixed". */
export type MixMode = "quiz" | "image" | "rebus" | "blindtest"
export type MixMode = "quiz" | "image" | "blindtest"
/** Modes de blindtest, déterminent la forme du vote et le barème. */
export type BlindtestMode = "title_artist" | "who_added" | "mixed"
@ -20,12 +20,7 @@ export type BlindtestMode = "title_artist" | "who_added" | "mixed"
export type BotDifficulty = "easy" | "normal" | "hard"
/** Formats de question quiz. */
export type QuizFormat =
| "mcq"
| "truefalse"
| "free"
| "image_reveal"
| "rebus"
export type QuizFormat = "mcq" | "truefalse" | "free" | "image_reveal"
/** Joueur connecté à une room. */
export interface Player {
@ -39,8 +34,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", images ou rébus). */
pool?: "quiz" | "image" | "rebus"
/** 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. */

View file

@ -78,17 +78,6 @@ export interface RemoveTrackPayload {
trackId: string
}
/** Un titre soumis par le joueur lui-même (renvoyé en privé, source de vérité). */
export interface MyTrackInfo {
trackId: string
title: string
youtubeId: string
}
export interface MyTracksPayload {
tracks: MyTrackInfo[]
}
export interface RoundStartPayload {
type: RoundType
djId?: string
@ -158,7 +147,6 @@ export type Ack<T> = (result: { ok: true; data: T } | { ok: false; error: ErrorP
/** CLIENT → SERVER */
export interface ClientToServerEvents {
"time:sync": (ack: (serverNow: number) => void) => void
"room:create": (payload: RoomCreatePayload, ack: Ack<RoomCreatedPayload>) => void
"room:join": (payload: RoomJoinPayload, ack: Ack<RoomCreatedPayload>) => void
"room:rejoin": (payload: RejoinPayload, ack: Ack<RoomCreatedPayload>) => void
@ -187,7 +175,6 @@ export interface ServerToClientEvents {
"player:left": (payload: PlayerRefPayload) => void
"player:rejoined": (payload: PlayerRefPayload) => void
"blindtest:submitOk": (payload: SubmitOkPayload) => void
"blindtest:myTracks": (payload: MyTracksPayload) => void
"round:start": (payload: RoundStartPayload) => void
"media:sync": (payload: MediaSyncPayload) => void
"round:voteAck": (payload: VoteAckPayload) => void

View file

@ -1,94 +0,0 @@
import * as React from "react"
import { Dialog as DialogPrimitive } from "radix-ui"
import { X } from "lucide-react"
import { cn } from "@workspace/ui/lib/utils"
function Dialog(props: React.ComponentProps<typeof DialogPrimitive.Root>) {
return <DialogPrimitive.Root data-slot="dialog" {...props} />
}
function DialogTrigger(
props: React.ComponentProps<typeof DialogPrimitive.Trigger>
) {
return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />
}
function DialogClose(props: React.ComponentProps<typeof DialogPrimitive.Close>) {
return <DialogPrimitive.Close data-slot="dialog-close" {...props} />
}
function DialogContent({
className,
children,
...props
}: React.ComponentProps<typeof DialogPrimitive.Content>) {
return (
<DialogPrimitive.Portal>
<DialogPrimitive.Overlay
data-slot="dialog-overlay"
className="data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/60 backdrop-blur-sm"
/>
<DialogPrimitive.Content
data-slot="dialog-content"
className={cn(
"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-1/2 left-1/2 z-50 grid w-[calc(100%-2rem)] max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 rounded-2xl border p-6 shadow-lg duration-200",
className
)}
{...props}
>
{children}
<DialogPrimitive.Close className="ring-offset-background focus:ring-ring absolute top-4 right-4 rounded-md opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:outline-none">
<X className="size-4" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
</DialogPrimitive.Content>
</DialogPrimitive.Portal>
)
}
function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
data-slot="dialog-header"
className={cn("flex flex-col gap-1.5 text-center sm:text-left", className)}
{...props}
/>
)
}
function DialogTitle({
className,
...props
}: React.ComponentProps<typeof DialogPrimitive.Title>) {
return (
<DialogPrimitive.Title
data-slot="dialog-title"
className={cn("font-heading text-lg font-bold", className)}
{...props}
/>
)
}
function DialogDescription({
className,
...props
}: React.ComponentProps<typeof DialogPrimitive.Description>) {
return (
<DialogPrimitive.Description
data-slot="dialog-description"
className={cn("text-muted-foreground text-sm", className)}
{...props}
/>
)
}
export {
Dialog,
DialogTrigger,
DialogClose,
DialogContent,
DialogHeader,
DialogTitle,
DialogDescription,
}