From 2dd20ac85ae30b8b9ac2f5073b05adb6ea52840b Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 27 Jul 2020 13:07:19 +0200 Subject: [PATCH] Semi fix live search --- .idea/php.xml | 37 +++++++++++++++++++ .idea/skolehjem-webapp.iml | 37 +++++++++++++++++++ skolehjem/.env.example | 2 +- .../Http/Controllers/ContactController.php | 10 ++--- skolehjem/database/seeds/UserSeeder.php | 1 + .../views/admin/contacts/index.blade.php | 6 ++- skolehjem/routes/web.php | 2 +- 7 files changed, 87 insertions(+), 8 deletions(-) diff --git a/.idea/php.xml b/.idea/php.xml index f1a82aa..553889a 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -82,6 +82,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/skolehjem-webapp.iml b/.idea/skolehjem-webapp.iml index 0da7fb8..924e151 100644 --- a/.idea/skolehjem-webapp.iml +++ b/.idea/skolehjem-webapp.iml @@ -12,15 +12,22 @@ + + + + + + + @@ -35,15 +42,30 @@ + + + + + + + + + + + + + + + @@ -54,6 +76,19 @@ + + + + + + + + + + + + + @@ -83,9 +118,11 @@ + + diff --git a/skolehjem/.env.example b/skolehjem/.env.example index ac74863..bb147f0 100644 --- a/skolehjem/.env.example +++ b/skolehjem/.env.example @@ -6,7 +6,7 @@ APP_URL=http://localhost LOG_CHANNEL=stack -DB_CONNECTION=mysql +DB_CONNECTION=sqlite DB_HOST=127.0.0.1 DB_PORT=3306 DB_DATABASE=laravel diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 94236d4..7311c91 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -139,17 +139,17 @@ class ContactController extends Controller public function search(Request $request){ if($request->ajax()){ $output = ""; - $users = DB::table('users')->where('name_first', 'LIKE','%'.$request->search.'%') - ->orWhere('name_last','LIKE', '%'. $request->search.'%') - ->orWhere('phone','LIKE', '%' . $request->search.'%') - ->orWhere('mail','LIKE','%'.$request->serach. '%')->get(); + $users = DB::table('users')->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){ foreach ($users as $key => $user){ $output.=''. '' . $user->name_first . ''. '' . $user->name_last . ''. - '' . $user->mail . ''. + '' . $user->email . ''. '' . $user->phone .''. ''; } diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php index 029d2d4..39325cf 100644 --- a/skolehjem/database/seeds/UserSeeder.php +++ b/skolehjem/database/seeds/UserSeeder.php @@ -28,6 +28,7 @@ class UserSeeder extends Seeder } + Log::debug("OPRET"); $user = new \App\User(); diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 2dc74dc..fb9f980 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -54,11 +54,15 @@ $value = $(this).val(); $.ajax({ type: 'get', - url: '{{URL::to('contacts')}}', + url: '{{route('contacts.search')}}', data: {'search':$value}, success:function (data) { $('tbody').html(data); console.log(data); + console.log($value) + }, + error:function (data) { + console.log(data); } }); }) diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 3cb19ff..da4b509 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -30,7 +30,7 @@ Route::get("/account/edit", "UserController@accountedit")->name("users.accounted Route::get("/account/editpass", "UserController@accounteditpass")->name("users.accounteditpass"); Route::post("/account/update", "UserController@update")->name("users.accountupdate"); Route::get("phones", "PhoneController@index")->name("phones.index"); - +Route::get("/contactsapi", "ContactController@search")->name("contacts.search"); Route::resource("contacts", "ContactController"); Route::resource("menu-plans", "MenuPlanController");