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

feat(dashboard): show round info and results for active and finished games
Some checks failed
CI/CD - Francia Ocupada (La Resistencia) / build-and-deploy (push) Failing after 10s
Details

Browse Source
This commit is contained in:
Resistencia Dev
2025-12-22 23:03:31 +01:00
parent 1ad4f46aa4
commit c4c08c64c3
4 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,6 +250,11 @@ export default function Dashboard() {
<div className={`px-3 py-1 rounded text-[10px] font-black uppercase tracking-widest border ${game.status === 'WAITING' ? 'bg-orange-500/10 text-orange-500 border-orange-500/20' : 'bg-green-500/10 text-green-500 border-green-500/20'}`}>
{game.status}
</div>
{game.currentRound > 0 && (
<div className="bg-white/10 px-3 py-1 rounded text-[10px] font-black uppercase tracking-widest border border-white/10">
Ronda {game.currentRound}
</div>
)}
<ChevronDown
size={20}
className={`text-gray-500 transition-transform duration-300 ${expandedGames.has(game.id) ? 'rotate-180' : ''}`}
@@ -383,6 +388,26 @@ export default function Dashboard() {
<span>AGENTES:</span>
<span className="text-gray-300">{entry.players.split(',').length}</span>
</div>
{entry.rounds_played > 0 && (
<>
<div className="flex justify-between">
<span>RONDAS:</span>
<span className="text-gray-300">{entry.rounds_played}</span>
</div>
<div className="flex justify-between items-center pt-2">
<span>RESULTADOS:</span>
<div className="flex gap-1">
{entry.round_results && entry.round_results.split(',').map((res: string, idx: number) => (
<div
key={idx}
className={`w-3 h-3 rounded-full ${res === 'true' ? 'bg-blue-500' : 'bg-red-500'}`}
title={res === 'true' ? 'Victoria Resistencia' : 'Victoria Espías'}
/>
))}
</div>
</div>
</>
)}
{entry.players && (
<div className="pt-2 border-t border-white/5 mt-2">
<p className="mb-1 opacity-50">PARTICIPANTES:</p>

1
client/tsconfig.tsbuildinfo Normal file
View File

File diff suppressed because one or more lines are too long

23
server/src/db.ts
View File

@@ -25,6 +25,14 @@ export const initDb = async () => {
status TEXT DEFAULT 'active' -- 'active', 'finished', 'aborted'
);
`);
// Migration: Add new columns if they don't exist
await client.query(`
ALTER TABLE game_logs
ADD COLUMN IF NOT EXISTS rounds_played INTEGER DEFAULT 0,
ADD COLUMN IF NOT EXISTS round_results TEXT DEFAULT '';
`);
console.log('[DB] Base de datos inicializada correctamente');
} catch (err) {
console.error('[DB] Error al inicializar base de datos:', err);
@@ -58,11 +66,20 @@ export const updateGamePlayers = async (roomId: string, players: string[]) => {
};
// Registrar fin de partida
export const logGameEnd = async (roomId: string, winner: string | null = null, aborted: boolean = false) => {
export const logGameEnd = async (
roomId: string,
winner: string | null = null,
aborted: boolean = false,
roundsPlayed: number = 0,
roundResults: boolean[] = []
) => {
try {
// Convert boolean[] to string "true,false,true" or simplified "W,L,W"
const resultsStr = roundResults.join(',');
await pool.query(
'UPDATE game_logs SET finished_at = CURRENT_TIMESTAMP, winner = $1, status = $2 WHERE room_id = $3 AND status = $4',
[winner, aborted ? 'aborted' : 'finished', roomId, 'active']
'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',
[winner, aborted ? 'aborted' : 'finished', roundsPlayed, resultsStr, roomId, 'active']
);
} catch (err) {
console.error('[DB] Error al registrar fin de partida:', err);

7
server/src/index.ts
View File

@@ -90,6 +90,7 @@ const getAdminData = async () => {
status: g.state.phase,
currentPlayers: g.state.players.length,
maxPlayers: g.maxPlayers,
currentRound: g.state.currentRound,
players: g.state.players.map(p => ({ id: p.id, name: p.name }))
}));
@@ -348,7 +349,7 @@ io.on('connection', (socket) => {
io.in(roomId).socketsLeave(roomId);
// LOG EN DB
logGameEnd(roomId, game.state.winner, false);
logGameEnd(roomId, game.state.winner, false, game.state.currentRound, game.state.questResults);
broadcastAdminUpdate();
}
});
@@ -381,7 +382,7 @@ io.on('connection', (socket) => {
io.in(roomId).socketsLeave(roomId);
// LOG EN DB COMO ABORTADA
logGameEnd(roomId, null, true);
logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults);
broadcastAdminUpdate();
console.log(`[LEAVE_GAME] ${playerName} abandonó la partida ${roomId}. Partida eliminada.`);
@@ -469,7 +470,7 @@ io.on('connection', (socket) => {
io.in(roomId).socketsLeave(roomId);
// Log como abortada por admin
await logGameEnd(roomId, null, true);
await logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults);
socket.emit('admin_action_success');
broadcastAdminUpdate();
}