From 1f9c290010397a8b6a1b5dcb96ecec317640edb4 Mon Sep 17 00:00:00 2001 From: Nathan FONTEYNE Date: Thu, 9 Jul 2026 16:48:09 +0200 Subject: [PATCH] update: dashboard page admin --- public/admin.html | 24 +++++++++ public/css/style.css | 29 +++++++++++ public/js/admin.js | 75 +++++++++++++++++++++++++++++ public/js/nav.js | 1 + src/auth/routes.js | 1 - src/repositories/setlistsRepo.js | 21 ++++++++ src/repositories/songsRepo.js | 11 +++++ src/repositories/suggestionsRepo.js | 13 +++++ src/repositories/usersRepo.js | 17 ++++++- src/routes/admin.js | 56 +++++++++++++++++++++ src/routes/index.js | 2 + 11 files changed, 248 insertions(+), 2 deletions(-) create mode 100644 public/admin.html create mode 100644 public/js/admin.js create mode 100644 src/routes/admin.js diff --git a/public/admin.html b/public/admin.html new file mode 100644 index 0000000..668ee42 --- /dev/null +++ b/public/admin.html @@ -0,0 +1,24 @@ + + + + + +Administration — Octane + + + + +
+ +
+
+
+
Chargement…
+
+ + + + + + + diff --git a/public/css/style.css b/public/css/style.css index 85dcc3e..122cdb8 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -1294,3 +1294,32 @@ a.back-link:hover { color: var(--accent); } } .vote-review-detail { margin-top: 0.75rem; } + +/* ---------- Admin dashboard ---------- */ + +.admin-user-list { display: flex; flex-direction: column; gap: 0.6rem; } + +.admin-user-row { + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.75rem; + border: 1px solid var(--border); + border-radius: var(--radius-sm); + padding: 0.6rem 0.85rem; + flex-wrap: wrap; +} + +.admin-user-identity { + display: flex; + align-items: center; + gap: 0.75rem; +} + +.admin-user-counts { + display: flex; + gap: 0.9rem; + color: var(--muted); + font-size: 0.88rem; + white-space: nowrap; +} diff --git a/public/js/admin.js b/public/js/admin.js new file mode 100644 index 0000000..06f1881 --- /dev/null +++ b/public/js/admin.js @@ -0,0 +1,75 @@ +function formatDate(dateStr) { + const d = new Date(dateStr); + return d.toLocaleDateString('fr-FR', { year: 'numeric', month: 'long', day: 'numeric' }); +} + +function showError(message) { + document.getElementById('error').innerHTML = `
${escapeHtml(message)}
`; +} + +function statTile(value, label) { + return ` +
+
${value}
+
${escapeHtml(label)}
+
+ `; +} + +function adminUserRowTemplate(u) { + return ` +
+
+ ${avatarHtml(u, 'avatar-sm')} +
+
${escapeHtml(u.name)}${u.isAdmin ? ' admin' : ''}
+
Membre depuis ${formatDate(u.createdAt)} · Dernière connexion ${formatDate(u.lastSeenAt)}
+
+
+
+ 🎵 ${u.songsAdded} + 💡 ${u.suggestionsProposed} + ✔ ${u.votesCast} +
+
+ `; +} + +(async function init() { + const me = await initNav('admin'); + if (!me.isAdmin) { + window.location.href = '/index.html'; + return; + } + + try { + const stats = await api.get('/api/admin/stats'); + const container = document.getElementById('content'); + container.innerHTML = ` +

Administration

+

Vue d'ensemble de l'activité et des données de l'application.

+ +

Vue d'ensemble

+
+ ${statTile(stats.userCount, 'Utilisateurs')} + ${statTile(stats.songs.totalSongs, 'Morceaux au répertoire')} + ${statTile(stats.songs.distinctArtists, 'Artistes différents')} + ${statTile(stats.songs.tutorialsAdded, 'Tutoriels ajoutés')} + ${statTile(stats.suggestions.pending, 'Suggestions en attente')} + ${statTile(stats.suggestions.approved, 'Suggestions approuvées')} + ${statTile(stats.suggestions.totalVotes, 'Votes exprimés')} + ${statTile(stats.concerts.pastConcerts, 'Concerts passés')} + ${statTile(stats.concerts.upcomingConcerts, 'Concerts à venir')} + ${statTile(stats.concerts.avgSongsPerConcert, 'Morceaux / concert (moy.)')} +
+ +

Activité des utilisateurs

+

La date de dernière connexion est approximative (dernière synchronisation du profil, pas un journal de connexion précis).

+
+ ${stats.users.map(adminUserRowTemplate).join('')} +
+ `; + } catch (err) { + showError(err.message); + } +})(); diff --git a/public/js/nav.js b/public/js/nav.js index 7033a2c..c1d224f 100644 --- a/public/js/nav.js +++ b/public/js/nav.js @@ -31,6 +31,7 @@ async function initNav(activePage) { Prochain concert Disponibilités Historique + ${me.isAdmin ? `Administration` : ''}
${me.authentikAccountUrl ? `Mon compte` : ''} diff --git a/src/auth/routes.js b/src/auth/routes.js index fa2fb93..219acbc 100644 --- a/src/auth/routes.js +++ b/src/auth/routes.js @@ -138,7 +138,6 @@ router.get( try { const userinfo = await client.fetchUserInfo(oidcConfig, tokens.access_token, claims.sub); picture = userinfo.picture || picture; - console.log('[auth] userinfo claims received:', Object.keys(userinfo), '— picture:', userinfo.picture || '(none)'); } catch (err) { console.warn('[auth] failed to fetch userinfo for avatar:', err.message); } diff --git a/src/repositories/setlistsRepo.js b/src/repositories/setlistsRepo.js index 53b5450..e8307ac 100644 --- a/src/repositories/setlistsRepo.js +++ b/src/repositories/setlistsRepo.js @@ -130,6 +130,26 @@ async function removeSong(setlistId, setlistSongId) { ]); } +async function getStats() { + const { rows } = await pool.query(` + SELECT + COUNT(*) FILTER (WHERE concert_date < CURRENT_DATE)::int AS past_concerts, + COUNT(*) FILTER (WHERE concert_date >= CURRENT_DATE)::int AS upcoming_concerts, + COALESCE(( + SELECT AVG(song_count) + FROM ( + SELECT sl.id, COUNT(ss.id) AS song_count + FROM setlists sl + LEFT JOIN setlist_songs ss ON ss.setlist_id = sl.id + WHERE sl.concert_date < CURRENT_DATE + GROUP BY sl.id + ) t + ), 0)::numeric(10,1) AS avg_songs_per_concert + FROM setlists + `); + return rows[0]; +} + module.exports = { findNext, findHistory, @@ -142,4 +162,5 @@ module.exports = { replaceSongs, addSong, removeSong, + getStats, }; diff --git a/src/repositories/songsRepo.js b/src/repositories/songsRepo.js index bb0e8e1..99a8cbd 100644 --- a/src/repositories/songsRepo.js +++ b/src/repositories/songsRepo.js @@ -75,6 +75,16 @@ async function removeTutorial(songId, tutorialId) { ]); } +async function getStats() { + const { rows } = await pool.query(` + SELECT COUNT(*)::int AS total_songs, + COUNT(DISTINCT NULLIF(artist, ''))::int AS distinct_artists, + (SELECT COUNT(*)::int FROM song_tutorials) AS tutorials_added + FROM songs + `); + return rows[0]; +} + module.exports = { findAll, findById, @@ -84,4 +94,5 @@ module.exports = { findTutorials, addTutorial, removeTutorial, + getStats, }; diff --git a/src/repositories/suggestionsRepo.js b/src/repositories/suggestionsRepo.js index 1ab6138..efe25f3 100644 --- a/src/repositories/suggestionsRepo.js +++ b/src/repositories/suggestionsRepo.js @@ -84,6 +84,18 @@ async function removeVote(suggestionId, userId) { ]); } +async function getStats() { + const { rows } = await pool.query(` + SELECT COUNT(*)::int AS total, + COUNT(*) FILTER (WHERE status = 'pending')::int AS pending, + COUNT(*) FILTER (WHERE status = 'approved')::int AS approved, + COUNT(*) FILTER (WHERE status = 'rejected')::int AS rejected, + (SELECT COUNT(*)::int FROM suggestion_votes) AS total_votes + FROM suggestions + `); + return rows[0]; +} + async function promoteToSong(suggestionId, addedBy) { const client = await pool.connect(); try { @@ -134,4 +146,5 @@ module.exports = { upsertVote, removeVote, promoteToSong, + getStats, }; diff --git a/src/repositories/usersRepo.js b/src/repositories/usersRepo.js index 7bed991..0f34bc2 100644 --- a/src/repositories/usersRepo.js +++ b/src/repositories/usersRepo.js @@ -32,4 +32,19 @@ async function getActivityStats(userId) { }; } -module.exports = { findById, upsertFromClaims, getActivityStats }; +async function findAllWithActivity() { + const { rows } = await pool.query(` + SELECT u.id, u.name, u.avatar_url, u.is_admin, u.created_at, u.updated_at, + COALESCE(s.count, 0) AS songs_added, + COALESCE(sg.count, 0) AS suggestions_proposed, + COALESCE(v.count, 0) AS votes_cast + FROM users u + LEFT JOIN (SELECT added_by, COUNT(*)::int AS count FROM songs GROUP BY added_by) s ON s.added_by = u.id + LEFT JOIN (SELECT suggested_by, COUNT(*)::int AS count FROM suggestions GROUP BY suggested_by) sg ON sg.suggested_by = u.id + LEFT JOIN (SELECT user_id, COUNT(*)::int AS count FROM suggestion_votes GROUP BY user_id) v ON v.user_id = u.id + ORDER BY (COALESCE(s.count, 0) + COALESCE(sg.count, 0) + COALESCE(v.count, 0)) DESC, u.name + `); + return rows; +} + +module.exports = { findById, upsertFromClaims, getActivityStats, findAllWithActivity }; diff --git a/src/routes/admin.js b/src/routes/admin.js new file mode 100644 index 0000000..0e5137b --- /dev/null +++ b/src/routes/admin.js @@ -0,0 +1,56 @@ +const express = require('express'); +const usersRepo = require('../repositories/usersRepo'); +const songsRepo = require('../repositories/songsRepo'); +const suggestionsRepo = require('../repositories/suggestionsRepo'); +const setlistsRepo = require('../repositories/setlistsRepo'); +const { requireAdmin } = require('../auth/middleware'); +const asyncHandler = require('../lib/asyncHandler'); + +const router = express.Router(); + +router.get( + '/stats', + requireAdmin, + asyncHandler(async (req, res) => { + const [users, songs, suggestions, concerts] = await Promise.all([ + usersRepo.findAllWithActivity(), + songsRepo.getStats(), + suggestionsRepo.getStats(), + setlistsRepo.getStats(), + ]); + + res.json({ + userCount: users.length, + users: users.map((u) => ({ + id: u.id, + name: u.name, + avatarUrl: u.avatar_url, + isAdmin: u.is_admin, + createdAt: u.created_at, + lastSeenAt: u.updated_at, + songsAdded: u.songs_added, + suggestionsProposed: u.suggestions_proposed, + votesCast: u.votes_cast, + })), + songs: { + totalSongs: songs.total_songs, + distinctArtists: songs.distinct_artists, + tutorialsAdded: songs.tutorials_added, + }, + suggestions: { + total: suggestions.total, + pending: suggestions.pending, + approved: suggestions.approved, + rejected: suggestions.rejected, + totalVotes: suggestions.total_votes, + }, + concerts: { + pastConcerts: concerts.past_concerts, + upcomingConcerts: concerts.upcoming_concerts, + avgSongsPerConcert: concerts.avg_songs_per_concert, + }, + }); + }) +); + +module.exports = router; diff --git a/src/routes/index.js b/src/routes/index.js index 4343b45..428185c 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -6,6 +6,7 @@ const suggestionsRoutes = require('./suggestions'); const setlistsRoutes = require('./setlists'); const musicSearchRoutes = require('./musicSearch'); const calendarRoutes = require('./calendar'); +const adminRoutes = require('./admin'); const router = express.Router(); @@ -16,5 +17,6 @@ router.use('/suggestions', suggestionsRoutes); router.use('/setlists', setlistsRoutes); router.use('/music-search', musicSearchRoutes); router.use('/calendar', calendarRoutes); +router.use('/admin', adminRoutes); module.exports = router;