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 96487ee..443cd99 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; use App\Contact; +use Illuminate\Support\Facades\DB; use phpDocumentor\Reflection\Types\Context; //hello class ContactController extends Controller @@ -132,4 +133,48 @@ class ContactController extends Controller $contact->delete(); return redirect()->route("contacts.index"); } + + + + public function search(Request $request){ + if($request->ajax()){ + $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(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); + } + } + + + + + } diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index c4d49de..f487688 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -6,6 +6,7 @@ use App\Event; use App\User; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\DB; class EventController extends Controller @@ -135,4 +136,44 @@ class EventController extends Controller $event->delete(); return redirect()->route("events.index"); } + + + public function search(Request $request){ + if($request->ajax()){ + $output = "". + "Event Navn". + "Event Beskrivelse". + "Event Dato". + "\"Update\"". + "\"Delete\"". + ""; + $events = DB::table('events')->where('name', 'LIKE',$request->search.'%') + ->orWhere('date','LIKE', $request->search.'%') + ->get(); + + if(count($events) !== 0){ + foreach ($events as $key => $event){ + $output.=''. + '' . $event->name . ''. + '' . $event->description .''. + '' . $event->date .''. + ' $event->id ]) . '">Update'. + '
$event->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. + ''; + } + } + return Response($output); + } + } + + + } + + diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 27db7c0..279bf1c 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -6,6 +6,7 @@ use App\ExternalLink; use App\MenuPlan; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\DB; class MenuPlanController extends Controller @@ -120,7 +121,7 @@ class MenuPlanController extends Controller /** * Remove the specified resource from storage. - * + * Test delete return index function. * @param int $id * @return \Illuminate\Http\RedirectResponse */ @@ -130,4 +131,43 @@ class MenuPlanController extends Controller $menuplan->delete(); return redirect()->route("menu-plans.index"); } + + + public function search(Request $request){ + if($request->ajax()){ + $output = "". + "Uge". + "Mandag". + "Tirsdag". + "Onsdag". + "Torsdag". + "\"Update\"". + "\"Delete\"". + ""; + $menuplans = DB::table('menu_plans')->where('week', 'LIKE',$request->search.'%')->get(); + + if(count($menuplans) !== 0){ + foreach ($menuplans as $key => $menuplan){ + $output.=''. + '' . $menuplan->week . ''. + '' . $menuplan->monday . ''. + '' . $menuplan->tuesday . ''. + '' . $menuplan->wednesday .''. + '' . $menuplan->thursday .''. + ' $menuplan->id ]) . '">Update'. + '
$menuplan->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. + ''; + } + } + return Response($output); + } + } + + } diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 093cbe8..801a275 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\DB; use Spatie\Permission\Models\Role; class rolesController extends Controller @@ -115,4 +116,38 @@ class rolesController extends Controller $role->delete(); return redirect()->route("roles.index"); } + + + public function search(Request $request){ + if($request->ajax()){ + $output = "". + "Navn". + "Beskrivelse". + "\"Update\"". + "\"Delete\"". + ""; + $roles = DB::table('roles')->where('name', 'LIKE',$request->search.'%')->get(); + + if(count($roles) !== 0){ + foreach ($roles as $key => $role){ + $output.=''. + '' . $role->name . ''. + '' . $role->description . ''. + ' $role->id ]) . '">Update'. + '
$role->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. + ''; + } + } + return Response($output); + } + } + + + } diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index c027dbe..7e3be4d 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -7,6 +7,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use App\User; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Log; use Spatie\Permission\Models\Role; @@ -272,4 +273,60 @@ class UserController extends Controller { return Response::detect("users.editpass"); } + + + public function search(Request $request){ + if($request->ajax()){ + $output = "". + "Fornavn". + "Efternavn". + "Email". + "Tlf nr". + "Rolle(r)". + "\"Update\"". + "\"Delete\"". + ""; + $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(count($users) !== 0){ + foreach ($users as $key => $user){ + $roles = null; + $rolesString = null; + + foreach (User::all() as $usr) { + if($usr->id == $user->id) + $roles = $usr->roles; + } + + for($i = 0; $i < count($roles); $i++) { + if(count($roles)-1 != $i) { + $rolesString .= $roles[$i]->name.","; + }else { + $rolesString = $roles[$i]->name; + } + } + + $output.=''. + '' . $user->name_first . ''. + '' . $user->name_last . ''. + '' . $user->email . ''. + '' . $user->phone .''. + '' . $rolesString .''. + ' $user->id ]) . '">Update'. + '
$user->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. + ''; + } + } + return Response($output); + } + } } diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php index 1682659..e723546 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/package-lock.json b/skolehjem/package-lock.json index f84361c..89c5c1a 100644 --- a/skolehjem/package-lock.json +++ b/skolehjem/package-lock.json @@ -5070,6 +5070,12 @@ } } }, + "jquery": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", + "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==", + "dev": true + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/skolehjem/package.json b/skolehjem/package.json index 5126d1c..6fd5e74 100644 --- a/skolehjem/package.json +++ b/skolehjem/package.json @@ -12,6 +12,7 @@ "devDependencies": { "axios": "^0.19", "cross-env": "^7.0", + "jquery": "^3.5.1", "laravel-mix": "^5.0.1", "lodash": "^4.17.13", "resolve-url-loader": "^2.3.1", 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 d681ea9..71335dd 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -10,8 +10,16 @@ @endsection @section("content") +
CreateOpret Kontakt + +
+ @csrf + +
+ +
@@ -39,4 +47,24 @@ @endforeach
+ + + + + @endsection diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index f27f4c1..2ed1629 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -10,8 +10,15 @@ @endsection @section("content") +
CreateOpret Event + +
+ @csrf + +
+
@@ -40,4 +47,24 @@ {{ $events->links() }} + + + + @endsection diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index d63d272..83e091a 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -10,8 +10,15 @@ @endsection @section("content") +
CreateOpret Menuplan + +
+ @csrf + + +
@@ -43,4 +50,24 @@
{{ $menuPlans->links() }} + + + + + @endsection diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php index fe3e3e7..554eb3b 100644 --- a/skolehjem/resources/views/admin/roles/index.blade.php +++ b/skolehjem/resources/views/admin/roles/index.blade.php @@ -10,8 +10,16 @@ @endsection @section("content") +
CreateOpret Rolle + +
+ @csrf + +
+ +
@@ -35,4 +43,26 @@ @endforeach
+ + + + + + @endsection diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index ffbbfb6..42045a6 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -10,8 +10,17 @@ @endsection @section("content") -
+ +
+ + CreateOpret Bruger + +
+ @csrf + +
+
@@ -30,6 +39,7 @@ @endforeach
{{ $user->email }} {{ $user->phone }} + @for($i = 0; $i < count($user->roles); $i++) @if(count($user->roles)-1 != $i) {{$user->roles[$i]->name}}, @@ -49,6 +59,27 @@
- {{ $users->links() }} + + + + + + @endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index 2100b13..b26f834 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -12,6 +12,12 @@ @section("content")
CreateOpret Reservation + +
+ @csrf + +
+
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 3cb19ff..00e6079 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -30,6 +30,13 @@ 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::get("/eventsapi", "EventController@search")->name("events.search"); +Route::get("/menuplansapi", "MenuPlanController@search")->name("menu-plans.search"); +Route::get("/rolesapi", "RolesController@search")->name("roles.search"); +Route::get("/userapi", "UserController@search")->name("users.search"); + + Route::resource("contacts", "ContactController");