Merge pull request #39 from TheBarbaraIsTaken/pagination-search

Added ability to search with pagination
EotvosCollegium · May 22, 2023 · 4593eaa · 4593eaa
2 parents 0ae4168 + 206b2b0
commit 4593eaa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/app/Http/Controllers/AlumnusController.php b/app/Http/Controllers/AlumnusController.php
@@ -100,9 +100,9 @@ public function searchAlumni(Request $request)
         $user = Auth::user();
         if ($user && $user->can('create', Alumnus::class)) {
             $idsHavingDraftPairs = DB::table('alumni')->where('is_draft', false)->whereNotNull('pair_id')->pluck('id');
-            $alumni = $query->whereNotIn('id', $idsHavingDraftPairs)->get();
+            $alumni = $query->whereNotIn('id', $idsHavingDraftPairs)->paginate(10);
         } else {
-            $alumni = $query->where('is_draft', false)->get();
+            $alumni = $query->where('is_draft', false)->paginate(10);
         }
 
         return view('alumni.index', [

diff --git a/resources/views/alumni/index.blade.php b/resources/views/alumni/index.blade.php
@@ -159,7 +159,7 @@
                     </div>
                 @endforelse
             </div>
-            @if(isset($alumni) && !empty($alumni) && !isset($search))
+            @if(isset($alumni) && !empty($alumni))
                 <div class="d-flex justify-content-center">
                     {{ $alumni->links('pagination::bootstrap-4') }}
                 </div>
@@ -224,6 +224,17 @@
             }
         });
     });
+
+    var links = document.getElementsByTagName("a");
+
+    const urlParams = new URLSearchParams(window.location.search);
+    urlParams.delete("_token");
+    urlParams.delete("page");
+    for (var i = 0; i < links.length; i++) {
+        if(links[i].href.includes("alumni/search?page=")){
+            links[i].href += "&" + urlParams.toString();
+        }
+    }
 </script>
 
 @endsection