From 85989f5b047af039c0990f2424ca8a43ca6f9257 Mon Sep 17 00:00:00 2001 From: Vedde Date: Tue, 23 Jun 2020 11:59:26 +0200 Subject: [PATCH 1/3] added crud external-link blade and added menu plan --- .../Http/Controllers/MenuPlanController.php | 84 +++++++++++++++++++ skolehjem/app/MenuPlan.php | 10 +++ .../2020_06_23_070657_create_menu_plans.php | 31 +++++++ .../views/admin/events/index.blade.php | 31 +++---- .../admin/external-links/create.blade.php | 0 .../admin/external-links/delete.blade.php | 0 .../views/admin/external-links/edit.blade.php | 0 .../admin/external-links/index.blade.php | 0 8 files changed, 141 insertions(+), 15 deletions(-) create mode 100644 skolehjem/app/Http/Controllers/MenuPlanController.php create mode 100644 skolehjem/app/MenuPlan.php create mode 100644 skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php create mode 100644 skolehjem/resources/views/admin/external-links/create.blade.php create mode 100644 skolehjem/resources/views/admin/external-links/delete.blade.php create mode 100644 skolehjem/resources/views/admin/external-links/edit.blade.php create mode 100644 skolehjem/resources/views/admin/external-links/index.blade.php diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php new file mode 100644 index 0000000..130cffc --- /dev/null +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -0,0 +1,84 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('menu_plans'); + } +} diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index e7c4ae2..43f8e58 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -2,32 +2,33 @@ @extends("admin.layout.header") @section("title") - Vaskemaskiner - Vis + Events - Vis @endsection @section("path") - Vis Vaskemaskiner / + Vis Events / @endsection @section("content") - - - - + + - - - - - - - - - + @foreach($events as $event) + + + + + + + + @endforeach
IDFornavnEfternavnEmailTlf nrEvent NavnEvent Beskrivelse Update Delete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
{{ $event->id }}{{ $event->name }}{{ $event->description }}UpdateDelete
+ + + {{ $events->links() }} @endsection diff --git a/skolehjem/resources/views/admin/external-links/create.blade.php b/skolehjem/resources/views/admin/external-links/create.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/resources/views/admin/external-links/delete.blade.php b/skolehjem/resources/views/admin/external-links/delete.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/resources/views/admin/external-links/edit.blade.php b/skolehjem/resources/views/admin/external-links/edit.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php new file mode 100644 index 0000000..e69de29 From e2ab661dc293742be17294e13a3d9a9e28134283 Mon Sep 17 00:00:00 2001 From: Vedde Date: Wed, 24 Jun 2020 08:24:45 +0200 Subject: [PATCH 2/3] fixed path --- skolehjem/app/Http/Controllers/EventController.php | 3 ++- skolehjem/app/Http/Controllers/RootController.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 95e95b5..30d65e8 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Event; use App\User; use Illuminate\Http\Request; +use Illuminate\Http\Response; class EventController extends Controller { @@ -27,7 +28,7 @@ class EventController extends Controller */ public function create() { - return Response::detect("admin.events.create"); + return Response::detect("events.create"); } /** diff --git a/skolehjem/app/Http/Controllers/RootController.php b/skolehjem/app/Http/Controllers/RootController.php index 0f3916e..1889de3 100644 --- a/skolehjem/app/Http/Controllers/RootController.php +++ b/skolehjem/app/Http/Controllers/RootController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Illuminate\Http\Response; class RootController extends Controller { From ccddf4d2f30c17ee77f8697ee91ed2684bb1466e Mon Sep 17 00:00:00 2001 From: Vedde Date: Wed, 24 Jun 2020 08:53:07 +0200 Subject: [PATCH 3/3] fixed wrong migration name of external link fixed wrong path on controller view --- skolehjem/app/Http/Controllers/EventController.php | 14 +++++++------- .../Http/Controllers/ExternalLinkController.php | 4 ++-- skolehjem/app/Http/Controllers/UserController.php | 12 ++++++------ .../Http/Controllers/WashingMachineController.php | 14 +++++++------- skolehjem/routes/web.php | 2 ++ 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 1ea7461..60eb631 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -19,7 +19,7 @@ class EventController extends Controller { $events = Event::query()->paginate($request->input("limit", 20)); - return Response::detect("admin.events.index", [ "events" => $events]); + return Response::detect("events.index", [ "events" => $events]); } /** @@ -29,7 +29,7 @@ class EventController extends Controller */ public function create() { - return Response::detect("admin.events.create"); + return Response::detect("events.create"); } /** @@ -49,7 +49,7 @@ class EventController extends Controller $event->save(); - return Response::detect("admin.events.store"); + return Response::detect("events.store"); } /** @@ -60,7 +60,7 @@ class EventController extends Controller */ public function show(Event $id) { - return Response::detect("admin.events.show", [ "event" => $id ]); + return Response::detect("events.show", [ "event" => $id ]); } /** @@ -71,7 +71,7 @@ class EventController extends Controller */ public function edit(Event $id) { - return Response::detect("admin.events.edit", [ "event" => $id ]); + return Response::detect("events.edit", [ "event" => $id ]); } /** @@ -91,7 +91,7 @@ class EventController extends Controller $id->update($requestBody); $id->save(); - return Response::detect("admin.events.update"); + return Response::detect("events.update"); } /** @@ -105,6 +105,6 @@ class EventController extends Controller { $id->delete(); - return Response::detect("admin.events.destroy"); + return Response::detect("events.destroy"); } } diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php index 13ddd26..afd74b9 100644 --- a/skolehjem/app/Http/Controllers/ExternalLinkController.php +++ b/skolehjem/app/Http/Controllers/ExternalLinkController.php @@ -19,7 +19,7 @@ class ExternalLinkController extends Controller { $externalLink = ExternalLink::query()->paginate($request->input("limit", 20)); - return Response::detect("external-links.index", [ "externalLink" => $externalLink ]); + return Response::detect("external-links.index", [ "externalLinks" => $externalLink ]); } /** @@ -59,7 +59,7 @@ class ExternalLinkController extends Controller */ public function show($id) { - // + return Response::detect("external-links.show", [ "externallink" => $id]); } /** diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index c1a2fc1..f18a068 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -43,7 +43,7 @@ class UserController extends Controller */ public function create() { - return Response::detect("admin.users.create"); + return Response::detect("users.create"); } /** @@ -75,7 +75,7 @@ class UserController extends Controller Log::debug("SAVED USER"); - return view("admin.users.store"); + return view("users.store"); } /** @@ -88,7 +88,7 @@ class UserController extends Controller { $user = User::find($id); - return Respone::detect("admin.users.show", [ + return Respone::detect("users.show", [ "user" => $user ]); } @@ -103,7 +103,7 @@ class UserController extends Controller { $user = User::find($id); - return Response::detect("admin.users.edit", [ + return Response::detect("users.edit", [ "user" => $user ]); } @@ -142,7 +142,7 @@ class UserController extends Controller $user->save(); } - return Response::detect("admin.users.edit", [ + return Response::detect("users.edit", [ "user" => $user ]); } @@ -165,7 +165,7 @@ class UserController extends Controller $user->delete(); } - return view("admin.users.delete"); + return view("users.delete"); } /*******************************************/ diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index e7d548c..c3bf826 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -19,7 +19,7 @@ class WashingMachineController extends Controller { $machines = WashingMachine::query()->paginate($request->query("page", 1)); - return Response::detect("admin.washing-machines.index", [ "machines" => $machines ]); + return Response::detect("washing-machines.index", [ "machines" => $machines ]); } /** @@ -29,7 +29,7 @@ class WashingMachineController extends Controller */ public function create() { - return Response::detect("admin.washing-machines.create"); + return Response::detect("washing-machines.create"); } /** @@ -47,7 +47,7 @@ class WashingMachineController extends Controller $machine = new WashingMachine($data); $machine->save(); - return Response::detect("admin.washing-machines.store"); + return Response::detect("washing-machines.store"); } /** @@ -60,7 +60,7 @@ class WashingMachineController extends Controller { $machine = WashingMachine::find($id); - return Response::detect("admin.washing-machines.show", [ + return Response::detect("washing-machines.show", [ "machine" => $machine ]); } @@ -75,7 +75,7 @@ class WashingMachineController extends Controller { $machine = WashingMachine::find($id); - return Response::detect("admin.washing-machines.edit", [ + return Response::detect("washing-machines.edit", [ "machine" => $machine ]); } @@ -99,7 +99,7 @@ class WashingMachineController extends Controller $machine->save(); - return Response::detect("admin.washing-machines.edit", [ + return Response::detect("washing-machines.edit", [ "machine" => $machine ]); } @@ -115,6 +115,6 @@ class WashingMachineController extends Controller $machine = WashingMachine::find($id); $machine->delete(); - return Response::detect("admin.washing-machines.destroy"); + return Response::detect("washing-machines.destroy"); } } diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index ee7edf7..7b7bf4f 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -30,3 +30,5 @@ Route::resource("users", "UserController"); Route::resource("events", "EventController"); Route::resource("washing-machines", "WashingMachineController"); Route::resource("washing-reservations", "WashingReservationController"); +Route::resource("feedbacks", "FeedbackController"); +Route::resource("externallinks", "ExternalLinkController");