From 70aa0ead947fd34889d3bdba976fe6fb168672cb Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Mon, 11 Oct 2021 11:32:41 +0200
Subject: [PATCH] Fix pagination

---
 src/pages/Blog.vue       | 30 +++++++++++++++++++++---------
 src/pages/News.vue       | 30 +++++++++++++++++++++---------
 src/templates/People.vue | 39 ++++++++++++++++++++++++++++-----------
 3 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/src/pages/Blog.vue b/src/pages/Blog.vue
index 8e36491d5..3e6068757 100644
--- a/src/pages/Blog.vue
+++ b/src/pages/Blog.vue
@@ -52,13 +52,7 @@
         </h2>
       </div>
       <div class="pagination flex justify-center mb-8">
-        <Pagination
-          :baseUrl="baseurl"
-          :currentPage="blogs.pageInfo.currentPage"
-          :totalPages="blogs.pageInfo.totalPages"
-          :maxVisibleButtons="5"
-          v-if="searchResults.length > 7 && blogs.edges.length > 7"
-        />
+        <Pager :info="blogs.pageInfo" range="10" linkClass="pager-link" />
       </div>
     </div>
   </Layout>
@@ -116,7 +110,7 @@ query($page: Int){
 </page-query>
 <script>
 import PostListItem from "~/components/custom/Cards/PostListItem.vue";
-import Pagination from "~/components/custom/Pagination.vue";
+import { Pager } from "gridsome";
 import NewsFilterHeader from "~/components/custom/NewsFilterHeader.vue";
 import SearchBox from "~/components/custom/SearchBox.vue";
 import FilterDropdown from "~/components/custom/FilterDropdown.vue";
@@ -202,7 +196,7 @@ export default {
   },
   components: {
     PostListItem,
-    Pagination,
+    Pager,
     NewsFilterHeader,
     SearchBox,
     FilterDropdown,
@@ -328,3 +322,21 @@ export default {
   },
 };
 </script>
+<style>
+.pagination {
+  display: inline-block;
+  font-size: 1.5rem;
+  text-align: center;
+  width: 100%;
+  color: black;
+}
+.pagination a {
+  text-align: center;
+  padding: 0.6rem 1.2rem;
+  text-decoration: none;
+}
+.active {
+  background-color: #70dfc9;
+  color: white;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/News.vue b/src/pages/News.vue
index 820ecd65c..b3c90da78 100644
--- a/src/pages/News.vue
+++ b/src/pages/News.vue
@@ -52,13 +52,7 @@
       </div>
     </div>
     <div class="pagination flex justify-center mb-8">
-      <Pagination
-        :baseUrl="baseurl"
-        :currentPage="$page.entries.pageInfo.currentPage"
-        :totalPages="$page.entries.pageInfo.totalPages"
-        :maxVisibleButtons="5"
-        v-if="searchResults.length > 7 && news.edges.length > 7"
-      />
+      <Pager :info="$page.entries.pageInfo" range="10" linkClass="pager-link" />
     </div>
   </Layout>
 </template>
@@ -110,7 +104,7 @@ query($page: Int){
 <script>
 import NewsFilterHeader from "~/components/custom/NewsFilterHeader.vue";
 import PostListItem from "~/components/custom/Cards/PostListItem.vue";
-import Pagination from "~/components/custom/Pagination.vue";
+import { Pager } from "gridsome";
 import SearchBox from "~/components/custom/SearchBox.vue";
 import FilterDropdown from "~/components/custom/FilterDropdown.vue";
 export default {
@@ -192,7 +186,7 @@ export default {
   },
   components: {
     PostListItem,
-    Pagination,
+    Pager,
     NewsFilterHeader,
     SearchBox,
     FilterDropdown,
@@ -347,3 +341,21 @@ export default {
 };
 </script>
 
+<style>
+.pagination {
+  display: inline-block;
+  font-size: 1.5rem;
+  text-align: center;
+  width: 100%;
+  color: black;
+}
+.pagination a {
+  text-align: center;
+  padding: 0.6rem 1.2rem;
+  text-decoration: none;
+}
+.active {
+  background-color: #70dfc9;
+  color: white;
+}
+</style>
\ No newline at end of file
diff --git a/src/templates/People.vue b/src/templates/People.vue
index 4a96b0da3..546b6ef54 100644
--- a/src/templates/People.vue
+++ b/src/templates/People.vue
@@ -19,13 +19,7 @@
       </div>
     </div>
     <div class="pagination flex justify-center mb-8">
-      <Pagination
-        :baseUrl="baseurl"
-        :currentPage="$page.entries.pageInfo.currentPage"
-        :totalPages="$page.entries.pageInfo.totalPages"
-        :maxVisibleButtons="5"
-        v-if="$page.entries.pageInfo.totalPages > 1 && $page.entries.edges.length > 0"
-      />
+      <Pager :info="$page.entries.pageInfo" range="10" linkClass="pager-link" />
     </div>
   </Layout>
 </template>
@@ -82,12 +76,14 @@ query($page: Int){
 import PostListItem from "~/components/custom/Cards/PostListItem.vue";
 import TagFilterHeader from "~/components/custom/TagFilterHeader.vue";
 import Pagination from "~/components/custom/Pagination.vue";
+import { Pager } from "gridsome";
 
 export default {
   components: {
     PostListItem,
     TagFilterHeader,
-    Pagination
+    Pagination,
+    Pager,
   },
   metaInfo() {
     return {
@@ -97,7 +93,8 @@ export default {
         {
           key: "description",
           name: "description",
-          content: "Meet the wide range of passionate and dedicated individuals involved in the ThreeFold movement.",
+          content:
+            "Meet the wide range of passionate and dedicated individuals involved in the ThreeFold movement.",
         },
         {
           key: "og:title",
@@ -107,7 +104,8 @@ export default {
         {
           key: "og:description",
           property: "og:description",
-          content: "Meet the wide range of passionate and dedicated individuals involved in the ThreeFold movement.",
+          content:
+            "Meet the wide range of passionate and dedicated individuals involved in the ThreeFold movement.",
         },
         {
           key: "og:image",
@@ -117,7 +115,8 @@ export default {
         {
           key: "twitter:description",
           name: "twitter:description",
-          content: "Meet the wide range of passionate and dedicated individuals involved in the ThreeFold movement.",
+          content:
+            "Meet the wide range of passionate and dedicated individuals involved in the ThreeFold movement.",
         },
         {
           key: "twitter:image",
@@ -153,3 +152,21 @@ export default {
   },
 };
 </script>
+<style>
+.pagination {
+  display: inline-block;
+  font-size: 1.5rem;
+  text-align: center;
+  width: 100%;
+  color: black;
+}
+.pagination a {
+  text-align: center;
+  padding: 0.6rem 1.2rem;
+  text-decoration: none;
+}
+.active {
+  background-color: #70dfc9;
+  color: white;
+}
+</style>
\ No newline at end of file