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 @@ +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) + { + return Response::detect("bookings.show", [ "bookings" => $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/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/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 1282892..590e2f9 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,76 +12,106 @@ 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) { - // + $feedback = Feedback::find($id); + + return Response::detect("feedbacks.edit", [ + "feedback" => $feedback + ]); } /** * 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) { - // + $data = $request->validate([ + "time" => "required" + ]); + + $feedback = Feedback::find($id); + + $feedback->update($data); + + $feedback->save(); + + return Response::detect("feedbacks.edit", [ + "feedback" => $feedback + ]); } /** * Remove the specified resource from storage. * * @param int $id - * @return \Illuminate\Http\Response + * @return Response */ public function destroy($id) { - // + $feedback = Feedback::find($id); + $feedback->delete(); + + return Response::detect("feedbacks.destroy"); } } diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 130cffc..d1120aa 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -2,7 +2,11 @@ namespace App\Http\Controllers; +use App\ExternalLink; +use App\MenuPlan; use Illuminate\Http\Request; +use Illuminate\Http\Response; + class MenuPlanController extends Controller { @@ -11,9 +15,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]); } /** @@ -21,9 +27,9 @@ class MenuPlanController extends Controller * * @return \Illuminate\Http\Response */ - public function create() + public function create(Request $request) { - // + return Response::detect("menuplans.create"); } /** @@ -34,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("menuplans.store"); } /** @@ -45,7 +59,7 @@ class MenuPlanController extends Controller */ public function show($id) { - // + return Response::detect("menu-plan.show", [ "menu-plans" => $id]); } /** @@ -56,7 +70,8 @@ class MenuPlanController extends Controller */ public function edit($id) { - // + $editLink = MenuPlan::find($id); + return Response::detect("menu-plans.edit", ["menu-plans" => $editLink]); } /** @@ -68,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"); } /** @@ -79,6 +102,7 @@ class MenuPlanController extends Controller */ public function destroy($id) { - // + $id->delete(); + return Response::detect("menu-plans.destroy"); } } diff --git a/skolehjem/app/Http/Controllers/PermissionController.php b/skolehjem/app/Http/Controllers/PermissionController.php index 49f1674..0b627f3 100644 --- a/skolehjem/app/Http/Controllers/PermissionController.php +++ b/skolehjem/app/Http/Controllers/PermissionController.php @@ -4,82 +4,113 @@ 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) { - // + $permission = Permission::find($id); + + return Response::detect("permissions.edit", [ + "permission" => $permission + ]); } /** * 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) { - // + $data = $request->validate([ + "time" => "required" + ]); + + $permission = Permission::find($id); + + $permission->update($data); + + $permission->save(); + + return Response::detect("permissions.edit", [ + "permission" => $permission + ]); } /** * Remove the specified resource from storage. * - * @param int $id - * @return \Illuminate\Http\Response + * @param int $id + * @return void */ public function destroy($id) { - // + $permission = Permission::find($id); + $permission->delete(); + + return Response::detect("permissions.destroy"); } } 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/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'); } } 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/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 4b01fc0..39e978b 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -22,28 +22,28 @@

Menuplan

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

Booking

- {{-- ReadVis Bookings--}} + ReadVis Bookings
- {{-- CreateOpret Booking--}} + CreateOpret Booking

Vaskemaskiner

- {{-- ReadVis Bookings--}} + ReadVis Vaskemaskiner
- {{-- CreateOpret Booking--}} + CreateOpret Vaskemaskine
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/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/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php new file mode 100644 index 0000000..998d82b --- /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/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 new file mode 100644 index 0000000..1896239 --- /dev/null +++ b/skolehjem/resources/views/admin/menuplans/store.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vaskemaskiner - Opret +@endsection + +@section("path") + Opret Vaskemaskiner / +@endsection + +@section("content") + Vaskemaskinen blev (ikke) oprettet. +@endsection 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")--}} 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 46ed324..94f99ab 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -15,12 +15,15 @@ {{--Booking Liste--}} @extends("app.bookings.index") +{{--Menuplan--}} +{{--@extends("app.menuplans.index")--}} + {{----}} {{------Admin Panel {{----}} {{--Index--}} -{{--@extends("admin.index")--}} +{{----}}@extends("admin.index") {{--Create User--}} {{--@extends("admin.users.create")--}} 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") diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 7b7bf4f..7863c02 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -25,10 +25,11 @@ 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"); +Route::resource("bookings", "BookingController");