From fe3ed3e91f68d9de7be1c57b44ff0a93ec6fd58f Mon Sep 17 00:00:00 2001
From: dbroqua <contact@darkou.fr>
Date: Tue, 17 Jan 2023 17:08:41 +0100
Subject: [PATCH] #73 - Savoir sur quelle page on est

---
 javascripts/mon-compte/ma-collection/index.js  | 6 +++++-
 views/pages/mon-compte/ma-collection/index.ejs | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/javascripts/mon-compte/ma-collection/index.js b/javascripts/mon-compte/ma-collection/index.js
index 1cfb05e..a2d93c5 100644
--- a/javascripts/mon-compte/ma-collection/index.js
+++ b/javascripts/mon-compte/ma-collection/index.js
@@ -6,7 +6,8 @@ if (typeof isPublicCollection !== "undefined") {
                 moreFilters: false,
                 items: [],
                 total: 0,
-                page: 1,
+                // eslint-disable-next-line no-undef
+                page: query.page || 1,
                 totalPages: 1,
                 limit: 16,
                 artist: "",
@@ -20,9 +21,12 @@ if (typeof isPublicCollection !== "undefined") {
                 itemId: null,
                 showModalDelete: false,
                 showModalShare: false,
+                // eslint-disable-next-line no-undef
                 shareLink: `${protocol}//${host}/collection/${userId}`,
                 // eslint-disable-next-line no-undef
                 isPublicCollection,
+                // eslint-disable-next-line no-undef
+                query,
             };
         },
         created() {
diff --git a/views/pages/mon-compte/ma-collection/index.ejs b/views/pages/mon-compte/ma-collection/index.ejs
index 5dffd9f..c061d9a 100644
--- a/views/pages/mon-compte/ma-collection/index.ejs
+++ b/views/pages/mon-compte/ma-collection/index.ejs
@@ -135,12 +135,12 @@
     <nav class="pagination" role="navigation" aria-label="Pagination">
         <ul class="pagination-list">
             <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>
-                        <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>
                 </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>
                         <a class="pagination-link is-disabled">…</a>
                     </li>
@@ -198,4 +198,5 @@
 <script>
     const isPublicCollection = <%= user.isPublicCollection ? 'true' : 'false' %>;
     const userId = "<%= user._id %>";
+    const query = <%- JSON.stringify(query) %>;
 </script>
\ No newline at end of file