From 4a64d49902f0048137beaf9bc46fb1bc8b96628b Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 2 Sep 2020 11:40:36 +0200 Subject: [PATCH] v0.11.1 - Fixed roles and permissions --- .../app/Http/Controllers/UserController.php | 4 +- .../Http/Controllers/UserEventController.php | 2 + skolehjem/database/seeds/PermissionSeeder.php | 4 +- skolehjem/database/seeds/RoleSeeder.php | 3 +- .../views/admin/roles/create.blade.php | 57 ++++++--------- .../views/admin/roles/edit.blade.php | 70 ++++++++----------- .../resources/views/app/news/index.blade.php | 16 ++++- 7 files changed, 74 insertions(+), 82 deletions(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 429ee40..2cba7f7 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -22,7 +22,7 @@ class UserController extends Controller { public function __construct() { - $this->middleware([ "auth" ])->only("logout"); + $this->middleware([ "auth" ])->only(["accountupdate", "accountedit", "accounteditpass", "account", "logout"]); $this->middleware([ "guest" ])->only("login"); $this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot"]); @@ -31,8 +31,6 @@ class UserController extends Controller $this->middleware([ "check.auth:user.create" ])->only("create"); $this->middleware([ "check.auth:user.edit" ])->only(["edit", "update"]); $this->middleware([ "check.auth:user.delete" ])->only("delete"); - - $this->middleware([ "check.auth:ownuser.edit" ])->only(["accountupdate", "accountedit", "accounteditpass", "account"]); } /** diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index 90fcd89..61f9b1b 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -12,6 +12,8 @@ class UserEventController extends Controller { $this->middleware(["auth"]); $this->middleware(["lang"]); + $this->middleware([ "check.auth:userevent.create" ])->only("create"); + $this->middleware([ "check.auth:userevent.delete" ])->only("destroy"); } /** * Update the specified resource in storage. diff --git a/skolehjem/database/seeds/PermissionSeeder.php b/skolehjem/database/seeds/PermissionSeeder.php index 28b9b46..ca9a9e3 100644 --- a/skolehjem/database/seeds/PermissionSeeder.php +++ b/skolehjem/database/seeds/PermissionSeeder.php @@ -21,7 +21,6 @@ class PermissionSeeder extends Seeder "user.show" => "Shows another user profile.", "user.edit" => "Allows editing of other users.", "user.delete" => "Allows deleting of other users.", - "ownuser.edit" => "Allows editing of your own user", /** * The EVENT specific permissions @@ -30,6 +29,8 @@ class PermissionSeeder extends Seeder "event.show" => "Shows a specific event", "event.edit" => "Allows editing of events", "event.delete" => "Allows deletion of events", + "userevent.create" => "Allows participation in an event", + "userevent.delete" => "Allows removing participation in an event", /** * The CONTACT specific permissions @@ -44,7 +45,6 @@ class PermissionSeeder extends Seeder */ "feedback.create" => "Creates a new feedback message", "feedback.show" => "Shows a specific feedback message", - "feedback.edit" => "allows editing of feedback messages", "feedback.delete" => "allows deletion of feedback messages", /** diff --git a/skolehjem/database/seeds/RoleSeeder.php b/skolehjem/database/seeds/RoleSeeder.php index eb9d937..d933701 100644 --- a/skolehjem/database/seeds/RoleSeeder.php +++ b/skolehjem/database/seeds/RoleSeeder.php @@ -46,8 +46,9 @@ class RoleSeeder extends Seeder $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.create")->first()); $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.delete")->first()); $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.show")->first()); - $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "ownuser.edit")->first()); $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "event.show")->first()); + $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "userevent.create")->first()); + $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "userevent.delete")->first()); $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "guides.show")->first()); $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "news.show")->first()); diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php index c1b004d..f86f240 100644 --- a/skolehjem/resources/views/admin/roles/create.blade.php +++ b/skolehjem/resources/views/admin/roles/create.blade.php @@ -38,7 +38,7 @@
- +
@@ -47,18 +47,11 @@ Her kan alle basale rettigheder for appens forbrugere slås til eller fra. - - - - - - - - - - - - + + + + + @@ -77,9 +70,9 @@ - + - + @@ -106,7 +99,7 @@ - +
KontoBeskrivelseCreateReadDelete
Konto

Egen bruger

App-sideBeskrivelse kan fjernes?Opret/TilmeldSeSlet/Afmeld
Nyheder
Aktiviteter

Empty

//TEST //TEST
ReservationerFeedback Empty
@@ -118,22 +111,18 @@ Her kan alle rettigheder for administrationssiden slås til eller fra. - - - - - - + + + + + + - - - - - + @@ -201,9 +190,9 @@ - + - + @@ -228,9 +217,9 @@ - + - + @@ -309,12 +298,12 @@ //Show konto settings $("#kontoButton").click(function(){ var value = $('#kontoButton').text(); - if(value === 'Konto rettigheder'){ + if(value === 'App rettigheder'){ $('#konto').slideDown('slow'); - $('#kontoButton').html('Luk konto rettigheder') + $('#kontoButton').html('Luk app rettigheder') }else{ $('#konto').slideUp('slow'); - $('#kontoButton').html('Konto rettigheder') + $('#kontoButton').html('App rettigheder') } }); diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php index 72cae1a..216babc 100644 --- a/skolehjem/resources/views/admin/roles/edit.blade.php +++ b/skolehjem/resources/views/admin/roles/edit.blade.php @@ -39,7 +39,7 @@
- +
@@ -47,18 +47,11 @@ Her kan alle basale rettigheder for appens forbrugere slås til eller fra.
SideBeskrivelseCreateReadUpdateDeleteAdmin-sideBeskrivelse kan fjernes?OpretSeRedigerSlet Fuld Kontrol
Admin Panel

