From 233a1e6add69de11412bb6af611705b601f85165 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 11:56:38 +0200 Subject: [PATCH 1/4] Added BookingController.php, uncommented routed code in admin/layout/base.blade.php, --- .../Http/Controllers/BookingController.php | 100 ++++++++++++++++++ .../views/admin/layout/base.blade.php | 13 +-- .../resources/views/app/root/index.blade.php | 2 +- 3 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 skolehjem/app/Http/Controllers/BookingController.php diff --git a/skolehjem/app/Http/Controllers/BookingController.php b/skolehjem/app/Http/Controllers/BookingController.php new file mode 100644 index 0000000..a5bf5f8 --- /dev/null +++ b/skolehjem/app/Http/Controllers/BookingController.php @@ -0,0 +1,100 @@ +paginate($request->input("limit", 20)); + + return Response::detect("bookings.index", [ "bookings" => $booking]); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + return Response::detect("bookings.create"); + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(Request $request) + { + $requestBooking = $request->validate([ + "name_first" => "required|max:255", + "name_last" => "required|max:255", + "phone" => "required|unique:users", + "machine_choice" => "required|max:255", + ]); + + $booking = new Booking($requestBooking); + $booking->save(); + + return Response::detect("bookings.store"); + } + + /** + * Display the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function show($id) + { + return Response::detect("bookings.show", [ "bookings" => $id]); + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } +} diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 4b01fc0..f55ab24 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -22,28 +22,29 @@

Menuplan

-{{-- ReadVis Menuplan--}} + ReadVis Menuplan
-{{-- CreateOpret Menuplan--}} + CreateOpret Menuplan

Booking

- {{-- ReadVis Bookings--}} + bookings mangler i web.php + {{--ReadVis Bookings--}}
- {{-- CreateOpret Booking--}} + {{--CreateOpret Booking--}}

Vaskemaskiner

- {{-- ReadVis Bookings--}} + ReadVis Vaskemaskiner
- {{-- CreateOpret Booking--}} + CreateOpret Vaskemaskine
diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index be778be..4738b86 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -23,7 +23,7 @@ {{----}} {{--Index--}} -{{--@extends("admin.index")--}} +{{----}}@extends("admin.index") {{--Create User--}} {{--@extends("admin.users.create")--}} From 9a3d16bc6126924da1333bfb71bbf730c9f14ab0 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 25 Jun 2020 12:22:22 +0200 Subject: [PATCH 2/4] Add some routes to menuplan --- .../Http/Controllers/MenuPlanController.php | 17 +++++++--- .../views/admin/menuplans/store.blade.php | 33 +++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 skolehjem/resources/views/admin/menuplans/store.blade.php diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 13403a5..aa7d3b6 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\ExternalLink; use App\MenuPlan; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -26,9 +27,9 @@ class MenuPlanController extends Controller * * @return \Illuminate\Http\Response */ - public function create() + public function create(Request $request) { - // + return Response::detect("menu-plan.create"); } /** @@ -39,7 +40,15 @@ class MenuPlanController extends Controller */ public function store(Request $request) { - // + $requestMenuPlanCreate = $request->validate([ + "name" => "required|max:255", + "link" => "required|max:255" + ]); + + $menuPlans = new ExternalLink($requestMenuPlanCreate); + $menuPlans->save(); + + return Response::detect("menu-plans.store"); } /** @@ -50,7 +59,7 @@ class MenuPlanController extends Controller */ public function show($id) { - // + return Response::detect("menu-plan.show", [ "menuplans" => $id]); } /** diff --git a/skolehjem/resources/views/admin/menuplans/store.blade.php b/skolehjem/resources/views/admin/menuplans/store.blade.php new file mode 100644 index 0000000..e7c4ae2 --- /dev/null +++ b/skolehjem/resources/views/admin/menuplans/store.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vaskemaskiner - Vis +@endsection + +@section("path") + Vis Vaskemaskiner / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection From 2349b52100ff8e16ab4a5e58e14a35c6241db9d7 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 12:32:16 +0200 Subject: [PATCH 3/4] Added Booking Model --- skolehjem/app/Booking.php | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 skolehjem/app/Booking.php diff --git a/skolehjem/app/Booking.php b/skolehjem/app/Booking.php new file mode 100644 index 0000000..663e86c --- /dev/null +++ b/skolehjem/app/Booking.php @@ -0,0 +1,10 @@ + Date: Thu, 25 Jun 2020 12:37:17 +0200 Subject: [PATCH 4/4] Le fix is not fix le --- skolehjem/app/Http/Controllers/MenuPlanController.php | 6 +++--- skolehjem/resources/views/admin/menuplans/create.blade.php | 2 +- skolehjem/routes/web.php | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index aa7d3b6..b300115 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -19,7 +19,7 @@ class MenuPlanController extends Controller { $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); - return Response::detect("menuplans.index", [ "menuplans" => $menuPlans]); + return Response::detect("menuplans.index", [ "menuPlans" => $menuPlans]); } /** @@ -29,7 +29,7 @@ class MenuPlanController extends Controller */ public function create(Request $request) { - return Response::detect("menu-plan.create"); + return Response::detect("menuplans.create"); } /** @@ -48,7 +48,7 @@ class MenuPlanController extends Controller $menuPlans = new ExternalLink($requestMenuPlanCreate); $menuPlans->save(); - return Response::detect("menu-plans.store"); + return Response::detect("menuplans.store"); } /** diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index c339366..fcdd9d8 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Opret Menuplan / + Opret Menuplan / @endsection @section("content") diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index cacec32..7863c02 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -32,3 +32,4 @@ Route::resource("washing-machines", "WashingMachineController"); Route::resource("washing-reservations", "WashingReservationController"); Route::resource("feedbacks", "FeedbackController"); Route::resource("external-links", "ExternalLinkController"); +Route::resource("bookings", "BookingController");