From 54a0fd0997dff7b8d111ceafa57f880e371b77c3 Mon Sep 17 00:00:00 2001 From: Vedde Date: Wed, 1 Jul 2020 09:08:33 +0200 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 8/9] 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 9/9] 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 ]); } /**
Feedback Besked Ris el. Ros