From e2847e9959f19c6893339ebd9f071e2cc78bf891 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Mon, 3 Aug 2020 13:21:47 +0200
Subject: [PATCH] Fixed PageNation

---
 skolehjem/app/Http/Controllers/UserController.php     | 6 +++---
 skolehjem/resources/views/admin/users/index.blade.php | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 62db770..3e817a2 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -39,7 +39,7 @@ class UserController extends Controller
     public function index(Request $request)
     {
         //$users = User::query()->paginate($request->query("page", 20));
-        $users = User::query()->orderBy('id', 'desc')->paginate(20);
+        $users = User::query()->orderBy('id', 'asc')->paginate(20);
 
         return Response::detect("users.index", [ "users" => $users ]);
     }
@@ -321,7 +321,7 @@ class UserController extends Controller
                     foreach ($roles as $role) {
                         if($user->hasRole($role)) {
                             array_push($users, $user);
-                            break 2;
+                            break 1;
                         }
                     }
                 }
@@ -348,7 +348,7 @@ class UserController extends Controller
                     foreach ($roles as $role) {
                         if($user->hasRole($role)) {
                             array_push($users, $user);
-                            break 2;
+                            break 1;
                         }
                     }
                 }
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index 703106e..76f7a53 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -70,13 +70,16 @@
     {{ $users->links() }}
 
         <script>
+            var url = new URL(window.location.href);
+            var page = url.searchParams.get("page");
+
             $('#search').on('keyup', function () {
                 $value = $(this).val();
                 $checkboxValue = $( "input:checked" ).val();
                 $.ajax({
                     type: 'get',
                     url: '{{route('users.search')}}',
-                    data: {'search':$value, 'isCheck': $checkboxValue},
+                    data: {'search':$value, 'isCheck': $checkboxValue, 'page': page },
                     success:function (data) {
                         console.log($checkboxValue);
                         $('tbody').html(data);