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 +9 -4
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fe3ed3e91f - Show all commits

6
javascripts/mon-compte/ma-collection/index.js
View file

@ -6,7 +6,8 @@ if (typeof isPublicCollection !== "undefined") {
moreFilters: false, moreFilters: false,
items: [], items: [],
total: 0, total: 0,
page: 1, // eslint-disable-next-line no-undef
page: query.page || 1,
totalPages: 1, totalPages: 1,
limit: 16, limit: 16,
artist: "", artist: "",
@ -20,9 +21,12 @@ if (typeof isPublicCollection !== "undefined") {
itemId: null, itemId: null,
showModalDelete: false, showModalDelete: false,
showModalShare: false, showModalShare: false,
// eslint-disable-next-line no-undef
shareLink: `${protocol}//${host}/collection/${userId}`, shareLink: `${protocol}//${host}/collection/${userId}`,
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
isPublicCollection, isPublicCollection,
// eslint-disable-next-line no-undef
query,
}; };
}, },
created() { created() {

7
views/pages/mon-compte/ma-collection/index.ejs
View file

@ -135,12 +135,12 @@
<nav class="pagination" role="navigation" aria-label="Pagination"> <nav class="pagination" role="navigation" aria-label="Pagination">
<ul class="pagination-list"> <ul class="pagination-list">
<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) || (page - 1) <= p && page + 1 >= p"> <template v-if="p < 2 || p > (totalPages - 1) || (Number(page) - 1) <= p && Number(page) + 1 >= p">
<li> <li>
<a class="pagination-link" :class="{'is-current': p === page}" @click="goTo(p)" aria-label="Aller à la page {{p}}">{{ p }}</a> <a class="pagination-link" :class="{'is-current': p === Number(page)}" @click="goTo(p)" :aria-label="'Aller à la page '+p">{{ p }}</a>
</li> </li>
</template> </template>
<template v-if="(page - 3 === p && page - 2 > 1) || (page + 2 === p && page + 2 < totalPages - 1)"> <template v-if="(Number(page) - 3 === p && Number(page) - 2 > 1) || (Number(page) + 2 === p && Number(page) + 2 < totalPages - 1)">
<li> <li>
<a class="pagination-link is-disabled">…</a> <a class="pagination-link is-disabled">…</a>
</li> </li>
@ -198,4 +198,5 @@
<script> <script>
const isPublicCollection = <%= user.isPublicCollection ? 'true' : 'false' %>; const isPublicCollection = <%= user.isPublicCollection ? 'true' : 'false' %>;
const userId = "<%= user._id %>"; const userId = "<%= user._id %>";
const query = <%- JSON.stringify(query) %>;
</script> </script>