technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-11 10:22:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: technicie:a30605a018cbf628667319340250820467b42b44
Branches Tags
technicie:marietje-zuid technicie:feature/marietje-4.1-in-header technicie:feature/log-api-endpoints technicie:fix/poetry-install technicie:feature/player-endpoints technicie:feature/docker-build technicie:fix/sort-title-artist technicie:tosti-information technicie:oslomp/quickfix_artists technicie:oslomp/artists technicie:search
...
compare: technicie:marietje-zuid
Branches Tags
technicie:marietje-zuid technicie:feature/marietje-4.1-in-header technicie:feature/log-api-endpoints technicie:fix/poetry-install technicie:feature/player-endpoints technicie:feature/docker-build technicie:fix/sort-title-artist technicie:tosti-information technicie:oslomp/quickfix_artists technicie:oslomp/artists technicie:search

12 Commits
a30605a018 ... marietje-z

Author SHA1 Message Date
Daniël Visser
8f698315dc Merge branch 'feature/improve-queueable' into 'marietje-zuid' 
Improvement to the visibility of already queued songs

See merge request technicie/MarietjeDjango!96
 2024-09-10 17:27:12 +02:00
Daniël Visser
4bc3f38f69 Merge branch 'marietje-zuid' into 'feature/improve-queueable' 
# Conflicts:
#   marietje/queues/templates/queues/queue.html
 2024-09-10 17:19:12 +02:00
Tjibbe
6d545dddcc feat: grey-out already queued songs and make unclickable 2024-05-06 13:55:19 +02:00
Kees van Kempen
3f947a934c Merge branch 'fix/communicate-file-too-large' into 'marietje-zuid' 
fix(songs): handle HTTP 413 and remove redundant .json() calls

Closes #76

See merge request technicie/MarietjeDjango!90
 2024-04-23 19:09:55 +02:00
Kees van Kempen
b5aa079254 Merge branch 'wkuijltjes/playsinat' into 'marietje-zuid' 
Fix toggling of Plays In/Plays At in mobile view

Closes #86

See merge request technicie/MarietjeDjango!93
 2024-04-23 18:19:39 +02:00
Kees van Kempen
7ab6bc6c78 fix(queues): remove redundant and faulty toggle_details call 
song is not even defined in this scope.
 2024-04-23 18:11:59 +02:00
Kees van Kempen
3c2df2adfd styling(queues): move no underline to css 2024-04-23 17:56:58 +02:00
Kees van Kempen
82dc7c0193 Merge branch 'wkuijltjes/fixtimer' into 'marietje-zuid' 
Fix dynamic times that should be static and vice versa if logged in user has queued

Closes #66

See merge request technicie/MarietjeDjango!94
 2024-04-23 17:44:22 +02:00
Kees van Kempen
6901d913c0 Merge branch 'wkuijltjes/aesthetics' into 'marietje-zuid' 
Brush up some details: reduce breakpoints on small screens, Requested by --> Requested By

See merge request technicie/MarietjeDjango!95
 2024-04-23 17:31:35 +02:00
William Kuijltjes
0f85727c5d Brush up some details: reduce breakpoints on small screens, Requested by --> Requested By 2024-03-18 18:02:25 +01:00
William Kuijltjes
2b2e0a0275 Fix dynamic times that should be static and vice versa if logged in user has queued 2024-03-18 16:51:34 +01:00
Kees van Kempen
5c32fcb1d1 fix(songs): handle HTTP 413 and remove redundant .json() calls 
Closes #76
 2024-02-28 00:20:57 +01:00
3 changed files with 37 additions and 19 deletions
Expand all files Collapse all files

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