Adgang til admin panelet
Brugere
Reservationer Empty
Feedback

Empty
- - - - - - - - - - - - + + + + + @@ -77,9 +70,9 @@ - + - + @@ -106,7 +99,7 @@ - +
KontoBeskrivelseCreateReadDelete
Konto

Egen bruger

hasPermissionTo("ownuser.edit")) checked @endif>App-sideBeskrivelse kan fjernes?Opret/TilmeldSeSlet/Afmeld
Nyheder
Aktiviteter

Empty

//TESThasPermissionTo("userevent.create")) checked @endif> hasPermissionTo("event.show")) checked @endif>//TESThasPermissionTo("userevent.delete")) checked @endif>
ReservationerFeedback Empty hasPermissionTo("feedback.create")) checked @endif>hasPermissionTo("feedback.show")) checked @endif>
@@ -117,25 +110,21 @@
Her kan alle rettigheder for administrationssiden slås til eller fra. - - - - - - - + + + + + + + - + - - - - - + - + @@ -143,7 +132,7 @@ - + @@ -201,9 +190,9 @@ - + - + @@ -228,9 +217,9 @@ - + - + @@ -311,12 +300,12 @@ //Show konto settings $("#kontoButton").click(function(){ var value = $('#kontoButton').text(); - if(value === 'Rediger konto rettigheder'){ + if(value === 'Rediger app rettigheder'){ $('#konto').slideDown('slow'); - $('#kontoButton').html('Luk konto rettigheder') + $('#kontoButton').html('Luk app rettigheder') }else{ $('#konto').slideUp('slow'); - $('#kontoButton').html('Rediger konto rettigheder') + $('#kontoButton').html('Rediger app rettigheder') } }); @@ -333,7 +322,7 @@ } }); - function FullControl(FC) { //FC == Full Controll + function FullControl(FC) { //FC == Full Control checkbox element var Create = $(FC).attr('id') + 'C'; // Takes FC's ID Name and puts C at the back of it var Read = $(FC).attr('id') + 'R'; // Takes FC's ID Name and puts R at the back of it var Update = $(FC).attr('id') + 'U'; // Takes FC's ID Name and puts U at the back of it @@ -358,6 +347,9 @@ for (i = 0; i < arr.length; i++) { if ($('#'+arr[i]+'C').prop('checked') == true && $('#'+arr[i]+'R').prop('checked') == true && $('#'+arr[i]+'U').prop('checked') == true && $('#'+arr[i]+'D').prop('checked') == true) $('#'+arr[i]).prop('checked', true); + else if(arr[i] == 'Feedback' || arr[i] == 'Reservation') + if($('#'+arr[i]+'R').prop('checked') == true && $('#'+arr[i]+'D').prop('checked') == true) + $('#'+arr[i]).prop('checked', true); } }); diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index 6a511ce..0567411 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -45,16 +45,26 @@ .img{ width: 1em; + height: calc(1em + 20px); margin-top: 5px; margin-bottom: 5px; margin-left: 5px; font-size: 20px; - padding: 3px 10px; - border-color: cadetblue; + padding: 0 10px; + border-color: #00788a; border-radius: 100%; - background-color: cadetblue; + background-color: #00788a; line-height: 30px; float: left; + display: flex; + justify-content: center; + } + + .img > a { + width: 100%; + height: 100%; + display: flex; + justify-content: center; } .information{
AdminBeskrivelseCreateReadUpdateDelete
Admin-sideBeskrivelse kan fjernes?OpretSeRedigerSlet Fuld Kontrol
Admin Panel

Adgang til admin panelet

hasPermissionTo("admin.panel.show")) checked @endif>hasPermissionTo("admin.panel.show")) checked @endif>
Brugere

Empty

 hasPermissionTo("user.create")) checked @endif>hasPermissionTo("user.edit")) checked @endif> hasPermissionTo("user.delete")) checked @endif>
Roller

Empty

Reservationer EmptyhasPermissionTo("washing.machine.reservation.create")) checked @endif> hasPermissionTo("washing.machine.reservation.show")) checked @endif>hasPermissionTo("washing.machine.reservation.edit")) checked @endif> hasPermissionTo("washing.machine.reservation.delete")) checked @endif>
Feedback

Empty

hasPermissionTo("feedback.create")) checked @endif> hasPermissionTo("feedback.show")) checked @endif>hasPermissionTo("feedback.edit")) checked @endif> hasPermissionTo("feedback.delete")) checked @endif>