From 54a0fd0997dff7b8d111ceafa57f880e371b77c3 Mon Sep 17 00:00:00 2001 From: Vedde Date: Wed, 1 Jul 2020 09:08:33 +0200 Subject: [PATCH 01/19] Added resource category migration and empty blade files --- .../ResourceCategoryController.php | 38 ++++++++++++++----- ...7_01_064330_create_resource_categories.php | 34 +++++++++++++++++ .../resource-categories/create.blade.php | 0 .../resource-categories/delete.blade.php | 0 .../admin/resource-categories/edit.blade.php | 0 .../admin/resource-categories/index.blade.php | 0 .../admin/resource-categories/show.blade.php | 0 .../admin/resource-categories/store.blade.php | 0 .../resource-categories/update.blade.php | 0 skolehjem/routes/web.php | 1 + 10 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php create mode 100644 skolehjem/resources/views/admin/resource-categories/create.blade.php create mode 100644 skolehjem/resources/views/admin/resource-categories/delete.blade.php create mode 100644 skolehjem/resources/views/admin/resource-categories/edit.blade.php create mode 100644 skolehjem/resources/views/admin/resource-categories/index.blade.php create mode 100644 skolehjem/resources/views/admin/resource-categories/show.blade.php create mode 100644 skolehjem/resources/views/admin/resource-categories/store.blade.php create mode 100644 skolehjem/resources/views/admin/resource-categories/update.blade.php diff --git a/skolehjem/app/Http/Controllers/ResourceCategoryController.php b/skolehjem/app/Http/Controllers/ResourceCategoryController.php index eec6519..657c6ec 100644 --- a/skolehjem/app/Http/Controllers/ResourceCategoryController.php +++ b/skolehjem/app/Http/Controllers/ResourceCategoryController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\ResourceCategory; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -23,9 +24,11 @@ class ResourceCategoryController extends Controller * * @return \Illuminate\Http\Response */ - public function index() + public function index(Request $request) { - // + $categories = ResourceCategory::query()->paginate($request->input("limit", 20)); + + return Response::detect("resource-categories.index", ["category"=> $categories]); } /** @@ -35,7 +38,7 @@ class ResourceCategoryController extends Controller */ public function create() { - // + return Response::detect("resource-categories.create"); } /** @@ -46,7 +49,15 @@ class ResourceCategoryController extends Controller */ public function store(Request $request) { - // + $requestBody = $request->validate([ + "name" => "unique|required|max:255", + "description" => "required|max:255", + "slug" => "unique|required|max:255" + ]); + $category = new ResourceCategory($requestBody); + $category->save(); + + return Response::detect("resource-categories.store"); } /** @@ -55,9 +66,9 @@ class ResourceCategoryController extends Controller * @param int $id * @return \Illuminate\Http\Response */ - public function show($id) + public function show(ResourceCategory $id) { - // + return Response::detect("resource-categories.show", ["category" => $id]); } /** @@ -68,7 +79,8 @@ class ResourceCategoryController extends Controller */ public function edit($id) { - // + $category = ResourceCategory::find($id); + return Response::detect("resource-categories.edit", ["category" => $category]); } /** @@ -80,7 +92,13 @@ class ResourceCategoryController extends Controller */ public function update(Request $request, $id) { - // + $data = $request->all(); + + $category = ResourceCategory::find($id); + $category->update($data); + $category->save(); + + return Response::detect("resource-categories.update", ["category" => $category]); } /** @@ -91,6 +109,8 @@ class ResourceCategoryController extends Controller */ public function destroy($id) { - // + $category = ResourceCategory::find($id); + $category->delete(); + return redirect()->route("resource-categories.index"); } } diff --git a/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php b/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php new file mode 100644 index 0000000..290931b --- /dev/null +++ b/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php @@ -0,0 +1,34 @@ +id(); + $table->string("name")->unique(); + $table->text("description"); + $table->string("slug")->unique(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('resource_categories'); + } +} diff --git a/skolehjem/resources/views/admin/resource-categories/create.blade.php b/skolehjem/resources/views/admin/resource-categories/create.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/resources/views/admin/resource-categories/delete.blade.php b/skolehjem/resources/views/admin/resource-categories/delete.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/resources/views/admin/resource-categories/edit.blade.php b/skolehjem/resources/views/admin/resource-categories/edit.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/resources/views/admin/resource-categories/index.blade.php b/skolehjem/resources/views/admin/resource-categories/index.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/resources/views/admin/resource-categories/show.blade.php b/skolehjem/resources/views/admin/resource-categories/show.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/resources/views/admin/resource-categories/store.blade.php b/skolehjem/resources/views/admin/resource-categories/store.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/resources/views/admin/resource-categories/update.blade.php b/skolehjem/resources/views/admin/resource-categories/update.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index b371e91..317bd3b 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -39,3 +39,4 @@ Route::resource("washing-reservations", "WashingReservationController"); Route::resource("feedbacks", "FeedbackController"); Route::resource("external-links", "ExternalLinkController"); Route::resource("resource-extensions", "ResourceExtensionController"); +Route::resource("resource-categories", "ResourceCategoryController"); From a1c73b0224f846ed42a5f2d8809ceab2b1d946b0 Mon Sep 17 00:00:00 2001 From: Vedde Date: Wed, 1 Jul 2020 09:15:11 +0200 Subject: [PATCH 02/19] changed web.php to be correct --- skolehjem/routes/web.php | 1 + 1 file changed, 1 insertion(+) diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 38e1ae5..24bfa60 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -40,4 +40,5 @@ Route::resource("washing-reservations", "WashingReservationController"); Route::resource("feedbacks", "FeedbackController"); Route::resource("external-links", "ExternalLinkController"); Route::resource("resource-extensions", "ResourceExtensionController"); +Route::resource("resource-categories", "ResourceCategoryController"); Route::resource("roles", "RolesController"); From 016613b469eaec3a1204a34ad75c762d9c968d0d Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 1 Jul 2020 09:16:53 +0200 Subject: [PATCH 03/19] Fix --- .../Http/Controllers/MenuPlanController.php | 9 ++++++-- .../app/Http/Controllers/RolesController.php | 21 +++++++++++++++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index d6e334b..7707dc1 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -60,9 +60,14 @@ class MenuPlanController extends Controller ]); $menuPlans = new MenuPlan($requestMenuPlanCreate); - $menuPlans->save(); + $saved = $menuPlans->save(); - return Response::detect("menuplans.store"); + if(!$saved){ + return Response::detect("menuplans.store"); + }else{ + $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); + return Response::detect("menuplans.index", ['menuplan' => $menuPlans]); + } } /** diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 6f58467..093cbe8 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -45,9 +45,16 @@ class rolesController extends Controller ]); $role = new Role($requestRole); - $role->save(); + $saved = $role->save(); + + if(!$saved){ + return Response::detect("roles.store"); + }else{ + $roles = Role::query()->paginate($request->input("limit", 20)); + return Response::detect("roles.index", ['roles' => $roles]); + } + - return Response::detect("roles.store"); } /** @@ -85,9 +92,15 @@ class rolesController extends Controller $data = $request->all(); $role = Role::find($id); $role->update($data); - $role->save(); + $saved = $role->save(); + + if(!$saved){ + return Response::detect("roles.update", [ "role" => $role ]); + }else{ + $roles = Role::query()->paginate($request->input("limit", 20)); + return Response::detect("roles.index", ['roles' => $roles]); + } - return Response::detect("roles.update", [ "role" => $role ]); } /** From f0a203fbb26852a54b59c79903f480ab19246799 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 1 Jul 2020 09:27:18 +0200 Subject: [PATCH 04/19] Rearranged admin panel site navigation --- skolehjem/public/css/admin.css | 26 +++++-- skolehjem/resources/sass/admin/nav/nav.scss | 28 +++++-- .../views/admin/contacts/index.blade.php | 5 +- .../views/admin/events/index.blade.php | 5 +- .../admin/external-links/index.blade.php | 5 +- .../views/admin/feedbacks/index.blade.php | 5 +- .../views/admin/layout/base.blade.php | 75 +++---------------- .../views/admin/menuplans/index.blade.php | 5 +- .../views/admin/roles/index.blade.php | 5 +- .../views/admin/users/index.blade.php | 5 +- .../admin/washing-machines/index.blade.php | 5 +- .../washing-reservations/index.blade.php | 5 +- 12 files changed, 87 insertions(+), 87 deletions(-) diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index c6b3a23..c1e0293 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -6588,16 +6588,18 @@ main { min-width: 194px; } -.segment { - margin-bottom: 1.25rem; -} - .segment > h3 { margin-left: -1rem; margin-top: 0; - width: calc(100% + 2rem); - background-color: rgba(0, 0, 0, 0.2); + width: calc(100% + 1rem); text-align: center; + margin-bottom: 0; + font-size: 1.15em; +} + +.segment > h3 > a { + padding: 1rem 2rem; + display: block; } .segment > div { @@ -6607,7 +6609,7 @@ main { margin-bottom: 0.5rem; } -.segment > div:hover { +.segment > h3:hover { background-color: rgba(0, 0, 0, 0.2); } @@ -6616,6 +6618,16 @@ main { padding-right: 8px; } +.btn-inline { + display: inline-flex; + align-items: center; +} + +.btn-inline > img { + height: 1em; + margin-right: 4px; +} + .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 f200ee7..d46b2b1 100644 --- a/skolehjem/resources/sass/admin/nav/nav.scss +++ b/skolehjem/resources/sass/admin/nav/nav.scss @@ -4,16 +4,18 @@ min-width: 194px; } -.segment { - margin-bottom: 1.25rem; -} - .segment > h3 { margin-left: -1rem; margin-top: 0; - width: calc(100% + 2rem); - background-color: rgba(0,0,0, 0.2); + width: calc(100% + 1rem); text-align: center; + margin-bottom: 0; + font-size: 1.15em; +} + +.segment > h3 > a { + padding: 1rem 2rem; + display: block; } .segment > div { @@ -23,8 +25,8 @@ margin-bottom: .5rem; } -.segment > div:hover { - background-color: rgba(0,0,0,0.2); +.segment > h3:hover { + background-color: rgba(0,0,0, 0.2); } .segment > div > a > img { @@ -35,3 +37,13 @@ .segment > div > a { } + +.btn-inline { + display: inline-flex; + align-items: center; +} + +.btn-inline > img { + height: 1em; + margin-right: 4px; +} diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index dc0d212..f180b26 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -10,7 +10,10 @@ @endsection @section("content") - +
+ CreateOpret Kontakt +
+
diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 95e6bb1..f27f4c1 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -10,7 +10,10 @@ @endsection @section("content") -
Kontakt Navn Titel
+
+ CreateOpret Event +
+
diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php index 069db81..4e4dcad 100644 --- a/skolehjem/resources/views/admin/external-links/index.blade.php +++ b/skolehjem/resources/views/admin/external-links/index.blade.php @@ -10,7 +10,10 @@ @endsection @section("content") -
Event Navn Event Beskrivelse
+
+ CreateOpret Ektern Link +
+
diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php index 3961ebb..8dc3496 100644 --- a/skolehjem/resources/views/admin/feedbacks/index.blade.php +++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php @@ -10,7 +10,10 @@ @endsection @section("content") -
Title Link
+
+ CreateOpret Feedback +
+
diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 41bb86b..36e1a71 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -11,85 +11,34 @@
-

Brugere

-
- ReadVis Brugere -
-
- CreateOpret Bruger -
+

Brugere

-

Roller

-
- ReadVis Roller -
-
- CreateOpret Rolle -
+

Roller

-

Menuplan

-
- ReadVis Menuplan -
-
- CreateOpret Menuplan -
+

Menuplan

-

Aktiviteter

-
- ReadVis Aktiviteter -
-
- CreateOpret Aktivitet -
+

Aktiviteter

-

Vaskemaskiner

-
- ReadVis Vaskemaskiner -
-
- ReadVis Vaskemaskine Reservationer -
-
- CreateOpret Vaskemaskine -
+

Vaskemaskiner

-

Eksterne Links

-
- ReadVis Links -
-
- CreateOpret Link -
+

Vaskemaskiner Reservationer

+
+
+

Eksterne Links

{{--
--}} -{{--

Personale

--}} -{{--
--}} -{{-- ReadVis Personale--}} -{{--
--}} -{{--
--}} -{{-- CreateOpret Personal--}} -{{--
--}} +{{--

Personale

--}} {{--
--}}
-

Kontakter

-
- ReadVis Kontakter -
-
- CreateOpret Kontakt -
+

Kontakter

-

Feedback

-
- ReadVis Feedback -
+

Feedback

diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index e1f75d2..d63d272 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -10,7 +10,10 @@ @endsection @section("content") -
Feedback Besked Ris el. Ros
+
+ CreateOpret Menuplan +
+
diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php index 29aab0d..fe3e3e7 100644 --- a/skolehjem/resources/views/admin/roles/index.blade.php +++ b/skolehjem/resources/views/admin/roles/index.blade.php @@ -10,7 +10,10 @@ @endsection @section("content") -
Uge Mandag
+
+ CreateOpret Rolle +
+
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index f778fe1..ffbbfb6 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -10,7 +10,10 @@ @endsection @section("content") -
Navn Beskrivelse
+
+ CreateOpret Bruger +
+
diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php index f7a9d97..1b2be54 100644 --- a/skolehjem/resources/views/admin/washing-machines/index.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php @@ -10,7 +10,10 @@ @endsection @section("content") -
Fornavn Efternavn
+
+ CreateOpret Vaskemaskine +
+
diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index cc31d74..46939c3 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -10,7 +10,10 @@ @endsection @section("content") -
Navn Update
+
+ CreateOpret Reservation +
+
From 47daff173c1b2f4f284451f626e1cd72e6d7c169 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 1 Jul 2020 09:27:54 +0200 Subject: [PATCH 05/19] Added "no role" option when updating and creating a user --- skolehjem/resources/views/admin/users/create.blade.php | 1 + skolehjem/resources/views/admin/users/edit.blade.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 0802da9..0216fe0 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -28,6 +28,7 @@ + From ca744a33e91c0bb82c459a9e4fcc46592d45a402 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 1 Jul 2020 09:50:29 +0200 Subject: [PATCH 08/19] Removed feedback create button from admin dashboard --- skolehjem/resources/views/admin/feedbacks/index.blade.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php index 8dc3496..3961ebb 100644 --- a/skolehjem/resources/views/admin/feedbacks/index.blade.php +++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php @@ -10,10 +10,7 @@ @endsection @section("content") -
- CreateOpret Feedback -
-
Fornavn Efternavn
+
From eb4851454583c1c3ffd3dff50f80f92dde72f4b4 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 1 Jul 2020 09:50:37 +0200 Subject: [PATCH 09/19] Made it so you get send to index after you make,edit and update user information --- .../Http/Controllers/ContactController.php | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index f71dc01..e649834 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 phpDocumentor\Reflection\Types\Context; class ContactController extends Controller { @@ -59,9 +60,15 @@ class ContactController extends Controller ]); $contact = new Contact($requestContact); - $contact->save(); + $saved = $contact->save(); + + if(!$saved){ + return Response::detect("contacts.store"); + }else{ + $contact = Contact::query()->paginate($request->input("limit", 20)); + return Response::detect("contacts.index", ['contacts' => $contact]); + } - return Response::detect("contacts.store"); } /** @@ -101,9 +108,15 @@ class ContactController extends Controller $data = $request->all(); $contact = Contact::find($id); $contact->update($data); - $contact->save(); + $saved = $contact->save(); + + if(!$saved){ + return Response::detect("contacts.update", [ "contacts" => $contact ]); + }else{ + $contact = Contact::query()->paginate($request->input("limit", 20)); + return Response::detect("contacts.index", ['contacts' => $contact]); + } - return Response::detect("contacts.update", [ "contacts" => $contact ]); } /** From 03b7f4236a2a05bc4856e59a3dc57b89ccfa3b6b Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 1 Jul 2020 10:13:49 +0200 Subject: [PATCH 10/19] Users able to change password --- .../app/Http/Controllers/UserController.php | 15 +++++++++---- .../views/app/users/account.blade.php | 1 + .../resources/views/app/users/edit.blade.php | 4 +++- .../views/app/users/editpass.blade.php | 22 +++++++++++++++++++ skolehjem/routes/web.php | 2 ++ 5 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 skolehjem/resources/views/app/users/editpass.blade.php diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index d39c252..6a0ce84 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -153,11 +153,13 @@ class UserController extends Controller /** @var User $user */ $user->update($data); - $user->roles()->detach(); - $user->forgetCachedPermissions(); + if ($request->roles != null) { + $user->roles()->detach(); + $user->forgetCachedPermissions(); - foreach ($request->roles as $role){ - $user->assignRole($role); + foreach ($request->roles as $role){ + $user->assignRole($role); + } } $user->save(); @@ -246,4 +248,9 @@ class UserController extends Controller { return Response::detect("users.edit"); } + + public function accounteditpass() + { + return Response::detect("users.editpass"); + } } diff --git a/skolehjem/resources/views/app/users/account.blade.php b/skolehjem/resources/views/app/users/account.blade.php index 1572b8f..0d6d374 100644 --- a/skolehjem/resources/views/app/users/account.blade.php +++ b/skolehjem/resources/views/app/users/account.blade.php @@ -11,5 +11,6 @@

