From 89dfaf1d5dbdcd0555fb6590aa17a1bebc82850d Mon Sep 17 00:00:00 2001
From: Jai A <jai.a@tuta.io>
Date: Mon, 7 Sep 2020 13:01:42 -0700
Subject: [PATCH] Pagination fixes, change displayed results to 6

---
 assets/styles/global.scss |  2 +-
 components/ModResult.vue  |  3 +-
 pages/mods.vue            | 62 ++++++++++++++++++++++++++++-----------
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/assets/styles/global.scss b/assets/styles/global.scss
index 6346b474d..9c4d6d593 100644
--- a/assets/styles/global.scss
+++ b/assets/styles/global.scss
@@ -53,7 +53,7 @@ a {
 
 h2 {
   margin-top: 0;
-  margin-bottom: 1.5rem;
+  margin-bottom: 1.25rem;
 }
 
 h3 {
diff --git a/components/ModResult.vue b/components/ModResult.vue
index ecc16099c..0ede200b2 100644
--- a/components/ModResult.vue
+++ b/components/ModResult.vue
@@ -371,8 +371,7 @@ export default {
 
 <style lang="scss">
 .results {
-  margin-top: 20px;
-  margin-bottom: 50px;
+  margin-top: 10px;
 }
 
 .result {
diff --git a/pages/mods.vue b/pages/mods.vue
index 665653635..aa33f6aa6 100644
--- a/pages/mods.vue
+++ b/pages/mods.vue
@@ -10,7 +10,7 @@
             type="search"
             name="search"
             placeholder="Search mods"
-            @input="onSearchChange(true)"
+            @input="onSearchChange(1)"
           />
           <svg
             viewBox="0 0 24 24"
@@ -24,6 +24,24 @@
             <line x1="21" y1="21" x2="16.65" y2="16.65" />
           </svg>
         </div>
+        <!--<div class="iconified-select column-grow-1">
+          <select id="sort-type" @input="changeSortType">
+            <option value="relevance" selected>Relevance</option>
+            <option value="downloads">Total Downloads</option>
+            <option value="newest">Newest</option>
+            <option value="updated">Updated</option>
+          </select>
+          <svg
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          >
+            <polyline points="6 9 12 15 18 9"></polyline>
+          </svg>
+        </div>-->
         <div
           v-if="pages.length > 1"
           class="pagination column-grow-1 columns paginates"
@@ -36,7 +54,7 @@
             stroke-width="2"
             stroke-linecap="round"
             stroke-linejoin="round"
-            @click="currentPage !== 1 ? switchPage(currentPage - 1) : null"
+            @click="currentPage !== 1 ? onSearchChange(currentPage - 1) : null"
           >
             <polyline points="15 18 9 12 15 6"></polyline>
           </svg>
@@ -46,7 +64,7 @@
             :class="{
               'active-page-number': currentPage !== item,
             }"
-            @click="currentPage !== item ? switchPage(item) : null"
+            @click="currentPage !== item ? onSearchChange(item) : null"
           >
             <span v-if="pages[index - 1] + 1 !== item && item !== 1">...</span>
             <span :class="{ 'disabled-page-number': currentPage === item }">{{
@@ -66,7 +84,7 @@
             stroke-linejoin="round"
             @click="
               currentPage !== pages[pages.length - 1]
-                ? switchPage(currentPage + 1)
+                ? onSearchChange(currentPage + 1)
                 : null
             "
           >
@@ -328,10 +346,11 @@ export default {
       results: [],
       pages: [],
       currentPage: 1,
+      sortType: 'relevance',
     }
   },
   async created() {
-    await this.onSearchChange()
+    await this.onSearchChange(1)
   },
   methods: {
     async toggleFilter(elementName) {
@@ -346,16 +365,14 @@ export default {
         this.filters.push(element.id)
       }
 
-      await this.onSearchChange(true)
+      await this.onSearchChange(1)
     },
-    async switchPage(pageNumber) {
-      this.currentPage = pageNumber
+    async changeSortType() {
+      this.sortType = document.getElementById('sort-type').value
 
-      await this.onSearchChange(false)
+      await this.onSearchChange(1)
     },
-    async onSearchChange(resetPageNumber) {
-      if (resetPageNumber) this.currentPage = 1
-
+    async onSearchChange(newPageNumber) {
       const config = {
         headers: {
           Accept: 'application/json',
@@ -364,7 +381,7 @@ export default {
 
       try {
         let url = 'https://api.modrinth.com/api/v1/mod'
-        const params = []
+        const params = ['limit=6', `index=${this.sortType}`]
 
         if (this.query.length > 0) {
           params.push(`query=${this.query.replace(/ /g, '+')}`)
@@ -380,8 +397,8 @@ export default {
           params.push(`facets=${JSON.stringify(facets)}`)
         }
 
-        if (this.currentPage !== 1) {
-          params.push(`offset=${(this.currentPage - 1) * 10}`)
+        if (newPageNumber !== 1) {
+          params.push(`offset=${(newPageNumber - 1) * 6}`)
         }
 
         if (params.length > 0) {
@@ -393,10 +410,19 @@ export default {
         const res = await axios.get(url, config)
         this.results = res.data.hits
 
-        const pageAmount = Math.ceil(res.data.nb_hits / res.data.limit)
+        const pageAmount = Math.ceil(res.data.total_hits / res.data.limit)
 
+        this.currentPage = newPageNumber
         if (pageAmount > 4) {
-          if (this.currentPage > 4) {
+          if (this.currentPage + 1 >= pageAmount) {
+            this.pages = [
+              1,
+              pageAmount - 3,
+              pageAmount - 2,
+              pageAmount - 1,
+              pageAmount,
+            ]
+          } else if (this.currentPage > 4) {
             this.pages = [
               1,
               this.currentPage - 1,
@@ -506,10 +532,12 @@ export default {
 }
 
 .active-page-number {
+  user-select: none;
   cursor: pointer;
 }
 
 .disabled-page-number {
+  user-select: none;
   cursor: default;
   padding: 2px 3px;
   border-radius: 3px;