From c627e4e1afefe1e722454648a405c7f633deecfe Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 09:04:23 +0200 Subject: [PATCH 01/14] Added text in external-links. Added admin->menuplans->index Added foreach in admin->washing-machines->index, fixed title in app->vagttelefons->index --- .../admin/external-links/create.blade.php | 22 ++++++++++ .../admin/external-links/delete.blade.php | 13 ++++++ .../views/admin/external-links/edit.blade.php | 22 ++++++++++ .../admin/external-links/index.blade.php | 33 ++++++++++++++ .../views/admin/menuplans/index.blade.php | 43 +++++++++++++++++++ .../admin/washing-machines/index.blade.php | 4 ++ .../resources/views/app/root/index.blade.php | 5 ++- .../views/app/vagttelefons/index.blade.php | 2 +- 8 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 skolehjem/resources/views/admin/menuplans/index.blade.php diff --git a/skolehjem/resources/views/admin/external-links/create.blade.php b/skolehjem/resources/views/admin/external-links/create.blade.php index e69de29..0863aa1 100644 --- a/skolehjem/resources/views/admin/external-links/create.blade.php +++ b/skolehjem/resources/views/admin/external-links/create.blade.php @@ -0,0 +1,22 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Link - Opret +@endsection + +@section("path") + Opret Link / +@endsection + +@section("content") +

Opret Link:

+
+ @csrf + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/external-links/delete.blade.php b/skolehjem/resources/views/admin/external-links/delete.blade.php index e69de29..2573007 100644 --- a/skolehjem/resources/views/admin/external-links/delete.blade.php +++ b/skolehjem/resources/views/admin/external-links/delete.blade.php @@ -0,0 +1,13 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Link - Fjern +@endsection + +@section("path") + Fjern Link / +@endsection + +@section("content") +@endsection diff --git a/skolehjem/resources/views/admin/external-links/edit.blade.php b/skolehjem/resources/views/admin/external-links/edit.blade.php index e69de29..8350aad 100644 --- a/skolehjem/resources/views/admin/external-links/edit.blade.php +++ b/skolehjem/resources/views/admin/external-links/edit.blade.php @@ -0,0 +1,22 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Link - Rediger +@endsection + +@section("path") + Rediger Link / +@endsection + +@section("content") +

Rediger Link:

