Setlist
diff --git a/public/js/render.js b/public/js/render.js
index 498b83d..3d20c18 100644
--- a/public/js/render.js
+++ b/public/js/render.js
@@ -40,6 +40,15 @@ function youtubeThumbnailUrl(url) {
return videoId ? `https://img.youtube.com/vi/${videoId}/mqdefault.jpg` : null;
}
+// Builds a link that opens several videos back-to-back in YouTube's
+// temporary "mix" player — no API call, no auth, just the video IDs we
+// already have from each song's youtube_url. Returns null if none of the
+// given URLs have a recognizable YouTube video ID.
+function youtubePlaylistUrl(urls) {
+ const ids = urls.map(youtubeVideoId).filter(Boolean);
+ return ids.length ? `https://www.youtube.com/watch_videos?video_ids=${ids.join(',')}` : null;
+}
+
function initials(name) {
return String(name || '?')
.trim()
diff --git a/public/js/repertoire.js b/public/js/repertoire.js
index b3fa57e..413cee4 100644
--- a/public/js/repertoire.js
+++ b/public/js/repertoire.js
@@ -1,9 +1,16 @@
let me = null;
let instruments = [];
let songs = [];
+let searchQuery = '';
const expanded = new Set();
const editing = new Set();
+function matchesSearch(song, query) {
+ const q = query.trim().toLowerCase();
+ if (!q) return true;
+ return song.title.toLowerCase().includes(q) || song.artist.toLowerCase().includes(q);
+}
+
async function loadInstruments() {
instruments = await api.get('/api/instruments');
}
@@ -131,7 +138,11 @@ function tutorialCardTemplate(t) {
function renderSongs() {
const container = document.getElementById('songs-list');
- renderList(container, songs, songCardTemplate, 'Aucun morceau au répertoire pour le moment.');
+ const visibleSongs = songs.filter((s) => matchesSearch(s, searchQuery));
+ const emptyMessage = searchQuery.trim()
+ ? 'Aucun morceau ne correspond à la recherche.'
+ : 'Aucun morceau au répertoire pour le moment.';
+ renderList(container, visibleSongs, songCardTemplate, emptyMessage);
document.querySelectorAll('.toggle-tutorials').forEach((btn) => {
btn.addEventListener('click', () => onToggleTutorials(parseInt(btn.dataset.id, 10)));
@@ -316,5 +327,9 @@ async function onSongCandidateSelected(candidate) {
dropdownId: 'song-title-dropdown',
onSelect: onSongCandidateSelected,
});
+ document.getElementById('song-search-input').addEventListener('input', (e) => {
+ searchQuery = e.target.value;
+ renderSongs();
+ });
await loadSongs();
})();
diff --git a/public/js/setlistEditor.js b/public/js/setlistEditor.js
index c1afc8a..4798ceb 100644
--- a/public/js/setlistEditor.js
+++ b/public/js/setlistEditor.js
@@ -32,10 +32,12 @@ function createSetlistEditor({
const main = setlist.songs.filter((s) => !s.is_encore);
const encore = setlist.songs.filter((s) => s.is_encore);
const rowHtml = (s) => `
${escapeHtml(s.title)} — ${escapeHtml(s.artist)}${s.note ? `${escapeHtml(s.note)}` : ''}`;
+ const playlistUrl = youtubePlaylistUrl([...main, ...encore].map((s) => s.youtube_url).filter(Boolean));
return `
${escapeHtml(setlist.name || 'Concert')}
${escapeHtml(setlist.venue || '')} · ${formatDate(setlist.concert_date)}
+ ${playlistUrl ? `
` : ''}
Setlist
diff --git a/src/repositories/setlistsRepo.js b/src/repositories/setlistsRepo.js
index be1bd35..53b5450 100644
--- a/src/repositories/setlistsRepo.js
+++ b/src/repositories/setlistsRepo.js
@@ -57,7 +57,8 @@ async function findById(id) {
async function findSongs(setlistId) {
const { rows } = await pool.query(
- `SELECT ss.id, ss.setlist_id, ss.song_id, s.title, s.artist, ss.position, ss.note, ss.is_encore
+ `SELECT ss.id, ss.setlist_id, ss.song_id, s.title, s.artist, s.youtube_url, s.spotify_url,
+ ss.position, ss.note, ss.is_encore
FROM setlist_songs ss
JOIN songs s ON s.id = ss.song_id
WHERE ss.setlist_id = $1