From f1fb73beec226b23618f49a4eaa45e33f0c8dbde Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 27 Jul 2020 14:03:57 +0200 Subject: [PATCH] Fix css on live search, live search now works --- .../Http/Controllers/ContactController.php | 25 ++++++++++++++++--- skolehjem/public/css/admin.css | 5 ++++ skolehjem/resources/sass/admin/nav/nav.scss | 5 ++++ .../views/admin/contacts/index.blade.php | 3 +-- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 7311c91..3c2616b 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -138,23 +138,40 @@ class ContactController extends Controller public function search(Request $request){ if($request->ajax()){ - $output = ""; - $users = DB::table('users')->where('name_first', 'LIKE',$request->search.'%') + $output = "". + "Kontakt Navn". + "Titel". + "E-mail". + "Tlf". + "\"Update\"". + "\"Delete\"". + ""; + $users = DB::table('contacts')->where('name_first', 'LIKE',$request->search.'%') ->orWhere('name_last','LIKE', $request->search.'%') ->orWhere('phone','LIKE', $request->search.'%') ->orWhere('email','LIKE',$request->search. '%')->get(); - if($users){ + if(count($users) !== 0){ foreach ($users as $key => $user){ $output.=''. '' . $user->name_first . ''. '' . $user->name_last . ''. '' . $user->email . ''. '' . $user->phone .''. + ' $user->id ]) . '">Update'. + '
$user->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. ''; } - return Response($output); + }else{ + $output.= "

Der er ingen resultater...

"; } + return Response($output); } } diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index c1e0293..807857f 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -6628,6 +6628,11 @@ main { margin-right: 4px; } +#search { + margin-bottom: 0; + line-height: 2.3rem; +} + .directorypath { border-radius: 2px; background-color: #333333; diff --git a/skolehjem/resources/sass/admin/nav/nav.scss b/skolehjem/resources/sass/admin/nav/nav.scss index d46b2b1..5f1d02c 100644 --- a/skolehjem/resources/sass/admin/nav/nav.scss +++ b/skolehjem/resources/sass/admin/nav/nav.scss @@ -47,3 +47,8 @@ height: 1em; margin-right: 4px; } + +#search { + margin-bottom: 0; + line-height: 2.3rem; +} diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index fb9f980..1321fcf 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -58,8 +58,7 @@ data: {'search':$value}, success:function (data) { $('tbody').html(data); - console.log(data); - console.log($value) + console.log(data) }, error:function (data) { console.log(data);