technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-08 04:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/improve-queueable' into 'marietje-zuid'

Browse Source 
Improvement to the visibility of already queued songs

See merge request technicie/MarietjeDjango!96
This commit is contained in:
Daniël Visser
2024-09-10 17:27:12 +02:00
parent 3f947a934c 4bc3f38f69
commit 8f698315dc
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
marietje/marietje/static/marietje/css/custom.css
View File

@ -117,6 +117,11 @@ footer {
color: red !important;
}
.disabled {
pointer-events: none;
opacity: 0.5;
}
/* Bootstrap 3 doesn't support equal height columns, hack via <https://medium.com/wdstack/bootstrap-equal-height-columns-d07bc934eb27#892f> */
.row.display-flex {
display: flex;

8
marietje/queues/templates/queues/queue.html
View File

@ -221,7 +221,7 @@
</tfoot>
<tbody>
<template v-for="(song, index) in songs">
<tr>
<tr v-bind:class="{disabled: is_in_queue(song)}">
<td>
${ song.artist }$
</td>
@ -240,7 +240,7 @@
${ song.duration.secondsToMMSS() }$
</td>
<td>
<button v-on:click="report_song(song.id);" class="btn btn-link p-0">
<button v-on:click="report_song(song.id);" class="btn btn-link p-0" style="pointer-events: auto">
⚑
</button>
</td>
@ -585,6 +585,10 @@
}
});
},
is_in_queue(song) {
return queue_vue.queue.filter(queuesong => Boolean(queuesong.user)
).map((queuesong) => queuesong.song.hash).includes(song.hash);
},
request_song(song_id) {
fetch('/api/v1/queues/current/request/', {