From ecd54491a76f6a77f5e7744a62c56b1ae12317d7 Mon Sep 17 00:00:00 2001
From: dbroqua <contact@darkou.fr>
Date: Thu, 24 Feb 2022 08:24:20 +0100
Subject: [PATCH] Optimisation de la pagination

---
 sass/ma-collection.scss                  |   2 +-
 sass/pagination.scss                     | 121 +++++++++--------------
 views/pages/mon-compte/ma-collection.ejs |   8 +-
 3 files changed, 52 insertions(+), 79 deletions(-)

diff --git a/sass/ma-collection.scss b/sass/ma-collection.scss
index 8e83211..87a80c1 100644
--- a/sass/ma-collection.scss
+++ b/sass/ma-collection.scss
@@ -38,6 +38,6 @@
     }
 
     .total {
-        margin: 1rem 0;
+        margin: 0.75rem 0;
     }
 }
\ No newline at end of file
diff --git a/sass/pagination.scss b/sass/pagination.scss
index 07eace3..2a439a6 100644
--- a/sass/pagination.scss
+++ b/sass/pagination.scss
@@ -4,71 +4,8 @@
     display: flex;
     text-align: center;
     justify-content: space-between;
-    margin: 1rem 0;
+    margin: 0.75rem 0;
 
-    .pagination-previous,
-    .pagination-next,
-    .pagination-link {
-        align-items: center;
-        border: 1px solid transparent;
-        border-radius: .375em;
-        box-shadow: none;
-        display: inline-flex;
-        font-size: 1rem;
-        height: 2.5em;
-        justify-content: flex-start;
-        line-height: 1.5;
-        padding-bottom: calc(.5em - 1px);
-        padding-left: calc(.75em - 1px);
-        padding-right: calc(.75em - 1px);
-        padding-top: calc(.5em - 1px);
-        position: relative;
-        vertical-align: top;
-        text-decoration: none;
-        user-select: none;
-        text-align: center;
-        font-size: 1em;
-        justify-content: center;
-        margin: .25rem;
-        border-color: var(--pagination-border-color);
-        color: var(--pagination-text-color);
-        min-width: 2.5em;
-        padding-left: .75em;
-        padding-right: .75em;
-        white-space: nowrap;
-        margin-bottom: 0;
-        margin-top: 0;
-
-        @include transition() {}
-
-        &:hover {
-            border-color: var(--pagination-border-hover-color);
-            color: var(--pagination-text-hover-color);
-        }
-
-        &.is-disabled {
-            background-color: var(--default-hl-color);
-            border-color: var(--default-hl-color);
-            box-shadow: none;
-            color: var(--disabled-color);
-            opacity: .5;
-        }
-    }
-
-    .pagination-previous-next {
-        order: 2;
-    }
-    // .pagination-next {
-    //     order: 3;
-    // }
-
-    .pagination-link {
-        &.is-current {
-            background-color: var(--primary-bg-color);
-            border-color: var(--primary-bg-color);
-            color: var(--primary-font-color);
-        }
-    }
 
     .pagination-list {
         align-items: center;
@@ -77,16 +14,56 @@
         flex-wrap: wrap;
         flex-grow: 1;
         flex-shrink: 1;
-        justify-content: flex-start;
-        order: 1;
-    }
+        justify-content: flex-end;
 
-    @include respond-to("small") {
-        flex-direction: column;
+        @include respond-to("small") {
+            justify-content: center;
+        }
 
-        .pagination-previous-next {
-            margin-bottom: 1rem;
-            order: 1;
+        .pagination-link {
+            align-items: center;
+            border: 1px solid transparent;
+            border-radius: .375em;
+            box-shadow: none;
+            display: inline-flex;
+            font-size: 1rem;
+            height: 2.5em;
+            justify-content: flex-start;
+            line-height: 1.5;
+            padding: calc(.5em - 1px) calc(.75em - 1px);
+            position: relative;
+            vertical-align: top;
+            text-decoration: none;
+            user-select: none;
+            text-align: center;
+            font-size: 1em;
+            justify-content: center;
+            margin: .25rem;
+            border-color: var(--pagination-border-color);
+            color: var(--pagination-text-color);
+            min-width: 2.5em;
+            white-space: nowrap;
+
+            @include transition() {}
+
+            &:hover {
+                border-color: var(--pagination-border-hover-color);
+                color: var(--pagination-text-hover-color);
+            }
+
+            &.is-disabled {
+                background-color: var(--default-hl-color);
+                border-color: var(--default-hl-color);
+                box-shadow: none;
+                color: var(--disabled-color);
+                opacity: .5;
+            }
+
+            &.is-current {
+                background-color: var(--primary-bg-color);
+                border-color: var(--primary-bg-color);
+                color: var(--primary-font-color);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/views/pages/mon-compte/ma-collection.ejs b/views/pages/mon-compte/ma-collection.ejs
index 7b811e5..ed03634 100644
--- a/views/pages/mon-compte/ma-collection.ejs
+++ b/views/pages/mon-compte/ma-collection.ejs
@@ -76,18 +76,14 @@
         <strong>Nombre total d'éléments : </strong>{{total}}
     </div>
     <nav class="pagination" role="navigation" aria-label="Pagination">
-        <div class="pagination-previous-next">
-            <a class="pagination-previous" :class="{'is-disabled': page === 1}" @click="previous">Précédent</a>
-            <a class="pagination-next" :class="{'is-disabled': !total || (page*limit) >= total}" @click="next">Suivant</a>
-        </div>
         <ul class="pagination-list">
             <template v-for="p in Array.from({length: totalPages}, (v, i) => (i+1))">
-                <template v-if="p < 4 || p > (totalPages - 3) || (page - 3) <= p && page + 3 >= p">
+                <template v-if="p < 2 || p > (totalPages - 1) || (page - 1) <= p && page + 1 >= p">
                     <li>
                         <a class="pagination-link" :class="{'is-current': p === page}" @click="goTo(p)" aria-label="Aller à la page {{p}}">{{ p }}</a>
                     </li>
                 </template>
-                <template v-if="(page - 3 - 1 === p && page - 4 > 3) || (page + 4 === p && page + 3 < totalPages - 3)">
+                <template v-if="(page - 3 === p && page - 2 > 1) || (page + 2 === p && page + 2 < totalPages - 1)">
                     <li>
                         <a class="pagination-link is-disabled">…</a>
                     </li>