dbroqua/MusicTopus
dbroqua/MusicTopus
1
1
Fork 0
Code Issues 9 Pull requests Releases 14 Activity

Version 1.4.3 #83

Merged
dbroqua merged 19 commits from develop into master 2023-03-22 15:01:28 +01:00
Conversation 0 Commits 19 Files changed 2 +17 -8
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
javascripts/collection.js
View file

@ -32,6 +32,9 @@ Vue.createApp({
this.fetch(); this.fetch();
}, },
methods: { methods: {
formatParams(param) {
return param.replace("&", "%26").replace("+", "%2B");
},
fetch() { fetch() {
this.loading = true; this.loading = true;
this.total = 0; this.total = 0;
@ -64,19 +67,19 @@ Vue.createApp({
let url = `/api/v1/albums?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`; let url = `/api/v1/albums?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
if (this.artist) { if (this.artist) {
url += `&artists_sort=${this.artist.replace("&", "%26")}`; url += `&artists_sort=${this.formatParams(this.artist)}`;
} }
if (this.format) { if (this.format) {
url += `&format=${this.format.replace("&", "%26")}`; url += `&format=${this.formatParams(this.format)}`;
} }
if (this.year) { if (this.year) {
url += `&year=${this.year}`; url += `&year=${this.year}`;
} }
if (this.genre) { if (this.genre) {
url += `&genre=${this.genre.replace("&", "%26")}`; url += `&genre=${this.formatParams(this.genre)}`;
} }
if (this.style) { if (this.style) {
url += `&style=${this.style.replace("&", "%26")}`; url += `&style=${this.formatParams(this.style)}`;
} }
axios axios
@ -101,19 +104,19 @@ Vue.createApp({
changeUrl() { changeUrl() {
let url = `?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`; let url = `?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
if (this.artist) { if (this.artist) {
url += `&artists_sort=${this.artist.replace("&", "%26")}`; url += `&artists_sort=${this.formatParams(this.artist)}`;
} }
if (this.format) { if (this.format) {
url += `&format=${this.format.replace("&", "%26")}`; url += `&format=${this.formatParams(this.format)}`;
} }
if (this.year) { if (this.year) {
url += `&year=${this.year}`; url += `&year=${this.year}`;
} }
if (this.genre) { if (this.genre) {
url += `&genre=${this.genre.replace("&", "%26")}`; url += `&genre=${this.formatParams(this.genre)}`;
} }
if (this.style) { if (this.style) {
url += `&style=${this.style.replace("&", "%26")}`; url += `&style=${this.formatParams(this.style)}`;
} }
window.location.href = url; window.location.href = url;

6
views/pages/collection.ejs
View file

@ -72,6 +72,9 @@
</div> </div>
<nav class="pagination" role="navigation" aria-label="Pagination"> <nav class="pagination" role="navigation" aria-label="Pagination">
<ul class="pagination-list"> <ul class="pagination-list">
<li v-if="page > 1">
<a class="pagination-link" @click="goTo(1)" aria-label="Aller à la première page">&laquo;</a>
</li>
<template v-for="p in Array.from({length: totalPages}, (v, i) => (i+1))"> <template v-for="p in Array.from({length: totalPages}, (v, i) => (i+1))">
<template v-if="p < 2 || p > (totalPages - 1) || (Number(page) - 1) <= p && Number(page) + 1 >= p"> <template v-if="p < 2 || p > (totalPages - 1) || (Number(page) - 1) <= p && Number(page) + 1 >= p">
<li> <li>
@ -84,6 +87,9 @@
</li> </li>
</template> </template>
</template> </template>
<li v-if="page < totalPages">
<a class="pagination-link" @click="goTo(totalPages)" aria-label="Aller à la derière page">&raquo;</a>
</li>
</ul> </ul>
</nav> </nav>