diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index eeb0046..e52d5c4 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -15,8 +15,7 @@ class ContactController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:contact.list" ])->only("index"); - $this->middleware([ "check.auth:contact.show" ])->only("show"); + $this->middleware([ "check.auth:contact.show" ])->only("show", "index"); $this->middleware([ "check.auth:contact.create" ])->only("create", "store"); $this->middleware([ "check.auth:contact.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:contact.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index ed02a45..86385db 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -19,8 +19,7 @@ class EventController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:event.list" ])->only("index"); - $this->middleware([ "check.auth:event.show" ])->only("show"); + $this->middleware([ "check.auth:event.show" ])->only("show", "index"); $this->middleware([ "check.auth:event.create" ])->only("create", "store"); $this->middleware([ "check.auth:event.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:event.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index ded3ca6..7fdcd52 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -15,8 +15,7 @@ class FeedbackController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:feedback.list" ])->only("index"); - $this->middleware([ "check.auth:feedback.show" ])->only("show"); + $this->middleware([ "check.auth:feedback.show" ])->only("show", "index"); $this->middleware([ "check.auth:feedback.create" ])->only("create", "store"); $this->middleware([ "check.auth:feedback.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:feedback.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index 739489a..c75fb96 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -15,8 +15,7 @@ class GuideController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:guides.list" ])->only("index"); - $this->middleware([ "check.auth:guides.show" ])->only("show"); + $this->middleware([ "check.auth:guides.show" ])->only("show", "index"); $this->middleware([ "check.auth:guides.create" ])->only("create", "store"); $this->middleware([ "check.auth:guides.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:guides.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/LocationController.php b/skolehjem/app/Http/Controllers/LocationController.php index 33b73f5..29a33c9 100644 --- a/skolehjem/app/Http/Controllers/LocationController.php +++ b/skolehjem/app/Http/Controllers/LocationController.php @@ -17,8 +17,7 @@ class LocationController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:locations.list" ])->only("index"); - $this->middleware([ "check.auth:locations.show" ])->only("show"); + $this->middleware([ "check.auth:locations.show" ])->only("show", "index"); $this->middleware([ "check.auth:locations.create" ])->only("create", "store"); $this->middleware([ "check.auth:locations.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:locations.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index c351b5e..424ce52 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -23,8 +23,7 @@ class MenuPlanController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:menuplan.list" ])->only("index"); - $this->middleware([ "check.auth:menuplan.show" ])->only("show"); + $this->middleware([ "check.auth:menuplan.show" ])->only("show", "index"); $this->middleware([ "check.auth:menuplan.create" ])->only("create", "store"); $this->middleware([ "check.auth:menuplan.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:menuplan.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/NewsController.php b/skolehjem/app/Http/Controllers/NewsController.php index bb315de..9141d6b 100644 --- a/skolehjem/app/Http/Controllers/NewsController.php +++ b/skolehjem/app/Http/Controllers/NewsController.php @@ -17,8 +17,7 @@ class NewsController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:news.list" ])->only("index"); - $this->middleware([ "check.auth:news.show" ])->only("show"); + $this->middleware([ "check.auth:news.show" ])->only("show", "index"); $this->middleware([ "check.auth:news.create" ])->only("create", "store"); $this->middleware([ "check.auth:news.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:news.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/ResourceCategoryController.php b/skolehjem/app/Http/Controllers/ResourceCategoryController.php index dcfdb71..ae59ce3 100644 --- a/skolehjem/app/Http/Controllers/ResourceCategoryController.php +++ b/skolehjem/app/Http/Controllers/ResourceCategoryController.php @@ -13,8 +13,7 @@ class ResourceCategoryController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:resource.category.list" ])->only("index"); - $this->middleware([ "check.auth:resource.category.show" ])->only("show"); + $this->middleware([ "check.auth:resource.category.show" ])->only("show", "index"); $this->middleware([ "check.auth:resource.category.create" ])->only("create", "store"); $this->middleware([ "check.auth:resource.category.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:resource.category.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/ResourceController.php b/skolehjem/app/Http/Controllers/ResourceController.php index 0dd9a8c..08b5086 100644 --- a/skolehjem/app/Http/Controllers/ResourceController.php +++ b/skolehjem/app/Http/Controllers/ResourceController.php @@ -16,8 +16,7 @@ class ResourceController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:resource.list" ])->only("index"); - $this->middleware([ "check.auth:resource.show" ])->only("show"); + $this->middleware([ "check.auth:resource.show" ])->only("show", "index"); $this->middleware([ "check.auth:resource.create" ])->only("create", "store"); $this->middleware([ "check.auth:resource.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:resource.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/ResourceExtensionController.php b/skolehjem/app/Http/Controllers/ResourceExtensionController.php index b13606e..a417498 100644 --- a/skolehjem/app/Http/Controllers/ResourceExtensionController.php +++ b/skolehjem/app/Http/Controllers/ResourceExtensionController.php @@ -13,8 +13,7 @@ class ResourceExtensionController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:resource.extension.list" ])->only("index"); - $this->middleware([ "check.auth:resource.extension.show" ])->only("show"); + $this->middleware([ "check.auth:resource.extension.show" ])->only("show", "index"); $this->middleware([ "check.auth:resource.extension.create" ])->only("create", "store"); $this->middleware([ "check.auth:resource.extension.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:resource.extension.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index ccb5fee..baf642b 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -8,15 +8,14 @@ use Illuminate\Support\Facades\DB; use Spatie\Permission\Models\Role; use Illuminate\Database\Eloquent\Collection; -class rolesController extends Controller +class RolesController extends Controller { public function __construct() { $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:roles.list" ])->only("index"); - $this->middleware([ "check.auth:roles.show" ])->only("show"); + $this->middleware([ "check.auth:roles.show" ])->only("show", "index"); $this->middleware([ "check.auth:roles.create" ])->only("create", "store"); $this->middleware([ "check.auth:roles.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:roles.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 876ffa1..429ee40 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -23,11 +23,11 @@ class UserController extends Controller public function __construct() { $this->middleware([ "auth" ])->only("logout"); + $this->middleware([ "guest" ])->only("login"); $this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot"]); - $this->middleware([ "check.auth:user.list" ])->only("index"); - $this->middleware([ "check.auth:user.show" ])->only("show"); + $this->middleware([ "check.auth:user.show" ])->only("show", "index"); $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"); diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index 781a5e8..a35d38c 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -20,8 +20,7 @@ class WashingMachineController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:washing.machine.list" ])->only("index"); - $this->middleware([ "check.auth:washing.machine.show" ])->only("show"); + $this->middleware([ "check.auth:washing.machine.show" ])->only("show", "index"); $this->middleware([ "check.auth:washing.machine.create" ])->only("create", "store"); $this->middleware([ "check.auth:washing.machine.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:washing.machine.delete" ])->only("delete"); diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index e187c80..17e768b 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -24,8 +24,7 @@ class WashingReservationController extends Controller $this->middleware([ "auth" ]); $this->middleware([ "lang" ]); - $this->middleware([ "check.auth:washing.machine.reservation.list" ])->only(["index", "appindex"]); - $this->middleware([ "check.auth:washing.machine.reservation.show" ])->only("show"); + $this->middleware([ "check.auth:washing.machine.reservation.show" ])->only("show", "index", "appindex"); $this->middleware([ "check.auth:washing.machine.reservation.create" ])->only("create", "store"); $this->middleware([ "check.auth:washing.machine.reservation.edit" ])->only("edit", "update"); $this->middleware([ "check.auth:washing.machine.reservation.delete" ])->only("delete"); diff --git a/skolehjem/database/seeds/PermissionSeeder.php b/skolehjem/database/seeds/PermissionSeeder.php index db58e11..28b9b46 100644 --- a/skolehjem/database/seeds/PermissionSeeder.php +++ b/skolehjem/database/seeds/PermissionSeeder.php @@ -18,35 +18,15 @@ class PermissionSeeder extends Seeder * The USER specific permissions */ "user.create" => "Creation of new user", - "user.list" => "Access to list the users.", "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 CALENDAR specific permissions //TODO: Do we use them? - */ - "calendar.create" => "Create a new event.", - "calendar.list" => "Shows all events.", - "calendar.show" => "Shows a specific event.", - "calendar.edit" => "Allows editing of events.", - "calendar.delete" => "Allows the deletion of events.", - - /** - * The EXTERNAL LINK specific permissions - */ - "link.external.create" => "Create a new external link.", - "link.external.list" => "List all external links.", - "link.external.show" => "Show a specific external link", - "link.external.edit" => "Allows editing of external links.", - "link.external.delete" => "Allows deletion of external links", - /** * The EVENT specific permissions */ "event.create" => "Create a new event", - "event.list" => "Shows all events", "event.show" => "Shows a specific event", "event.edit" => "Allows editing of events", "event.delete" => "Allows deletion of events", @@ -55,7 +35,6 @@ class PermissionSeeder extends Seeder * The CONTACT specific permissions */ "contact.create" => "Creates a new contact", - "contact.list" => "Shows all contacts", "contact.show" => "Shows a specific contact", "contact.edit" => "allows editing of contacts", "contact.delete" => "Allows deletion of contacts", @@ -64,7 +43,6 @@ class PermissionSeeder extends Seeder * The FEEDBACK specific permissions */ "feedback.create" => "Creates a new feedback message", - "feedback.list" => "Shows all feedback messages", "feedback.show" => "Shows a specific feedback message", "feedback.edit" => "allows editing of feedback messages", "feedback.delete" => "allows deletion of feedback messages", @@ -73,7 +51,6 @@ class PermissionSeeder extends Seeder * The MENUPLAN specific permissions */ "menuplan.create" => "Create a new menuplan", - "menuplan.list" => "Shows all menuplans", "menuplan.show" => "Shows a specific menuplan", "menuplan.edit" => "Allows editing of menuplans", "menuplan.delete" => "Allows deletion of menuplans", @@ -82,7 +59,6 @@ class PermissionSeeder extends Seeder * The RESOURCE CATEGORY specific permissions */ "resource.category.create" => "Create a new resource category", - "resource.category.list" => "Shows all resource categories", "resource.category.show" => "Shows a specific resource category", "resource.category.edit" => "Allows editing of resource categories", "resource.category.delete" => "Allows deletion of resource categories", @@ -91,7 +67,6 @@ class PermissionSeeder extends Seeder * The RESOURCE EXTENSION specific permissions */ "resource.extension.create" => "Create a new resource extension", - "resource.extension.list" => "Shows all resource extensions", "resource.extension.show" => "Shows a specific resource extension", "resource.extension.edit" => "Allows editing of resource extensions", "resource.extension.delete" => "Allows deletion of resource extensions", @@ -100,7 +75,6 @@ class PermissionSeeder extends Seeder * The RESOURCE specific permissions */ "resource.create" => "Create a new resource", - "resource.list" => "Shows all resources", "resource.show" => "Shows a specific resource", "resource.edit" => "Allows editing of resources", "resource.delete" => "Allows deletion of resources", @@ -109,7 +83,6 @@ class PermissionSeeder extends Seeder * The WASHING MACHINE specific permissions */ "washing.machine.create" => "Create a new washing machine", - "washing.machine.list" => "Shows all washing machines", "washing.machine.show" => "Shows a specific washing machine", "washing.machine.edit" => "Allows editing of washing machines", "washing.machine.delete" => "Allows deletion of washing machines", @@ -118,7 +91,6 @@ class PermissionSeeder extends Seeder * The WASHING MACHINE RESERVATION specific permissions */ "washing.machine.reservation.create" => "Create a new washing machine reservation", - "washing.machine.reservation.list" => "Shows all washing machine reservations", "washing.machine.reservation.show" => "Shows a specific washing machine reservation", "washing.machine.reservation.edit" => "Allows editing of washing machine reservations", "washing.machine.reservation.delete" => "Allows deletion of washing machine reservations", @@ -127,7 +99,6 @@ class PermissionSeeder extends Seeder * The ROLES specific permissions */ "roles.create" => "Create a new role", - "roles.list" => "Shows all roles", "roles.show" => "Shows a specific role", "roles.edit" => "Allows editing of roles", "roles.delete" => "Allows deletion of roles", @@ -136,7 +107,6 @@ class PermissionSeeder extends Seeder * The GUIDE specific permissions */ "guides.create" => "Create a new guide", - "guides.list" => "Shows all guides", "guides.show" => "Shows a specific guide", "guides.edit" => "Allows editing of guides", "guides.delete" => "Allows deletion of guides", @@ -145,7 +115,6 @@ class PermissionSeeder extends Seeder * The LOCATION specific permissions */ "locations.create" => "Create a new location", - "locations.list" => "Shows all locations", "locations.show" => "Shows a specific location", "locations.edit" => "Allows editing of locations", "locations.delete" => "Allows deletion of locations", @@ -154,7 +123,6 @@ class PermissionSeeder extends Seeder * The NEWS specific permissions */ "news.create" => "Create a new location", - "news.list" => "Shows all locations", "news.show" => "Shows a specific location", "news.edit" => "Allows editing of locations", "news.delete" => "Allows deletion of locations", diff --git a/skolehjem/database/seeds/RoleSeeder.php b/skolehjem/database/seeds/RoleSeeder.php index 003d912..eb9d937 100644 --- a/skolehjem/database/seeds/RoleSeeder.php +++ b/skolehjem/database/seeds/RoleSeeder.php @@ -40,19 +40,15 @@ class RoleSeeder extends Seeder //Bruger Permissions $brugerPermissions = new Collection(); - $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "link.external.list")->first()); - $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "contact.list")->first()); + $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "contact.show")->first()); $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "feedback.create")->first()); - $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "menuplan.list")->first()); + $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "menuplan.show")->first()); $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.list")->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.list")->first()); $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "event.show")->first()); - $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "guides.list")->first()); $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "guides.show")->first()); - $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "news.list")->first()); $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "news.show")->first()); //Give permissions to Bruger (id: 2) diff --git a/skolehjem/resources/js/navmenu/menu.js b/skolehjem/resources/js/navmenu/menu.js index 33a50a8..dbe437f 100644 --- a/skolehjem/resources/js/navmenu/menu.js +++ b/skolehjem/resources/js/navmenu/menu.js @@ -4,6 +4,7 @@ function toggleMenu(menu) { let htmlElement = document.getElementsByTagName('html')[0]; let mainElement = document.getElementsByTagName('main')[0]; let iconElement = document.getElementById("icon"); + let headerElement = document.getElementById("header"); if(menuElement.classList.contains("hide")) { menuElement.classList.remove("hide"); @@ -12,6 +13,7 @@ function toggleMenu(menu) { logoElement.src = '/images/logos/Logo-hvid.svg'; iconElement.classList.remove("fa-times"); iconElement.classList.add("fa-bars"); + headerElement.style.position = 'fixed'; } else { menuElement.classList.add("hide"); mainElement.classList.add("d-none"); @@ -19,6 +21,8 @@ function toggleMenu(menu) { logoElement.src = '/images/logos/Logo-hvid.svg'; iconElement.classList.remove("fa-bars"); iconElement.classList.add("fa-times"); + headerElement.style.position = 'relative'; + headerElement.style.top = '0'; } } diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 85bb23a..c896e77 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -125,39 +125,61 @@ + @if(auth()->user()->can('user.show'))

Brugere

Brugere
+ @endif + @if(auth()->user()->can('roles.show'))

Roller

Roller
+ @endif + @if(auth()->user()->can('news.show'))

Nyheder

Nyheder
+ @endif + @if(auth()->user()->can('menuplan.show'))

Menuplan

Menuplan
+ @endif + @if(auth()->user()->can('event.show'))

Aktiviteter

Aktiviteter
+ @endif + @if(auth()->user()->can('locations.show'))

Lokationer

Lokationer
+ @endif + @if(auth()->user()->can('washing.machine.show'))

Vaskemaskiner

Vaskemaskiner
+ @endif + @if(auth()->user()->can('washing.machine.reservation.show'))

Reservationer

Reservationer
+ @endif + @if(auth()->user()->can('contact.show'))

Kontakter

Kontakter
+ @endif + @if(auth()->user()->can('guides.show'))

Vejledning

Vejledning
+ @endif + @if(auth()->user()->can('feedback.show'))

Feedback

Feedback
+ @endif
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index d5747c7..9da68e4 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -34,30 +34,40 @@ Home Home + @if(auth()->user()->can('menuplan.show')) Menuplan {{ __('msg.menuplan') }} + @endif + @if(auth()->user()->can('event.show')) Aktiviteter {{ __('msg.aktiviteter') }} + @endif + @if(auth()->user()->can('washing.machine.reservation.show')) Reservationer {{ __('msg.reservationer') }} + @endif + @if(auth()->user()->can('contact.show')) Kontakter {{ __('msg.kontoret') }} + @endif Vagttelefon {{ __('msg.vagttelefon') }} + @if(auth()->user()->can('guides.show')) Guide {{ __('msg.vejledning') }} + @endif Konto {{ __('msg.konto') }}