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

Compare commits

base: 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
..
compare: 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

1 Commits
marietje-z ... a30605a018

Author SHA1 Message Date
William Kuijltjes
a30605a018 Merge branch 'wkuijltjes/playsinat' into 'marietje-zuid' 
Fix toggling of Plays In/Plays At in mobile view

See merge request technicie/MarietjeDjango!93
 2024-03-18 13:15:39 +01:00
3 changed files with 19 additions and 37 deletions
Expand all files Collapse all files

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

@ -105,10 +105,6 @@ footer {
transition: 1s transform ease-in-out;
}
.btn-link {
text-decoration: none;
}
.navbar-text {
color: var(--text-color);
}
@ -117,11 +113,6 @@ 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;

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

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

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

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