@ -105,6 +105,10 @@ footer {
transition: 1s transform ease-in-out; transition: 1s transform ease-in-out;
} }
.btn-link {
text-decoration: none;
}
.navbar-text { .navbar-text {
color: var(--text-color); color: var(--text-color);
} }
@ -113,6 +117,11 @@ footer {
color: red !important; 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> */ /* Bootstrap 3 doesn't support equal height columns, hack via <https://medium.com/wdstack/bootstrap-equal-height-columns-d07bc934eb27#892f> */
.row.display-flex { .row.display-flex {
display: flex; display: flex;

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

@ -58,14 +58,16 @@
</p> </p>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<p class="navbar-text mb-0 duration-queue" v-bind:class="{danger: infobar.length_personal_queue > infobar.max_length * 60}">(${ infobar.length_personal_queue.secondsToMMSS() }$)</p> <p class="navbar-text mb-0 duration-queue" v-bind:class="{danger: infobar.length_personal_queue > infobar.max_length * 60}">
(${ infobar.length_personal_queue.secondsToMMSS() }$)
</p>
</li> </li>
</template> </template>
</ul> </ul>
</div> </div>
</nav> </nav>
<div class="container-lg"> <div class="container-lg">
<br><br> <div class="d-none d-lg-block"><br></div>
<div class="alert-location"> <div class="alert-location">
</div> </div>
<div class="tab-content"> <div class="tab-content">
@ -78,13 +80,13 @@
<td class="col-md-4">Title</td> <td class="col-md-4">Title</td>
<td class="col-md-2 d-sm-table-cell d-none">Requested By</td> <td class="col-md-2 d-sm-table-cell d-none">Requested By</td>
<td class="col-md-1 text-info d-sm-table-cell d-none" style="cursor: pointer;"> <td class="col-md-1 text-info d-sm-table-cell d-none" style="cursor: pointer;">
<span v-if="playsIn" class="btn btn-link p-0 text-decoration-none" v-on:click="playsIn = false">Plays In</span> <span v-if="playsIn" class="btn btn-link p-0" v-on:click="playsIn = false">Plays In</span>
<span v-else class="btn btn-link p-0 text-decoration-none" v-on:click="playsIn = true">Plays At</span> <span v-else class="btn btn-link p-0" v-on:click="playsIn = true">Plays At</span>
</td> </td>
<td class="col-md-1"> <td class="col-md-1">
<span class="control-icons">Control</span> <span class="control-icons">Control</span>
<span v-if="playsIn" class="btn btn-link p-0 text-decoration-none d-sm-none" v-on:click="playsIn = false" v-on:click="toggle_details(song)">(Plays In)</span> <span v-if="playsIn" class="btn btn-link p-0 d-sm-none" v-on:click="playsIn = false" >(Plays In)</span>
<span v-else class="btn btn-link p-0 text-decoration-none d-sm-none" v-on:click="playsIn = true" v-on:click="toggle_details(song)">(Plays At)</span> <span v-else class="btn btn-link p-0 d-sm-none" v-on:click="playsIn = true">(Plays At)</span>
</td> </td>
</tr> </tr>
</thead> </thead>
@ -99,7 +101,7 @@
<td> <td>
<span class="artist">${ song.song.artist }$</span> <span class="artist">${ song.song.artist }$</span>
<span v-if="show_details(song)" class="requested-by d-sm-none d-block small mt-3 fw-normal"> <span v-if="show_details(song)" class="requested-by d-sm-none d-block small mt-3 fw-normal">
Requested by:<br> Requested By:<br>
<template v-if="song.user === null"> <template v-if="song.user === null">
Marietje Marietje
</template> </template>
@ -219,12 +221,12 @@
</tfoot> </tfoot>
<tbody> <tbody>
<template v-for="(song, index) in songs"> <template v-for="(song, index) in songs">
<tr> <tr v-bind:class="{disabled: is_in_queue(song)}">
<td> <td>
${ song.artist }$ ${ song.artist }$
</td> </td>
<td> <td>
<button v-on:click="request_song(song.id);" class="btn btn-link p-0 text-decoration-none" style="text-align: left">${ song.title }$</button> <button v-on:click="request_song(song.id);" class="btn btn-link p-0" style="text-align: left">${ song.title }$</button>
</td> </td>
<td> <td>
<template v-if="song.user === null"> <template v-if="song.user === null">
@ -238,7 +240,7 @@
${ song.duration.secondsToMMSS() }$ ${ song.duration.secondsToMMSS() }$
</td> </td>
<td> <td>
<button v-on:click="report_song(song.id);" class="btn btn-link p-0 text-decoration-none"> <button v-on:click="report_song(song.id);" class="btn btn-link p-0" style="pointer-events: auto">
⚑ ⚑
</button> </button>
</td> </td>
@ -365,7 +367,9 @@
const current_song = this.queue[i]; const current_song = this.queue[i];
if (i === 0) { if (i === 0) {
const current_song_remaining_seconds = current_song.song.duration - this.queue[1].time_until_song_seconds; const current_song_remaining_seconds = current_song.song.duration - this.queue[1].time_until_song_seconds;
infoBar['length_personal_queue'] -= current_song_remaining_seconds; if (current_song.user !== null && current_song.user.id === this.user_data.id) {
infoBar['length_personal_queue'] -= current_song_remaining_seconds;
}
infoBar['length_total_queue'] -= current_song_remaining_seconds; infoBar['length_total_queue'] -= current_song_remaining_seconds;
} }
infoBar['length_total_queue'] += current_song.song.duration; infoBar['length_total_queue'] += current_song.song.duration;
@ -373,7 +377,7 @@
infoBar['length_personal_queue'] += current_song.song.duration; infoBar['length_personal_queue'] += current_song.song.duration;
infoBar['end_personal_queue'] = infoBar['length_total_queue']; infoBar['end_personal_queue'] = infoBar['length_total_queue'];
if (infoBar['start_personal_queue'] === null) { if (infoBar['start_personal_queue'] === null) {
infoBar['start_personal_queue'] = infoBar['length_total_queue'] - current_song.song.duration - this.queue[1].time_until_song_seconds; infoBar['start_personal_queue'] = infoBar['length_total_queue'] - current_song.song.duration;
} }
} }
} }
@ -581,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) { request_song(song_id) {
fetch('/api/v1/queues/current/request/', { fetch('/api/v1/queues/current/request/', {

15
marietje/songs/templates/songs/upload.html
View File

@ -179,13 +179,14 @@
}).catch(e => { }).catch(e => {
console.log(e); console.log(e);
if (e instanceof Response) { if (e instanceof Response) {
try { // Intercept an HTTP 413 error (entity too large), as this might
e.json().then(data => { // be thrown by a (reverse) proxy server and its payload is not
this.fileObjects[i].error_message = data.errorMessage; // nicely formatted as the code below expects.
this.fileObjects[i].success = false; if (e.status === 413) {
}); this.fileObjects[i].error_message = "The song you tried to upload is too large in size. (HTTP 413 error)";
} catch { this.fileObjects[i].success = false;
this.fileObjects[i].error_message = "An exception occurred while uploading this file, please try again."; } else {
this.fileObjects[i].error_message = `${e.statusText} (${e.status})`;
this.fileObjects[i].success = false; this.fileObjects[i].success = false;
} }
} else { } else {