+
+ @csrf + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php index e69de29..8a2c341 100644 --- a/skolehjem/resources/views/admin/external-links/index.blade.php +++ b/skolehjem/resources/views/admin/external-links/index.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Link - Vis +@endsection + +@section("path") + Vis Link / +@endsection + +@section("content") + + + + + + + + + @foreach($links as $link) + + + + + + + + @endforeach +
IDTitleLinkUpdateDelete
{ID}{Titel}{Link}UpdateDelete
+ + {{ $links->links() }} +@endsection diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php new file mode 100644 index 0000000..0f3b0ef --- /dev/null +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -0,0 +1,43 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Menuplan - Vis +@endsection + +@section("path") + Vis Menuplan / +@endsection + +@section("content") + + + + + + + + + + + + + + @foreach($menuplans as $menuplan) + + + + + + + + + + + + + @endforeach +
IDMandagTirsdagOnsdagTorsdagFredagLørdagSøndagUpdateDelete
{ID}{Mandag}{Tirsdag}{Onsdag}{Torsdag}{Fredag}{Lørdag}{Søndag}UpdateDelete
+ + {{ $menuplans->links() }} +@endsection diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php index 5fa7354..2013ae3 100644 --- a/skolehjem/resources/views/admin/washing-machines/index.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php @@ -17,11 +17,15 @@ Update Delete + @foreach($machines as $machine) {ID} {Navn} Update Delete + @endforeach + + {{ $machines->links() }} @endsection diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index 4faa4bb..be778be 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -15,6 +15,9 @@ {{--Booking Liste--}} {{--@extends("app.bookings.index")--}} +{{--Menuplan--}} +{{--@extends("app.menuplans.index")--}} + {{----}} {{------Admin Panel {{----}} @@ -35,7 +38,7 @@ {{--@extends("admin.menuplans.create")--}} {{--Read Menuplan--}} -{{----}}@extends("admin.menuplans.show") +{{--@extends("admin.menuplans.show")--}} {{--Update Menuplan--}} {{--@extends("admin.menuplans.update")--}} diff --git a/skolehjem/resources/views/app/vagttelefons/index.blade.php b/skolehjem/resources/views/app/vagttelefons/index.blade.php index 0aa2c05..b4b0a7d 100644 --- a/skolehjem/resources/views/app/vagttelefons/index.blade.php +++ b/skolehjem/resources/views/app/vagttelefons/index.blade.php @@ -1,7 +1,7 @@ @extends("app.layout.base") @extends("app.layout.header") @section("title") - Menuplan + Vagttelefon @endsection @section("content") From 27b4f48af276d3bf177b205e5dfd735c3852e3c1 Mon Sep 17 00:00:00 2001 From: Vedde Date: Thu, 25 Jun 2020 09:15:21 +0200 Subject: [PATCH 02/14] updated controller --- .../Http/Controllers/ExternalLinkController.php | 16 +++++++++++++--- ... 2020_06_24_064840_create_external_links.php} | 6 +++--- 2 files changed, 16 insertions(+), 6 deletions(-) rename skolehjem/database/migrations/{2020_06_08_085209_create_external_link.php => 2020_06_24_064840_create_external_links.php} (75%) diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php index afd74b9..af6218b 100644 --- a/skolehjem/app/Http/Controllers/ExternalLinkController.php +++ b/skolehjem/app/Http/Controllers/ExternalLinkController.php @@ -70,7 +70,8 @@ class ExternalLinkController extends Controller */ public function edit($id) { - // + $link = ExternalLink::find($id); + return Response::detect("external-links.edit", ["externallink" => $link]); } /** @@ -82,7 +83,15 @@ class ExternalLinkController extends Controller */ public function update(Request $request, $id) { - // + $data = $request->validate([ + "name" => "", + "link" => "" + ]); + + $id->update($data); + $id->save(); + + return Response::detect("external-links.update"); } /** @@ -93,6 +102,7 @@ class ExternalLinkController extends Controller */ public function destroy($id) { - // + $id->delete(); + return Response::detect("external-links.destroy"); } } diff --git a/skolehjem/database/migrations/2020_06_08_085209_create_external_link.php b/skolehjem/database/migrations/2020_06_24_064840_create_external_links.php similarity index 75% rename from skolehjem/database/migrations/2020_06_08_085209_create_external_link.php rename to skolehjem/database/migrations/2020_06_24_064840_create_external_links.php index 822a735..dc72ec1 100644 --- a/skolehjem/database/migrations/2020_06_08_085209_create_external_link.php +++ b/skolehjem/database/migrations/2020_06_24_064840_create_external_links.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateExternalLink extends Migration +class CreateExternalLinks extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateExternalLink extends Migration */ public function up() { - Schema::create('external_link', function (Blueprint $table) { + Schema::create('external_links', function (Blueprint $table) { $table->id(); $table->string("name"); $table->string("link"); @@ -28,6 +28,6 @@ class CreateExternalLink extends Migration */ public function down() { - Schema::dropIfExists('external_link'); + Schema::dropIfExists('external_links'); } } From 10dc32c7017c8358d2924be6dc6cf37b0188d584 Mon Sep 17 00:00:00 2001 From: Vedde Date: Thu, 25 Jun 2020 10:34:10 +0200 Subject: [PATCH 03/14] updated menuplan controller --- skolehjem/app/Http/Controllers/MenuPlanController.php | 9 +++++++-- skolehjem/app/Http/Controllers/UserController.php | 2 +- .../resources/views/admin/menuplans/index.blade.php | 2 +- skolehjem/routes/web.php | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 130cffc..13403a5 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -2,7 +2,10 @@ namespace App\Http\Controllers; +use App\MenuPlan; use Illuminate\Http\Request; +use Illuminate\Http\Response; + class MenuPlanController extends Controller { @@ -11,9 +14,11 @@ class MenuPlanController extends Controller * * @return \Illuminate\Http\Response */ - public function index() + public function index(Request $request) { - // + $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); + + return Response::detect("menuplans.index", [ "menuplans" => $menuPlans]); } /** diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index f18a068..7c5859c 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -88,7 +88,7 @@ class UserController extends Controller { $user = User::find($id); - return Respone::detect("users.show", [ + return Response::detect("users.show", [ "user" => $user ]); } diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index 0f3b0ef..998d82b 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Vis Menuplan / + Vis Menuplan / @endsection @section("content") diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 7b7bf4f..cacec32 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -25,10 +25,10 @@ Route::post("/login", "UserController@login")->name("users.login"); Route::get("/logout", "UserController@logout")->name("users.logout"); -Route::resource("menu-plans", ""); +Route::resource("menu-plans", "MenuPlanController"); 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"); +Route::resource("external-links", "ExternalLinkController"); From b16bb134da655240e038ff5203524c7b21e3d345 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Thu, 25 Jun 2020 11:19:51 +0200 Subject: [PATCH 04/14] Updated Controllers --- .../Http/Controllers/FeedbackController.php | 42 +++++++++++------- .../Http/Controllers/PermissionController.php | 44 ++++++++++++------- 2 files changed, 55 insertions(+), 31 deletions(-) diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 1282892..04079ac 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Feedback; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -11,50 +12,61 @@ class FeedbackController extends Controller /** * Display a listing of the resource. * - * @return \Illuminate\Http\Response + * @param Request $request + * @return Response */ - public function index() + public function index(Request $request) { - // + $feedback = Feedback::query()->paginate($request->input("limit", 20)); + + return Response::detect("feedback.index", [ "feedback" => $feedback ]); } /** * Show the form for creating a new resource. * - * @return \Illuminate\Http\Response + * @return Response */ public function create() { - // + return Response::detect("feedback.create"); } /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response + * @param Request $request + * @return Response */ public function store(Request $request) { - // + $requestBody = $request->validate([ + "name" => "required|max:255", + "link" => "required|max:255" + ]); + + $feedback = new Feedback($requestBody); + $feedback->save(); + + return Response::detect("feedback.store"); } /** * Display the specified resource. * * @param int $id - * @return \Illuminate\Http\Response + * @return Response */ public function show($id) { - // + return Response::detect("feedback.show", [ "feedback" => $id]); } /** * Show the form for editing the specified resource. * * @param int $id - * @return \Illuminate\Http\Response + * @return Response */ public function edit($id) { @@ -64,9 +76,9 @@ class FeedbackController extends Controller /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response + * @param Request $request + * @param int $id + * @return void */ public function update(Request $request, $id) { @@ -77,7 +89,7 @@ class FeedbackController extends Controller * Remove the specified resource from storage. * * @param int $id - * @return \Illuminate\Http\Response + * @return Response */ public function destroy($id) { diff --git a/skolehjem/app/Http/Controllers/PermissionController.php b/skolehjem/app/Http/Controllers/PermissionController.php index 49f1674..9b87801 100644 --- a/skolehjem/app/Http/Controllers/PermissionController.php +++ b/skolehjem/app/Http/Controllers/PermissionController.php @@ -4,56 +4,68 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Spatie\Permission\Models\Permission; class PermissionController extends Controller { /** * Display a listing of the resource. * - * @return \Illuminate\Http\Response + * @param Request $request + * @return Response */ - public function index() + public function index(Request $request) { - // + $permission = Permission::query()->paginate($request->input("limit", 20)); + + return Response::detect("permission.index", [ "permission" => $permission ]); } /** * Show the form for creating a new resource. * - * @return \Illuminate\Http\Response + * @return Response */ public function create() { - // + return Response::detect("permission.create"); } /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response + * @param Request $request + * @return Response */ public function store(Request $request) { - // + $requestBody = $request->validate([ + "name" => "required|max:255", + "link" => "required|max:255" + ]); + + $permission = new Permission($requestBody); + $permission->save(); + + return Response::detect("permission.store"); } /** * Display the specified resource. * * @param int $id - * @return \Illuminate\Http\Response + * @return Response */ public function show($id) { - // + return Response::detect("permission.show", [ "permission" => $id]); } /** * Show the form for editing the specified resource. * * @param int $id - * @return \Illuminate\Http\Response + * @return Response */ public function edit($id) { @@ -63,9 +75,9 @@ class PermissionController extends Controller /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response + * @param Request $request + * @param int $id + * @return void */ public function update(Request $request, $id) { @@ -75,8 +87,8 @@ class PermissionController extends Controller /** * Remove the specified resource from storage. * - * @param int $id - * @return \Illuminate\Http\Response + * @param int $id + * @return void */ public function destroy($id) { From 233a1e6add69de11412bb6af611705b601f85165 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 11:56:38 +0200 Subject: [PATCH 05/14] 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 06/14] 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 07/14] 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 08/14] 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"); From b54bffb7a8316458e5ee615707643b0c45f7130c Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Thu, 25 Jun 2020 12:40:26 +0200 Subject: [PATCH 09/14] Updated Controllers --- .../Http/Controllers/FeedbackController.php | 25 ++++++++++++++++--- .../Http/Controllers/PermissionController.php | 25 ++++++++++++++++--- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 04079ac..590e2f9 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -70,7 +70,11 @@ class FeedbackController extends Controller */ public function edit($id) { - // + $feedback = Feedback::find($id); + + return Response::detect("feedbacks.edit", [ + "feedback" => $feedback + ]); } /** @@ -82,7 +86,19 @@ class FeedbackController extends Controller */ public function update(Request $request, $id) { - // + $data = $request->validate([ + "time" => "required" + ]); + + $feedback = Feedback::find($id); + + $feedback->update($data); + + $feedback->save(); + + return Response::detect("feedbacks.edit", [ + "feedback" => $feedback + ]); } /** @@ -93,6 +109,9 @@ class FeedbackController extends Controller */ public function destroy($id) { - // + $feedback = Feedback::find($id); + $feedback->delete(); + + return Response::detect("feedbacks.destroy"); } } diff --git a/skolehjem/app/Http/Controllers/PermissionController.php b/skolehjem/app/Http/Controllers/PermissionController.php index 9b87801..0b627f3 100644 --- a/skolehjem/app/Http/Controllers/PermissionController.php +++ b/skolehjem/app/Http/Controllers/PermissionController.php @@ -69,7 +69,11 @@ class PermissionController extends Controller */ public function edit($id) { - // + $permission = Permission::find($id); + + return Response::detect("permissions.edit", [ + "permission" => $permission + ]); } /** @@ -81,7 +85,19 @@ class PermissionController extends Controller */ public function update(Request $request, $id) { - // + $data = $request->validate([ + "time" => "required" + ]); + + $permission = Permission::find($id); + + $permission->update($data); + + $permission->save(); + + return Response::detect("permissions.edit", [ + "permission" => $permission + ]); } /** @@ -92,6 +108,9 @@ class PermissionController extends Controller */ public function destroy($id) { - // + $permission = Permission::find($id); + $permission->delete(); + + return Response::detect("permissions.destroy"); } } From 9a2cb7a98a932831c11c9aa6ef2f0a33ffb10a99 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 25 Jun 2020 12:44:06 +0200 Subject: [PATCH 10/14] idk kev --- .../Http/Controllers/MenuPlanController.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index b300115..d1120aa 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -59,7 +59,7 @@ class MenuPlanController extends Controller */ public function show($id) { - return Response::detect("menu-plan.show", [ "menuplans" => $id]); + return Response::detect("menu-plan.show", [ "menu-plans" => $id]); } /** @@ -70,7 +70,8 @@ class MenuPlanController extends Controller */ public function edit($id) { - // + $editLink = MenuPlan::find($id); + return Response::detect("menu-plans.edit", ["menu-plans" => $editLink]); } /** @@ -82,7 +83,15 @@ class MenuPlanController extends Controller */ public function update(Request $request, $id) { - // + $data = $request->validate([ + "name" => "", + "link" => "" + ]); + + $id->update($data); + $id->save(); + + return Response::detect("menu-plans.update"); } /** @@ -93,6 +102,7 @@ class MenuPlanController extends Controller */ public function destroy($id) { - // + $id->delete(); + return Response::detect("menu-plans.destroy"); } } From f3956e1e9bdcf3da5036f645d3685ec45bf9d416 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 12:48:44 +0200 Subject: [PATCH 11/14] Added Booking to base.blade.php --- skolehjem/resources/views/admin/layout/base.blade.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index f55ab24..39e978b 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -31,11 +31,10 @@

Booking

- bookings mangler i web.php - {{--ReadVis Bookings--}} + ReadVis Bookings
- {{--CreateOpret Booking--}} + CreateOpret Booking
From 635d91915aab13f84a3d94c4588baf7e7e40d3c2 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Thu, 25 Jun 2020 12:50:09 +0200 Subject: [PATCH 12/14] Fixes --- .../views/admin/root/index.blade.php | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 skolehjem/resources/views/admin/root/index.blade.php diff --git a/skolehjem/resources/views/admin/root/index.blade.php b/skolehjem/resources/views/admin/root/index.blade.php new file mode 100644 index 0000000..4738b86 --- /dev/null +++ b/skolehjem/resources/views/admin/root/index.blade.php @@ -0,0 +1,56 @@ +{{----}} +{{------app +{{----}} + +{{--Login--}} +{{--@extends("app.users.login")--}} + +{{--Register--}} +{{--@extends("app.users.register")--}} + + +{{--Vagttelefon--}} +{{--@extends("app.vagttelefons.index")--}} + +{{--Booking Liste--}} +{{--@extends("app.bookings.index")--}} + +{{--Menuplan--}} +{{--@extends("app.menuplans.index")--}} + +{{----}} +{{------Admin Panel +{{----}} + +{{--Index--}} +{{----}}@extends("admin.index") + +{{--Create User--}} +{{--@extends("admin.users.create")--}} + +{{--Read User--}} +{{--@extends("admin.users.show")--}} + +{{--Update User--}} +{{--@extends("admin.users.update")--}} + +{{--Create Menuplan--}} +{{--@extends("admin.menuplans.create")--}} + +{{--Read Menuplan--}} +{{--@extends("admin.menuplans.show")--}} + +{{--Update Menuplan--}} +{{--@extends("admin.menuplans.update")--}} + +{{--Create booking--}} +{{--@extends("admin.bookings.create")--}} + +{{--Read booking--}} +{{--@extends("admin.bookings.show")--}} + +{{--Create washing-machine--}} +{{--@extends("admin.washing-machines.create")--}} + +{{--Read washing-machine--}} +{{--@extends("admin.washing-machines.show")--}} From 103dfa68309c24ea4bb6ca0e3127aafaf29fdc9e Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 13:01:53 +0200 Subject: [PATCH 13/14] (Maybe) Fixed Menuplans --- .../views/admin/menuplans/delete.blade.php | 2 +- .../views/admin/menuplans/edit.blade.php | 2 +- .../views/admin/menuplans/show.blade.php | 4 +-- .../views/admin/menuplans/store.blade.php | 25 +++---------------- 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/skolehjem/resources/views/admin/menuplans/delete.blade.php b/skolehjem/resources/views/admin/menuplans/delete.blade.php index ca84f3d..a817ecd 100644 --- a/skolehjem/resources/views/admin/menuplans/delete.blade.php +++ b/skolehjem/resources/views/admin/menuplans/delete.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Fjern Menuplan / + Fjern Menuplan / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index c8cab9a..7295eae 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Rediger Menuplan / + Rediger Menuplan / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/menuplans/show.blade.php b/skolehjem/resources/views/admin/menuplans/show.blade.php index 1a08414..f6dc87a 100644 --- a/skolehjem/resources/views/admin/menuplans/show.blade.php +++ b/skolehjem/resources/views/admin/menuplans/show.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Menuplan - Read + Menuplan - Vis @endsection @section("path") - Vis Menuplan / + Vis Menuplan / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/menuplans/store.blade.php b/skolehjem/resources/views/admin/menuplans/store.blade.php index e7c4ae2..1896239 100644 --- a/skolehjem/resources/views/admin/menuplans/store.blade.php +++ b/skolehjem/resources/views/admin/menuplans/store.blade.php @@ -2,32 +2,13 @@ @extends("admin.layout.header") @section("title") - Vaskemaskiner - Vis + Vaskemaskiner - Opret @endsection @section("path") - Vis Vaskemaskiner / + Opret Vaskemaskiner / @endsection @section("content") - - - - - - - - - - - - - - - - - - - -
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+ Vaskemaskinen blev (ikke) oprettet. @endsection From 1105233f7cacefd89da9d0b365c81ae380655df6 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 13:14:08 +0200 Subject: [PATCH 14/14] Edited BookingController.php --- skolehjem/app/Http/Controllers/BookingController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/BookingController.php b/skolehjem/app/Http/Controllers/BookingController.php index a5bf5f8..3408353 100644 --- a/skolehjem/app/Http/Controllers/BookingController.php +++ b/skolehjem/app/Http/Controllers/BookingController.php @@ -72,7 +72,7 @@ class BookingController extends Controller */ public function edit($id) { - // + return Response::detect("bookings.show", [ "bookings" => $id]); } /**