technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-09 16:22:21 +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:c38aba047c6ffeac4e9c1484269be69a5ec072d4
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

7 Commits
a30605a018 ... c38aba047c

Author SHA1 Message Date
William Kuijltjes
c38aba047c 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:12:25 +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
2 changed files with 19 additions and 11 deletions
Expand all files Collapse all files

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

@ -105,6 +105,10 @@ footer {
transition: 1s transform ease-in-out;
}
.btn-link {
text-decoration: none;
}
.navbar-text {
color: var(--text-color);
}

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

@ -58,14 +58,16 @@
</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">
<br><br>
<div class="d-none d-lg-block"><br></div>
<div class="alert-location">
</div>
<div class="tab-content">
@ -78,13 +80,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 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>
<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>
</td>
<td class="col-md-1">
<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-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-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>
</td>
</tr>
</thead>
@ -99,7 +101,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>
@ -224,7 +226,7 @@
${ song.artist }$
</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>
<template v-if="song.user === null">
@ -238,7 +240,7 @@
${ song.duration.secondsToMMSS() }$
</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">
⚑
</button>
</td>
@ -365,7 +367,9 @@
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;
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.song.duration;
@ -373,7 +377,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 - this.queue[1].time_until_song_seconds;
infoBar['start_personal_queue'] = infoBar['length_total_queue'] - current_song.song.duration;
}
}
}