marti/FranciaOcupada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dashboard): track matches played per session instead of rounds in history
Some checks failed
CI/CD - Francia Ocupada (La Resistencia) / build-and-deploy (push) Failing after 6s
Details

Browse Source
This commit is contained in:
Resistencia Dev
2025-12-22 23:35:58 +01:00
parent 904bd80bd5
commit 1a68ed2a5c
5 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/src/app/dashboard/page.tsx
View File

@@ -388,24 +388,26 @@ export default function Dashboard() {
<span>AGENTES:</span> <span>AGENTES:</span>
<span className="text-gray-300">{entry.players.split(',').length}</span> <span className="text-gray-300">{entry.players.split(',').length}</span>
</div> </div>
{entry.rounds_played > 0 && ( {entry.matches_played > 0 && (
<> <>
<div className="flex justify-between"> <div className="flex justify-between">
<span>RONDAS:</span> <span>PARTIDAS:</span>
<span className="text-gray-300">{entry.rounds_played}</span> <span className="text-gray-300">{entry.matches_played}</span>
</div> </div>
<div className="flex justify-between items-center pt-2"> {entry.match_results && entry.match_results.length > 0 && (
<span>RESULTADOS:</span> <div className="flex justify-between items-center pt-2">
<div className="flex gap-1"> <span>RESULTADOS:</span>
{entry.round_results && entry.round_results.split(',').map((res: string, idx: number) => ( <div className="flex gap-1">
<div {entry.match_results.split(',').map((res: string, idx: number) => (
key={idx} <div
className={`w-3 h-3 rounded-full ${res === 'true' ? 'bg-blue-500' : 'bg-red-500'}`} key={idx}
title={res === 'true' ? 'Victoria Resistencia' : 'Victoria Espías'} className={`w-3 h-3 rounded-full ${res === 'aliados' ? 'bg-blue-500' : 'bg-red-500'}`}
/> title={res === 'aliados' ? 'Victoria Aliados' : 'Victoria Nazis'}
))} />
))}
</div>
</div> </div>
</div> )}
</> </>
)} )}
{entry.players && ( {entry.players && (

18
server/src/db.ts
View File

@@ -30,7 +30,9 @@ export const initDb = async () => {
await client.query(` await client.query(`
ALTER TABLE game_logs ALTER TABLE game_logs
ADD COLUMN IF NOT EXISTS rounds_played INTEGER DEFAULT 0, ADD COLUMN IF NOT EXISTS rounds_played INTEGER DEFAULT 0,
ADD COLUMN IF NOT EXISTS round_results TEXT DEFAULT ''; ADD COLUMN IF NOT EXISTS round_results TEXT DEFAULT '',
ADD COLUMN IF NOT EXISTS matches_played INTEGER DEFAULT 1,
ADD COLUMN IF NOT EXISTS match_results TEXT DEFAULT '';
`); `);
console.log('[DB] Base de datos inicializada correctamente'); console.log('[DB] Base de datos inicializada correctamente');
@@ -71,15 +73,19 @@ export const logGameEnd = async (
winner: string | null = null, winner: string | null = null,
aborted: boolean = false, aborted: boolean = false,
roundsPlayed: number = 0, roundsPlayed: number = 0,
roundResults: boolean[] = [] roundResults: boolean[] = [],
matchesPlayed: number = 1,
matchResults: string[] = []
) => { ) => {
try { try {
// Convert boolean[] to string "true,false,true" or simplified "W,L,W" // Convert boolean[] to string "true,false,true"
const resultsStr = roundResults.join(','); const roundResultsStr = roundResults.map(r => r === true ? 'true' : r === false ? 'false' : '').filter(r => r).join(',');
// matchResults is already string[] like ["aliados", "alemanes"]
const matchResultsStr = matchResults.join(',');
await pool.query( await pool.query(
'UPDATE game_logs SET finished_at = CURRENT_TIMESTAMP, winner = $1, status = $2, rounds_played = $3, round_results = $4 WHERE room_id = $5 AND status = $6', 'UPDATE game_logs SET finished_at = CURRENT_TIMESTAMP, winner = $1, status = $2, rounds_played = $3, round_results = $4, matches_played = $5, match_results = $6 WHERE room_id = $7 AND status = $8',
[winner, aborted ? 'aborted' : 'finished', roundsPlayed, resultsStr, roomId, 'active'] [winner, aborted ? 'aborted' : 'finished', roundsPlayed, roundResultsStr, matchesPlayed, matchResultsStr, roomId, 'active']
); );
} catch (err) { } catch (err) {
console.error('[DB] Error al registrar fin de partida:', err); console.error('[DB] Error al registrar fin de partida:', err);

14
server/src/index.ts
View File

@@ -349,8 +349,10 @@ io.on('connection', (socket) => {
// Desconectar a todos los jugadores de la sala // Desconectar a todos los jugadores de la sala
io.in(roomId).socketsLeave(roomId); io.in(roomId).socketsLeave(roomId);
// LOG EN DB // LOG EN DB - Incluir resultado de la partida actual en matchResults
logGameEnd(roomId, game.state.winner, false, game.state.currentRound, game.state.questResults); const finalMatchResults = [...game.state.matchResults];
if (game.state.winner) finalMatchResults.push(game.state.winner);
logGameEnd(roomId, game.state.winner, false, game.state.currentRound, game.state.questResults, game.state.matchNumber, finalMatchResults);
broadcastAdminUpdate(); broadcastAdminUpdate();
} }
}); });
@@ -383,7 +385,9 @@ io.on('connection', (socket) => {
io.in(roomId).socketsLeave(roomId); io.in(roomId).socketsLeave(roomId);
// LOG EN DB COMO ABORTADA // LOG EN DB COMO ABORTADA
logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults); const finalMatchResults = [...game.state.matchResults];
if (game.state.winner) finalMatchResults.push(game.state.winner);
logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults, game.state.matchNumber, finalMatchResults);
broadcastAdminUpdate(); broadcastAdminUpdate();
console.log(`[LEAVE_GAME] ${playerName} abandonó la partida ${roomId}. Partida eliminada.`); console.log(`[LEAVE_GAME] ${playerName} abandonó la partida ${roomId}. Partida eliminada.`);
@@ -471,7 +475,9 @@ io.on('connection', (socket) => {
io.in(roomId).socketsLeave(roomId); io.in(roomId).socketsLeave(roomId);
// Log como abortada por admin // Log como abortada por admin
await logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults); const finalMatchResults = [...game.state.matchResults];
if (game.state.winner) finalMatchResults.push(game.state.winner);
await logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults, game.state.matchNumber, finalMatchResults);
socket.emit('admin_action_success'); socket.emit('admin_action_success');
broadcastAdminUpdate(); broadcastAdminUpdate();
} }

8
server/src/models/Game.ts
View File

@@ -44,7 +44,8 @@ export class Game {
revealedVotes: [], revealedVotes: [],
history: [], history: [],
hostId: hostId, hostId: hostId,
matchNumber: 1 matchNumber: 1,
matchResults: []
}; };
} }
@@ -370,6 +371,11 @@ export class Game {
restartGame() { restartGame() {
this.log('=== REINICIANDO PARTIDA ==='); this.log('=== REINICIANDO PARTIDA ===');
// Guardar resultado de la partida actual antes de resetear
if (this.state.winner) {
this.state.matchResults.push(this.state.winner);
}
// Incrementar contador de partidas y resetear variables de juego // Incrementar contador de partidas y resetear variables de juego
this.state.matchNumber++; this.state.matchNumber++;
this.state.currentRound = 1; this.state.currentRound = 1;

1
shared/types.ts
View File

@@ -90,6 +90,7 @@ export interface GameState {
winner?: Faction; winner?: Faction;
history: string[]; // Log de acciones para mostrar en pantalla history: string[]; // Log de acciones para mostrar en pantalla
matchNumber: number; // Número de partida en esta operación (se incrementa con cada restart) matchNumber: number; // Número de partida en esta operación (se incrementa con cada restart)
matchResults: Faction[]; // Resultados de cada partida (quién ganó)
} }
// Configuración de jugadores por partida (según tus reglas) // Configuración de jugadores por partida (según tus reglas)