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

Marietje in header and fix load times for upload page

Browse Source
This commit is contained in:
Lars van Rhijn
2023-10-04 20:00:18 +02:00
parent 12e47ce6c2
commit b2429f941b
5 changed files with 112 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,22 +74,22 @@
<tbody class="queuebody">
<template v-for="(song, index) in queue">
<tr :class="{ marietjequeue: (song.user === null), currentsong: (index === 0), 'fw-bold': (index === 0) }">
<td class="artist"><% song.song.artist %></td>
<td class="title"><% song.song.title %></td>
<td class="artist">${song.song.artist }$</td>
<td class="title">${song.song.title }$</td>
<td class="d-sm-table-cell d-none requested-by">
<template v-if="song.user === null">
Marietje
</template>
<template v-else>
<% song.user.name %>
${song.user.name }$
</template>
</td>
<td class="d-sm-table-cell d-none plays-at" style="text-align: right">
<template v-if="song.time_until_song_seconds !== null && song.time_until_song_seconds > 0 && playsIn === true">
<% song.time_until_song_seconds.secondsToMMSS() %>
${song.time_until_song_seconds.secondsToMMSS() }$
</template>
<template v-else-if="playsIn === false && song.plays_at !== null && song.played === false">
<% song.plays_at.timestampToHHMMSS() %>
${song.plays_at.timestampToHHMMSS() }$
</template>
</td>
<td>
@ -160,7 +160,7 @@
</select>
<select class="pagenum input-mini" title="Select page number" v-model="page_number">
<template v-for="(i, index) in number_of_pages">
<option :value="i"><% i %></option>
<option :value="i">${i }$</option>
</template>
</select>
</th>
@ -171,21 +171,21 @@
<template v-for="(song, index) in songs">
<tr>
<td>
<% song.artist %>
${song.artist }$
</td>
<td>
<a href="#" v-on:click="request_song(song.id);"><% song.title %></a>
<a href="#" v-on:click="request_song(song.id);">${song.title }$</a>
</td>
<td>
<template v-if="song.user === null">
Marietje
</template>
<template v-else>
<% song.user.name %>
${song.user.name }$
</template>
</td>
<td>
<% song.duration.secondsToMMSS() %>
${song.duration.secondsToMMSS() }$
</td>
<td>
<a href="#" v-on:click="report_song(song.id);">
@ -209,18 +209,19 @@
const CAN_MOVE = {{ perms.queues.can_move|yesno:"1,0" }};
</script>
<script>
const queue_vue = new Vue({
el: '#queue-container',
delimiters: ['<%', '%>'],
data: {
current_song: null,
queue: [],
user_data: null,
refreshing: true,
refreshTimer: null,
clockInterval: null,
started_at: null,
playsIn: true,
const queue_vue = createApp({
delimiters: ['${', '}$'],
data() {
return {
current_song: null,
queue: [],
user_data: null,
refreshing: true,
refreshTimer: null,
clockInterval: null,
started_at: null,
playsIn: true,
}
},
mounted() {
this.clockInterval = setInterval(this.update_song_times, 1000);
@ -372,19 +373,20 @@
});
}
}
});
}).mount('#queue-container');
</script>
<script>
const request_vue = new Vue({
el: '#request-container',
delimiters: ['<%', '%>'],
data: {
songs: [],
total_songs: 0,
search_input: "",
typing_timer: null,
page_size: 10,
page_number: 1,
const request_vue = createApp({
delimiters: ['${', '}$'],
data() {
return {
songs: [],
total_songs: 0,
search_input: "",
typing_timer: null,
page_size: 10,
page_number: 1,
}
},
watch: {
search_input: {
@ -542,7 +544,7 @@
this.page_number = page_number;
}
}
});
}).mount('#request-container');
</script>
<script>
function volume_down() {