diff --git a/app/Models/User.php b/app/Models/User.php index 23b4063..6eaf5db 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -7,10 +7,12 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Laravel\Sanctum\HasApiTokens; +use Spatie\Permission\Traits\HasRoles; class User extends Authenticatable { use HasApiTokens, HasFactory, Notifiable; + use HasRoles; /** * The attributes that are mass assignable. diff --git a/composer.json b/composer.json index cd59014..61dc27d 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,8 @@ "laravel/sanctum": "^3.2", "laravel/tinker": "^2.8", "laravel/ui": "^4.5", - "livewire/livewire": "^3.5" + "livewire/livewire": "^3.5", + "spatie/laravel-permission": "^6.9" }, "require-dev": { "fakerphp/faker": "^1.9.1", diff --git a/composer.lock b/composer.lock index ebbf641..1b9ae56 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9f3ce6018e096f7914a2def7503b38f7", + "content-hash": "e5b11c246ccc04e120c930cc13d9658b", "packages": [ { "name": "brick/math", @@ -3313,6 +3313,88 @@ ], "time": "2024-04-27T21:32:50+00:00" }, + { + "name": "spatie/laravel-permission", + "version": "6.9.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-permission.git", + "reference": "fe973a58b44380d0e8620107259b7bda22f70408" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/fe973a58b44380d0e8620107259b7bda22f70408", + "reference": "fe973a58b44380d0e8620107259b7bda22f70408", + "shasum": "" + }, + "require": { + "illuminate/auth": "^8.12|^9.0|^10.0|^11.0", + "illuminate/container": "^8.12|^9.0|^10.0|^11.0", + "illuminate/contracts": "^8.12|^9.0|^10.0|^11.0", + "illuminate/database": "^8.12|^9.0|^10.0|^11.0", + "php": "^8.0" + }, + "require-dev": { + "laravel/passport": "^11.0|^12.0", + "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0", + "phpunit/phpunit": "^9.4|^10.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.x-dev", + "dev-master": "6.x-dev" + }, + "laravel": { + "providers": [ + "Spatie\\Permission\\PermissionServiceProvider" + ] + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Spatie\\Permission\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Permission handling for Laravel 8.0 and up", + "homepage": "https://github.com/spatie/laravel-permission", + "keywords": [ + "acl", + "laravel", + "permission", + "permissions", + "rbac", + "roles", + "security", + "spatie" + ], + "support": { + "issues": "https://github.com/spatie/laravel-permission/issues", + "source": "https://github.com/spatie/laravel-permission/tree/6.9.0" + }, + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2024-06-22T23:04:52+00:00" + }, { "name": "symfony/console", "version": "v6.4.8", diff --git a/config/app.php b/config/app.php index bca112f..06b6cdf 100644 --- a/config/app.php +++ b/config/app.php @@ -194,6 +194,7 @@ // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, + Spatie\Permission\PermissionServiceProvider::class, ], diff --git a/config/permission.php b/config/permission.php new file mode 100644 index 0000000..2a520f3 --- /dev/null +++ b/config/permission.php @@ -0,0 +1,186 @@ + [ + + /* + * When using the "HasPermissions" trait from this package, we need to know which + * Eloquent model should be used to retrieve your permissions. Of course, it + * is often just the "Permission" model but you may use whatever you like. + * + * The model you want to use as a Permission model needs to implement the + * `Spatie\Permission\Contracts\Permission` contract. + */ + + 'permission' => Spatie\Permission\Models\Permission::class, + + /* + * When using the "HasRoles" trait from this package, we need to know which + * Eloquent model should be used to retrieve your roles. Of course, it + * is often just the "Role" model but you may use whatever you like. + * + * The model you want to use as a Role model needs to implement the + * `Spatie\Permission\Contracts\Role` contract. + */ + + 'role' => Spatie\Permission\Models\Role::class, + + ], + + 'table_names' => [ + + /* + * When using the "HasRoles" trait from this package, we need to know which + * table should be used to retrieve your roles. We have chosen a basic + * default value but you may easily change it to any table you like. + */ + + 'roles' => 'roles', + + /* + * When using the "HasPermissions" trait from this package, we need to know which + * table should be used to retrieve your permissions. We have chosen a basic + * default value but you may easily change it to any table you like. + */ + + 'permissions' => 'permissions', + + /* + * When using the "HasPermissions" trait from this package, we need to know which + * table should be used to retrieve your models permissions. We have chosen a + * basic default value but you may easily change it to any table you like. + */ + + 'model_has_permissions' => 'model_has_permissions', + + /* + * When using the "HasRoles" trait from this package, we need to know which + * table should be used to retrieve your models roles. We have chosen a + * basic default value but you may easily change it to any table you like. + */ + + 'model_has_roles' => 'model_has_roles', + + /* + * When using the "HasRoles" trait from this package, we need to know which + * table should be used to retrieve your roles permissions. We have chosen a + * basic default value but you may easily change it to any table you like. + */ + + 'role_has_permissions' => 'role_has_permissions', + ], + + 'column_names' => [ + /* + * Change this if you want to name the related pivots other than defaults + */ + 'role_pivot_key' => null, //default 'role_id', + 'permission_pivot_key' => null, //default 'permission_id', + + /* + * Change this if you want to name the related model primary key other than + * `model_id`. + * + * For example, this would be nice if your primary keys are all UUIDs. In + * that case, name this `model_uuid`. + */ + + 'model_morph_key' => 'model_id', + + /* + * Change this if you want to use the teams feature and your related model's + * foreign key is other than `team_id`. + */ + + 'team_foreign_key' => 'team_id', + ], + + /* + * When set to true, the method for checking permissions will be registered on the gate. + * Set this to false if you want to implement custom logic for checking permissions. + */ + + 'register_permission_check_method' => true, + + /* + * When set to true, Laravel\Octane\Events\OperationTerminated event listener will be registered + * this will refresh permissions on every TickTerminated, TaskTerminated and RequestTerminated + * NOTE: This should not be needed in most cases, but an Octane/Vapor combination benefited from it. + */ + 'register_octane_reset_listener' => false, + + /* + * Teams Feature. + * When set to true the package implements teams using the 'team_foreign_key'. + * If you want the migrations to register the 'team_foreign_key', you must + * set this to true before doing the migration. + * If you already did the migration then you must make a new migration to also + * add 'team_foreign_key' to 'roles', 'model_has_roles', and 'model_has_permissions' + * (view the latest version of this package's migration file) + */ + + 'teams' => false, + + /* + * Passport Client Credentials Grant + * When set to true the package will use Passports Client to check permissions + */ + + 'use_passport_client_credentials' => false, + + /* + * When set to true, the required permission names are added to exception messages. + * This could be considered an information leak in some contexts, so the default + * setting is false here for optimum safety. + */ + + 'display_permission_in_exception' => false, + + /* + * When set to true, the required role names are added to exception messages. + * This could be considered an information leak in some contexts, so the default + * setting is false here for optimum safety. + */ + + 'display_role_in_exception' => false, + + /* + * By default wildcard permission lookups are disabled. + * See documentation to understand supported syntax. + */ + + 'enable_wildcard_permission' => false, + + /* + * The class to use for interpreting wildcard permissions. + * If you need to modify delimiters, override the class and specify its name here. + */ + // 'permission.wildcard_permission' => Spatie\Permission\WildcardPermission::class, + + /* Cache-specific settings */ + + 'cache' => [ + + /* + * By default all permissions are cached for 24 hours to speed up performance. + * When permissions or roles are updated the cache is flushed automatically. + */ + + 'expiration_time' => \DateInterval::createFromDateString('24 hours'), + + /* + * The cache key used to store all permissions. + */ + + 'key' => 'spatie.permission.cache', + + /* + * You may optionally indicate a specific cache driver to use for permission and + * role caching using any of the `store` drivers listed in the cache.php config + * file. Using 'default' here means to use the `default` set in cache.php. + */ + + 'store' => 'default', + ], +]; diff --git a/database/migrations/2024_07_01_095021_create_permission_tables.php b/database/migrations/2024_07_01_095021_create_permission_tables.php new file mode 100644 index 0000000..9c7044b --- /dev/null +++ b/database/migrations/2024_07_01_095021_create_permission_tables.php @@ -0,0 +1,140 @@ +engine('InnoDB'); + $table->bigIncrements('id'); // permission id + $table->string('name'); // For MyISAM use string('name', 225); // (or 166 for InnoDB with Redundant/Compact row format) + $table->string('guard_name'); // For MyISAM use string('guard_name', 25); + $table->timestamps(); + + $table->unique(['name', 'guard_name']); + }); + + Schema::create($tableNames['roles'], function (Blueprint $table) use ($teams, $columnNames) { + //$table->engine('InnoDB'); + $table->bigIncrements('id'); // role id + if ($teams || config('permission.testing')) { // permission.testing is a fix for sqlite testing + $table->unsignedBigInteger($columnNames['team_foreign_key'])->nullable(); + $table->index($columnNames['team_foreign_key'], 'roles_team_foreign_key_index'); + } + $table->string('name'); // For MyISAM use string('name', 225); // (or 166 for InnoDB with Redundant/Compact row format) + $table->string('guard_name'); // For MyISAM use string('guard_name', 25); + $table->timestamps(); + if ($teams || config('permission.testing')) { + $table->unique([$columnNames['team_foreign_key'], 'name', 'guard_name']); + } else { + $table->unique(['name', 'guard_name']); + } + }); + + Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames, $pivotPermission, $teams) { + $table->unsignedBigInteger($pivotPermission); + + $table->string('model_type'); + $table->unsignedBigInteger($columnNames['model_morph_key']); + $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_permissions_model_id_model_type_index'); + + $table->foreign($pivotPermission) + ->references('id') // permission id + ->on($tableNames['permissions']) + ->onDelete('cascade'); + if ($teams) { + $table->unsignedBigInteger($columnNames['team_foreign_key']); + $table->index($columnNames['team_foreign_key'], 'model_has_permissions_team_foreign_key_index'); + + $table->primary([$columnNames['team_foreign_key'], $pivotPermission, $columnNames['model_morph_key'], 'model_type'], + 'model_has_permissions_permission_model_type_primary'); + } else { + $table->primary([$pivotPermission, $columnNames['model_morph_key'], 'model_type'], + 'model_has_permissions_permission_model_type_primary'); + } + + }); + + Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames, $pivotRole, $teams) { + $table->unsignedBigInteger($pivotRole); + + $table->string('model_type'); + $table->unsignedBigInteger($columnNames['model_morph_key']); + $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_roles_model_id_model_type_index'); + + $table->foreign($pivotRole) + ->references('id') // role id + ->on($tableNames['roles']) + ->onDelete('cascade'); + if ($teams) { + $table->unsignedBigInteger($columnNames['team_foreign_key']); + $table->index($columnNames['team_foreign_key'], 'model_has_roles_team_foreign_key_index'); + + $table->primary([$columnNames['team_foreign_key'], $pivotRole, $columnNames['model_morph_key'], 'model_type'], + 'model_has_roles_role_model_type_primary'); + } else { + $table->primary([$pivotRole, $columnNames['model_morph_key'], 'model_type'], + 'model_has_roles_role_model_type_primary'); + } + }); + + Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames, $pivotRole, $pivotPermission) { + $table->unsignedBigInteger($pivotPermission); + $table->unsignedBigInteger($pivotRole); + + $table->foreign($pivotPermission) + ->references('id') // permission id + ->on($tableNames['permissions']) + ->onDelete('cascade'); + + $table->foreign($pivotRole) + ->references('id') // role id + ->on($tableNames['roles']) + ->onDelete('cascade'); + + $table->primary([$pivotPermission, $pivotRole], 'role_has_permissions_permission_id_role_id_primary'); + }); + + app('cache') + ->store(config('permission.cache.store') != 'default' ? config('permission.cache.store') : null) + ->forget(config('permission.cache.key')); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + $tableNames = config('permission.table_names'); + + if (empty($tableNames)) { + throw new \Exception('Error: config/permission.php not found and defaults could not be merged. Please publish the package configuration before proceeding, or drop the tables manually.'); + } + + Schema::drop($tableNames['role_has_permissions']); + Schema::drop($tableNames['model_has_roles']); + Schema::drop($tableNames['model_has_permissions']); + Schema::drop($tableNames['roles']); + Schema::drop($tableNames['permissions']); + } +}; diff --git a/public/css/bredcrumplist.css b/public/css/bredcrumplist.css new file mode 100644 index 0000000..4c5f380 --- /dev/null +++ b/public/css/bredcrumplist.css @@ -0,0 +1,84 @@ +#crumbs { + text-align: center; + margin-top: 10px; + } + + + #crumbs ul { + list-style: none; + display: inline-table; + } + + #crumbs ul li { + display: inline; + } + + #crumbs ul li a { + display: block; + float: left; + height: 25px; /* Further reduced height */ + background: skyblue; + text-align: center; + padding: 10px 10px 30px 40px; /* Further adjusted padding */ + position: relative; + margin: 0 3px 0 3px; + font-size: 12px; /* Further reduced font size */ + text-decoration: none; + color: black; + } + + #crumbs ul li a:after { + content: ""; + border-top: 20px solid transparent; /* Further adjusted border sizes */ + border-bottom: 20px solid transparent; + border-left: 20px solid skyblue; + position: absolute; + right: -20px; /* Adjusted position */ + top: 0; + z-index: 1; + } + + #crumbs ul li a:before { + content: ""; + border-top: 20px solid transparent; + border-bottom: 20px solid transparent; + border-left: 20px solid #fff; + position: absolute; + left: 0; + top: 0; + } + + #crumbs ul li:first-child a { + padding-left: 25px; + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; + } + + #crumbs ul li:first-child a:before { + display: none; + } + + #crumbs ul li:last-child a { + padding-right: 20px; /* Further adjusted padding */ + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; + } + + #crumbs ul li:last-child a:after { + display: none; + } + + #crumbs ul li a:hover { + background: #357dfd; + color: #fff; + } + + #crumbs ul li a:hover:after { + border-left-color: #357dfd; + color: #fff; + } + #crumbs ul li i.material-icons { + vertical-align: middle; + font-size: 25px; + margin-right: 5px; + } \ No newline at end of file diff --git a/public/css/material-dashboard.css b/public/css/material-dashboard.css index c6a1296..64adf0a 100644 --- a/public/css/material-dashboard.css +++ b/public/css/material-dashboard.css @@ -9301,7 +9301,7 @@ fieldset[disabled] .form-group .form-control { color: inherit; padding: 0.9375rem; font-weight: 400; - font-size: 12px; + font-size: 20px; text-transform: uppercase; border-radius: 3px; line-height: 20px; } @@ -9473,7 +9473,6 @@ fieldset[disabled] .form-group .form-control { padding: 10px 15px; font-weight: 400; font-size: 12px; - text-transform: uppercase; border-radius: 3px; line-height: 20px; margin-left: 5px; @@ -9501,7 +9500,6 @@ fieldset[disabled] .form-group .form-control { padding-bottom: 15px; font-weight: 500; font-size: 12px; - text-transform: uppercase; border-radius: 3px; color: #ffffff; margin: 0 15px; } @@ -9593,8 +9591,7 @@ fieldset[disabled] .form-group .form-control { margin-top: 5px; } .nav-pills .nav-item .nav-link { line-height: 24px; - text-transform: uppercase; - font-size: 12px; + font-size: 15px; font-weight: 500; min-width: 100px; text-align: center; @@ -9603,7 +9600,7 @@ fieldset[disabled] .form-group .form-control { border-radius: 30px; padding: 10px 15px; } .nav-pills .nav-item .nav-link:hover { - background-color: rgba(200, 200, 200, 0.2); } + background-color: skyblue; } .nav-pills .nav-item .nav-link.active { color: #ffffff; background-color: #9c27b0; diff --git a/public/css/sectionnavbar.css b/public/css/sectionnavbar.css new file mode 100644 index 0000000..61ac137 --- /dev/null +++ b/public/css/sectionnavbar.css @@ -0,0 +1,26 @@ +.rowsection{ + padding-top: 5px; + margin-bottom: 0; +} +.navbutton{ + margin-left: 25px; + background-color: white; + color: rgb(0, 0, 0); + font-size: 15px; + font-weight: 600; + border-radius:85rem; + align-items: center; + display: flex; + align-items: center; + text-decoration: none; +} +.navbutton:hover{ + background-color: rgba(110, 145, 252, 0.24); + color: skyblue; + } + .navbutton i.material-icons { + font-size: 18px; + padding: 0; + margin: 0; + margin-right: 10px; + } \ No newline at end of file diff --git a/public/css/topnavbar.css b/public/css/topnavbar.css index 67bb68b..6b6c435 100644 --- a/public/css/topnavbar.css +++ b/public/css/topnavbar.css @@ -43,7 +43,7 @@ margin-right: 30px; } #navbarDropdownProfile{ - background-color:white; + background-color:white; padding-left: 20px; border-radius: 30px; } @@ -65,4 +65,7 @@ font-weight: bold; font-size: 25px; margin-left: 25px; +} +#usernametext{ + margin-top: 0px; } \ No newline at end of file diff --git a/resources/views/Administrator/users/users.blade.php b/resources/views/Administrator/users/users.blade.php index c8f8a5a..b66c547 100644 --- a/resources/views/Administrator/users/users.blade.php +++ b/resources/views/Administrator/users/users.blade.php @@ -7,8 +7,6 @@
- -
diff --git a/resources/views/layouts/administrator_navbar.blade.php b/resources/views/layouts/administrator_navbar.blade.php index ae80646..bdb8e91 100644 --- a/resources/views/layouts/administrator_navbar.blade.php +++ b/resources/views/layouts/administrator_navbar.blade.php @@ -1,3 +1,19 @@ -
- +
+
\ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 5b5f695..aabbead 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -30,8 +30,11 @@ + + + @livewireStyles diff --git a/resources/views/layouts/breadcrump.blade.php b/resources/views/layouts/breadcrump.blade.php index e69de29..dc16263 100644 --- a/resources/views/layouts/breadcrump.blade.php +++ b/resources/views/layouts/breadcrump.blade.php @@ -0,0 +1,16 @@ +
+ +
\ No newline at end of file diff --git a/resources/views/layouts/topnavbar.blade.php b/resources/views/layouts/topnavbar.blade.php index b704128..a9e364f 100644 --- a/resources/views/layouts/topnavbar.blade.php +++ b/resources/views/layouts/topnavbar.blade.php @@ -23,6 +23,7 @@ + @include('layouts.breadcrump')
    @@ -48,7 +49,7 @@