Email: {{ Auth::user()->email }}

Telefon Nr.: {{ Auth::user()->phone }}

Rediger Oplysninger + Ændre Password @endsection diff --git a/skolehjem/resources/views/app/users/edit.blade.php b/skolehjem/resources/views/app/users/edit.blade.php index 73ee773..a43f37d 100644 --- a/skolehjem/resources/views/app/users/edit.blade.php +++ b/skolehjem/resources/views/app/users/edit.blade.php @@ -7,7 +7,9 @@ @section("content")

Konto

-
+ Auth::user()]) }}"> + @csrf + @method("put") Navn: name_last }}" disabled> Email: diff --git a/skolehjem/resources/views/app/users/editpass.blade.php b/skolehjem/resources/views/app/users/editpass.blade.php new file mode 100644 index 0000000..e04e51c --- /dev/null +++ b/skolehjem/resources/views/app/users/editpass.blade.php @@ -0,0 +1,22 @@ +@extends("app.layout.base") + +@section("title") + Account +@endsection + +@section("content") +
+

Konto

+ Auth::user()]) }}"> + @csrf + @method("put") + Nuværende Password: + + Nyt Password: + + Bekræft Nyt Password: + + + +
+@endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 38e1ae5..703d357 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -27,6 +27,8 @@ Route::get("/forgot", "UserController@showForgot")->name("users.show-forgot"); Route::post("/forgot", "UserController@forgot")->name("users.forgot"); Route::get("/account", "UserController@account")->name("users.account"); Route::get("/account/edit", "UserController@accountedit")->name("users.accountedit"); +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"); From 2846dac2dc4b55e6592faf310500fcbd0731ad4a Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 1 Jul 2020 10:30:28 +0200 Subject: [PATCH 11/19] Fixed Washing machine creation and editing --- .../Controllers/WashingMachineController.php | 42 ++++++++++++------- skolehjem/app/WashingMachine.php | 4 +- .../admin/washing-machines/delete.blade.php | 2 +- .../admin/washing-machines/edit.blade.php | 9 ++-- .../admin/washing-machines/index.blade.php | 6 +-- 5 files changed, 38 insertions(+), 25 deletions(-) diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index 27d1cde..d45b482 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -2,10 +2,13 @@ namespace App\Http\Controllers; +use Illuminate\Contracts\Foundation\Application; +use Illuminate\Contracts\View\Factory; use Illuminate\Http\Request; use Illuminate\Http\Response; use App\WashingMachine; +use Illuminate\View\View; class WashingMachineController extends Controller { @@ -24,11 +27,11 @@ class WashingMachineController extends Controller * Display a listing of the resource. * * @param Request $request - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function index(Request $request) { - $machines = WashingMachine::query()->paginate($request->query("page", 1)); + $machines = WashingMachine::query()->paginate($request->query("limit", 20)); return Response::detect("washing-machines.index", [ "machines" => $machines ]); } @@ -36,7 +39,7 @@ class WashingMachineController extends Controller /** * Show the form for creating a new resource. * - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function create() { @@ -47,12 +50,12 @@ class WashingMachineController extends Controller * Store a newly created resource in storage. * * @param \Illuminate\Http\Request $request - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function store(Request $request) { $data = $request->validate([ - "time" => "required" + "name" => "required" ]); $machine = new WashingMachine($data); @@ -65,7 +68,7 @@ class WashingMachineController extends Controller * Display the specified resource. * * @param int $id - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function show($id) { @@ -80,7 +83,7 @@ class WashingMachineController extends Controller * Show the form for editing the specified resource. * * @param int $id - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function edit($id) { @@ -96,36 +99,43 @@ class WashingMachineController extends Controller * * @param \Illuminate\Http\Request $request * @param int $id - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function update(Request $request, $id) { $data = $request->validate([ - "time" => "required" + "name" => "required" ]); $machine = WashingMachine::find($id); $machine->update($data); - $machine->save(); + $saved = $machine->save(); - return Response::detect("washing-machines.edit", [ - "machine" => $machine - ]); + if(!$saved){ + return Response::detect("washing-machines.update", [ + "machine" => $machine + ]); + }else{ + $machines = WashingMachine::query()->paginate($request->input("limit", 20)); + return Response::detect("washing-machines.index", [ + "machines" => $machines + ]); + } } /** * Remove the specified resource from storage. * - * @param int $id - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @param $id + * @return Response */ public function destroy($id) { $machine = WashingMachine::find($id); $machine->delete(); - return Response::detect("washing-machines.destroy"); + return Response::detect("washing-machines.delete"); } } diff --git a/skolehjem/app/WashingMachine.php b/skolehjem/app/WashingMachine.php index 3da7e25..634448d 100644 --- a/skolehjem/app/WashingMachine.php +++ b/skolehjem/app/WashingMachine.php @@ -6,5 +6,7 @@ use Illuminate\Database\Eloquent\Model; class WashingMachine extends Model { - // + protected $fillable = [ + 'name' + ]; } diff --git a/skolehjem/resources/views/admin/washing-machines/delete.blade.php b/skolehjem/resources/views/admin/washing-machines/delete.blade.php index 9efdfdf..27d681e 100644 --- a/skolehjem/resources/views/admin/washing-machines/delete.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/delete.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Fjern Vaskemaskine / + Fjern Vaskemaskine / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/washing-machines/edit.blade.php b/skolehjem/resources/views/admin/washing-machines/edit.blade.php index ea595fc..7e080d5 100644 --- a/skolehjem/resources/views/admin/washing-machines/edit.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/edit.blade.php @@ -6,14 +6,15 @@ @endsection @section("path") - Rediger Vaskemaskiner / + Rediger Vaskemaskiner / @endsection @section("content") -
+ $machine]) }}"> @csrf + @method("put") - - + + @endsection diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php index 1b2be54..5242a0c 100644 --- a/skolehjem/resources/views/admin/washing-machines/index.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php @@ -21,9 +21,9 @@
@foreach($machines as $machine) - - - + +
Feedback Besked Ris el. Ros
{Navn}Update
$machine ]) }}" class="w-100 nostyle"> +
{{$machine->name}}Update @csrf @method("delete") From 9870556c5a859e887f2bdc3c7ef7b291d53c001c Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 1 Jul 2020 10:56:04 +0200 Subject: [PATCH 12/19] Now able to delete washing machines --- skolehjem/app/Http/Controllers/WashingMachineController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index d45b482..c13d537 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -136,6 +136,6 @@ class WashingMachineController extends Controller $machine = WashingMachine::find($id); $machine->delete(); - return Response::detect("washing-machines.delete"); + return redirect()->route("washing-machines.index"); } } From 9f48d2372f801a3c1f8d8ce8b6e74ac1a594aebf Mon Sep 17 00:00:00 2001 From: Vedde Date: Wed, 1 Jul 2020 11:29:45 +0200 Subject: [PATCH 13/19] added a few comments --- skolehjem/app/Http/Controllers/EventController.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 0e98754..cfbf619 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -28,8 +28,11 @@ class EventController extends Controller */ public function index(Request $request) { + $events = Event::query()->paginate($request->input("limit", 20)); + //returns the function with events index page and a parameter of events. + //also Response::detect checks screen size to determine if user is on a computer or mobile. return Response::detect("events.index", [ "events" => $events]); } @@ -40,6 +43,7 @@ class EventController extends Controller */ public function create() { + //returns "create event" blade return Response::detect("events.create"); } @@ -57,6 +61,7 @@ class EventController extends Controller "date" => "required" ]); + //creates a new Event model with the given parameter $event = new Event($requestBody); $event->save(); From 9d757dc536148e5af1a4edee3ec1c14c6b773091 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 1 Jul 2020 11:38:09 +0200 Subject: [PATCH 14/19] Fixed washing machine reservation, creation, edit and deletion --- .../WashingReservationController.php | 43 ++++++++++++------- skolehjem/app/WashingReservation.php | 4 +- ..._08_085447_create_washing_reservations.php | 2 + .../washing-reservations/create.blade.php | 20 ++++----- .../admin/washing-reservations/edit.blade.php | 26 ++++++----- .../washing-reservations/index.blade.php | 14 +++--- .../washing-reservations/update.blade.php | 6 +-- 7 files changed, 66 insertions(+), 49 deletions(-) diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 1063930..7b691cd 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -2,10 +2,15 @@ namespace App\Http\Controllers; +use App\WashingMachine; +use Illuminate\Contracts\Foundation\Application; +use Illuminate\Contracts\View\Factory; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Http\Response; use App\WashingReservation; +use Illuminate\View\View; class WashingReservationController extends Controller { @@ -24,11 +29,11 @@ class WashingReservationController extends Controller * Display a listing of the resource. * * @param Request $request - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function index(Request $request) { - $reservations = WashingReservation::query()->paginate($request->query("page", 1)); + $reservations = WashingReservation::query()->paginate($request->query("limit", 20)); return Response::detect("washing-reservations.index", [ "reservations" => $reservations]); } @@ -36,23 +41,25 @@ class WashingReservationController extends Controller /** * Show the form for creating a new resource. * - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function create() { - return Response::detect("washing-reservations.create"); + $machines = WashingMachine::all(); + return Response::detect("washing-reservations.create", [ 'machines' => $machines ]); } /** * Store a newly created resource in storage. * * @param \Illuminate\Http\Request $request - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function store(Request $request) { $data = $request->validate([ - "time" => "required" + "time" => "required", + "machine" => "required" ]); $machineReservation = new WashingReservation($data); @@ -65,7 +72,7 @@ class WashingReservationController extends Controller * Display the specified resource. * * @param int $id - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function show($id) { @@ -80,11 +87,14 @@ class WashingReservationController extends Controller * Show the form for editing the specified resource. * * @param int $id - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function edit($id) { - return Response::detect("washing-reservations.edit"); + $reservation = WashingReservation::query()->find($id); + $machines = WashingMachine::all(); + + return Response::detect("washing-reservations.edit", ['washing_reservation' => $reservation, 'machines' => $machines ]); } /** @@ -92,12 +102,13 @@ class WashingReservationController extends Controller * * @param \Illuminate\Http\Request $request * @param int $id - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Application|Factory|View */ public function update(Request $request, $id) { $data = $request->validate([ - "time" => "required" + "time" => "required", + "machine" => "required" ]); $machineReservation = WashingReservation::find($id); @@ -106,8 +117,8 @@ class WashingReservationController extends Controller $machineReservation->save(); - return Response::detect("washing-reservations.edit", [ - "washingReservation" => $machineReservation + return Response::detect("washing-reservations.update", [ + "washing_reservation" => $machineReservation ]); } @@ -115,13 +126,15 @@ class WashingReservationController extends Controller * Remove the specified resource from storage. * * @param int $id - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return RedirectResponse */ public function destroy($id) { $machineReservation = WashingReservation::find($id); $machineReservation->delete(); - return Response::detect("washing-reservations.delete"); + $reservations = WashingReservation::query()->paginate( 20); + + return redirect()->route("washing-reservations.index", [ "reservations" => $reservations]); } } diff --git a/skolehjem/app/WashingReservation.php b/skolehjem/app/WashingReservation.php index fe15a23..3925ecc 100644 --- a/skolehjem/app/WashingReservation.php +++ b/skolehjem/app/WashingReservation.php @@ -6,5 +6,7 @@ use Illuminate\Database\Eloquent\Model; class WashingReservation extends Model { - // + protected $fillable = [ + 'time', 'machine' + ]; } diff --git a/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php b/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php index e732b55..482ddd7 100644 --- a/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php +++ b/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php @@ -17,6 +17,8 @@ class CreateWashingReservations extends Migration $table->id(); $table->timestamp("time"); $table->timestamps(); + $table->unsignedBigInteger('machine'); + $table->foreign("machine")->references('id')->on('washing_machines'); }); } diff --git a/skolehjem/resources/views/admin/washing-reservations/create.blade.php b/skolehjem/resources/views/admin/washing-reservations/create.blade.php index 01d38ad..fb0308a 100644 --- a/skolehjem/resources/views/admin/washing-reservations/create.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/create.blade.php @@ -6,21 +6,21 @@ @endsection @section("path") - Opret Vaske Reservationer / + Opret Vaskemaskine Reservation / @endsection @section("content") -

Opret Booking:

+

Opret Reservation:

@csrf - - - - - - - + + diff --git a/skolehjem/resources/views/admin/washing-reservations/edit.blade.php b/skolehjem/resources/views/admin/washing-reservations/edit.blade.php index 66e0edb..c1a2d98 100644 --- a/skolehjem/resources/views/admin/washing-reservations/edit.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/edit.blade.php @@ -6,22 +6,26 @@ @endsection @section("path") - Rediger Vaske Reservationer / + Rediger Vaske Reservationer / @endsection @section("content")

Rediger Booking:

-
+ @csrf - - - - - - - - + +
diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index 46939c3..2100b13 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -15,21 +15,17 @@ - - - + @foreach($reservations as $reservation) - - - - - - + + + @endforeach
FornavnEfternavnTlf nr VaskemaskineTime Update Delete
{Fornavn}{Efternavn}{Tlf Nr}{Vaskemaskine Nr.}Update
+
{{ \App\WashingMachine::query()->find($reservation->machine)->name }}{{ $reservation->time }}Update @csrf @method("delete") diff --git a/skolehjem/resources/views/admin/washing-reservations/update.blade.php b/skolehjem/resources/views/admin/washing-reservations/update.blade.php index f890995..9cbf817 100644 --- a/skolehjem/resources/views/admin/washing-reservations/update.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/update.blade.php @@ -2,13 +2,13 @@ @extends("admin.layout.header") @section("title") - Vaske Reservationer - Rediger + Vaskemaskine Reservationer - Rediger @endsection @section("path") - Rediger Vaske Reservationer / + Rediger Vaskemaskine Reservationer / @endsection @section("content") - Din Vaske Reservationer blev (ikke) redigeret. + Din Vaskemaskine Reservationer blev (ikke) redigeret. @endsection From a174b47258a9007368feab9729c915b46052c970 Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 1 Jul 2020 11:44:14 +0200 Subject: [PATCH 15/19] Fail message when there is no activity. You can now use the button "Kontoret" in the menu navbar --- .../resources/views/app/events/index.blade.php | 16 ++++++++++------ .../resources/views/app/layout/base.blade.php | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index bbc3e7c..5d1fb45 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -7,11 +7,15 @@ @section("content")

Aktiviteter

- @foreach($events as $event) -

{{$event->name}}

-

{{$event->date}}

-

{{$event->description}}

- Tilmeld - @endforeach + @if(!$events->isEmpty()) + @foreach($events as $event) +

{{$event->name}}

+

{{$event->date}}

+

{{$event->description}}

+ Tilmeld + @endforeach + @else +

Der er ingen aktiviteter!

+ @endif
@endsection diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 38a9ea8..7c60cef 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -37,7 +37,7 @@ {{-- Galleri--}} {{-- Galleri--}} {{-- --}} - + Kontoret Kontoret From cd828725b645ebc7aa93fc1bc767efb8632d7ed5 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 1 Jul 2020 11:54:33 +0200 Subject: [PATCH 16/19] Fixed redirect --- .../Controllers/WashingMachineController.php | 11 ++++++--- .../WashingReservationController.php | 24 +++++++++++++++---- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index c13d537..07b5eeb 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -59,9 +59,14 @@ class WashingMachineController extends Controller ]); $machine = new WashingMachine($data); - $machine->save(); + $saved = $machine->save(); - return Response::detect("washing-machines.store"); + if(!$saved){ + return Response::detect("washing-machines.store"); + }else{ + $machines = WashingMachine::query()->paginate($request->input("limit", 20)); + return Response::detect("washing-machines.index", ['machines' => $machines]); + } } /** @@ -117,7 +122,7 @@ class WashingMachineController extends Controller return Response::detect("washing-machines.update", [ "machine" => $machine ]); - }else{ + } else { $machines = WashingMachine::query()->paginate($request->input("limit", 20)); return Response::detect("washing-machines.index", [ "machines" => $machines diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 7b691cd..a028c66 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -65,7 +65,16 @@ class WashingReservationController extends Controller $machineReservation = new WashingReservation($data); $machineReservation->save(); - return Response::detect("washing-reservations.store"); + $saved = $machineReservation->save(); + + if(!$saved){ + return Response::detect("washing-reservations.store", [ + "washing_reservation" => $machineReservation + ]); + }else{ + $reservations = WashingReservation::query()->paginate($request->input("limit", 20)); + return Response::detect("washing-machines.index", ['reservations' => $reservations]); + } } /** @@ -115,11 +124,16 @@ class WashingReservationController extends Controller $machineReservation->update($data); - $machineReservation->save(); + $saved = $machineReservation->save(); - return Response::detect("washing-reservations.update", [ - "washing_reservation" => $machineReservation - ]); + if(!$saved){ + return Response::detect("washing-reservations.update", [ + "washing_reservation" => $machineReservation + ]); + }else{ + $reservations = WashingReservation::query()->paginate($request->input("limit", 20)); + return Response::detect("washing-machines.index", ['reservations' => $reservations]); + } } /** From 330b895a3508139c63b9e049958f7ed8e297370c Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 1 Jul 2020 11:56:44 +0200 Subject: [PATCH 17/19] Fixed redirect --- .../app/Http/Controllers/WashingReservationController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index a028c66..72395d8 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -73,7 +73,9 @@ class WashingReservationController extends Controller ]); }else{ $reservations = WashingReservation::query()->paginate($request->input("limit", 20)); - return Response::detect("washing-machines.index", ['reservations' => $reservations]); + $machines = WashingMachine::all(); + + return Response::detect("washing-machines.index", ['reservations' => $reservations, 'machines' => $machines]); } } @@ -132,7 +134,9 @@ class WashingReservationController extends Controller ]); }else{ $reservations = WashingReservation::query()->paginate($request->input("limit", 20)); - return Response::detect("washing-machines.index", ['reservations' => $reservations]); + $machines = WashingMachine::all(); + + return Response::detect("washing-machines.index", ['reservations' => $reservations, 'machines' => $machines]); } } From 471a2897a5d89be6c6eb19bd50b71c981bccee2e Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 1 Jul 2020 11:59:48 +0200 Subject: [PATCH 18/19] Fixed redirect --- .../resources/views/admin/washing-machines/index.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php index 5242a0c..5ab2bfe 100644 --- a/skolehjem/resources/views/admin/washing-machines/index.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php @@ -33,6 +33,4 @@
- - {{ $machines->links() }} @endsection From 6eb198011f102d33a6d23c5a2fcc2262551ee7b1 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Thu, 2 Jul 2020 10:06:17 +0200 Subject: [PATCH 19/19] Fixed redirect --- .../app/Http/Controllers/WashingReservationController.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 72395d8..612ef94 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -73,9 +73,8 @@ class WashingReservationController extends Controller ]); }else{ $reservations = WashingReservation::query()->paginate($request->input("limit", 20)); - $machines = WashingMachine::all(); - return Response::detect("washing-machines.index", ['reservations' => $reservations, 'machines' => $machines]); + return Response::detect("washing-reservations.index", [ "reservations" => $reservations]); } } @@ -133,10 +132,9 @@ class WashingReservationController extends Controller "washing_reservation" => $machineReservation ]); }else{ - $reservations = WashingReservation::query()->paginate($request->input("limit", 20)); - $machines = WashingMachine::all(); + $reservations = WashingReservation::query()->paginate($request->query("limit", 20)); - return Response::detect("washing-machines.index", ['reservations' => $reservations, 'machines' => $machines]); + return Response::detect("washing-reservations.index", [ "reservations" => $reservations]); } }