From a30879a33784f07b5a75fca5540bb8271dad235f Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 10 Aug 2023 21:26:56 +0700 Subject: [PATCH] update release for sit --- .../2014_10_12_000000_create_users_table.php | 2 + Database/Seeders/PermissionGroupSeeder.php | 7 ++- Database/Seeders/PermissionsSeeder.php | 38 +++++++++-- Database/Seeders/RolesSeeder.php | 6 +- Database/Seeders/UsersSeeder.php | 63 ++++++++++++++----- Http/Requests/LoginRequest.php | 2 +- .../views/auth/login-usermanager.blade.php | 29 +-------- Routes/auth.php | 10 +-- 8 files changed, 99 insertions(+), 58 deletions(-) diff --git a/Database/Migrations/2014_10_12_000000_create_users_table.php b/Database/Migrations/2014_10_12_000000_create_users_table.php index 115bd9b..9274987 100644 --- a/Database/Migrations/2014_10_12_000000_create_users_table.php +++ b/Database/Migrations/2014_10_12_000000_create_users_table.php @@ -18,6 +18,8 @@ $table->string('email')->unique(); $table->timestamp('email_verified_at')->nullable(); $table->string('password'); + $table->foreignId('directorat_id')->nullable(); + $table->foreignId('sub_directorat_id')->nullable(); $table->rememberToken(); $table->timestamps(); $table->softDeletes(); diff --git a/Database/Seeders/PermissionGroupSeeder.php b/Database/Seeders/PermissionGroupSeeder.php index 9c720d7..cf8f1a0 100644 --- a/Database/Seeders/PermissionGroupSeeder.php +++ b/Database/Seeders/PermissionGroupSeeder.php @@ -28,7 +28,12 @@ return [ ['name' => 'User'], ['name' => 'Role'], - ['name' => 'Permission'] + ['name' => 'Permission'], + ['name' => 'system'], + ['name' => 'master'], + ['name' => 'document'], + ['name' => 'setting'], + ['name' => 'Logs'] ]; } } diff --git a/Database/Seeders/PermissionsSeeder.php b/Database/Seeders/PermissionsSeeder.php index 770944c..08c3796 100644 --- a/Database/Seeders/PermissionsSeeder.php +++ b/Database/Seeders/PermissionsSeeder.php @@ -17,7 +17,7 @@ { //app()[\Spatie\Permission\PermissionRegistrar::class]->forgetCachedPermissions(); - $data = $this->data(); + /*$data = $this->data(); foreach ($data as $value) { $permission = Permission::updateOrCreate([ @@ -27,7 +27,7 @@ 'permission_group_id' => $value['group'] ]); - $roles = Role::all(); + $roles = Role::all(); foreach ($roles as $role) { if ($role->name == 'administrator') { $role->givePermissionTo($permission); @@ -37,15 +37,43 @@ } } } + }*/ + $roles = Role::all(); + foreach ($roles as $role) { + $data = $this->data($role->name); + foreach ($data as $value) { + $permission = Permission::updateOrCreate([ + 'name' => $value['name'], + 'guard_name' => 'web' // or 'api + ], [ + 'permission_group_id' => $value['group'] + ]); + if($role->name=='ao' && explode('.',$value['name'])[0]=='document'){ + if($permission->name=='document.read'){ + $role->givePermissionTo($permission); + } + } else{ + $role->givePermissionTo($permission); + } + + } } } - public function data() + public function data($role) { $data = []; // list of model permission - $model = ['user', 'role', 'permission']; + if($role == 'administrator'){ + $model = ['user', 'role', 'permission','system','master','document','setting','Logs']; + } elseif($role == 'ad'){ + $model = ['system','document','setting','Logs']; + } elseif($role == 'dd'){ + $model = ['system','master','document','setting']; + } elseif($role == 'eo'){ + $model = ['document']; + } $i = 1; foreach ($model as $value) { @@ -62,7 +90,7 @@ { $actions = []; // list of permission actions - $crud = ['create', 'read', 'update', 'delete']; + $crud = ['create', 'read', 'update', 'delete','authorize','report']; foreach ($crud as $value) { $actions[] = $name . '.' . $value; diff --git a/Database/Seeders/RolesSeeder.php b/Database/Seeders/RolesSeeder.php index a53ef8d..599bf63 100644 --- a/Database/Seeders/RolesSeeder.php +++ b/Database/Seeders/RolesSeeder.php @@ -27,7 +27,11 @@ { return [ ['name' => 'administrator'], - ['name' => 'user'], + ['name' => 'ad'], + ['name' => 'dd'], + ['name' => 'eo'], + ['name' => 'siskon'], + ['name' => 'siskon_otorisator'] ]; } } diff --git a/Database/Seeders/UsersSeeder.php b/Database/Seeders/UsersSeeder.php index d25b7fb..4ef311a 100644 --- a/Database/Seeders/UsersSeeder.php +++ b/Database/Seeders/UsersSeeder.php @@ -20,21 +20,56 @@ $roleAdmin = Role::find(1); $roleUser = Role::find(2); - $user = User::create([ - 'name' => $faker->name, - 'email' => 'demo@demo.com', - 'password' => Hash::make('demo'), - 'email_verified_at' => now(), - ]); + $roles = Role::all(); - $admin = User::create([ - 'name' => $faker->name, - 'email' => 'admin@demo.com', - 'password' => Hash::make('demo'), - 'email_verified_at' => now(), - ]); + foreach ($roles as $role) { + if ($role->name == 'administrator') { + $admin = User::create( + [//ad dd ao + 'name' => $faker->name, + 'email' => 'admin@demo.com', + 'password' => Hash::make('demo'), + 'email_verified_at' => now(), + ] + ); + $admin->assignRole($roleAdmin); + } - $admin->assignRole($roleAdmin,); - $user->assignRole($roleUser); + if ($role->name == 'ad') { + $admin = User::create( + [//ad dd ao + 'name' => "Associate Director", + 'email' => '230700', + 'password' => Hash::make('bagbag'), + 'email_verified_at' => now(), + ] + ); + $admin->assignRole($roleAdmin); + } + + if ($role->name == 'dd') { + $admin = User::create( + [//ad dd ao + 'name' => "Deputy Director", + 'email' => '230701', + 'password' => Hash::make('bagbag'), + 'email_verified_at' => now(), + ] + ); + $admin->assignRole($roleAdmin); + } + + if ($role->name == 'eo') { + $admin = User::create( + [//ad dd ao + 'name' => "Executive Officer", + 'email' => '230702', + 'password' => Hash::make('bagbag'), + 'email_verified_at' => now(), + ] + ); + $admin->assignRole($roleAdmin); + } + } } } diff --git a/Http/Requests/LoginRequest.php b/Http/Requests/LoginRequest.php index cced06e..f3d206b 100644 --- a/Http/Requests/LoginRequest.php +++ b/Http/Requests/LoginRequest.php @@ -29,7 +29,7 @@ public function rules() { return [ - 'email' => ['required', 'string', 'email'], + 'email' => ['required', 'string'], 'password' => ['required', 'string'], ]; } diff --git a/Resources/views/auth/login-usermanager.blade.php b/Resources/views/auth/login-usermanager.blade.php index 056901e..229f489 100644 --- a/Resources/views/auth/login-usermanager.blade.php +++ b/Resources/views/auth/login-usermanager.blade.php @@ -5,17 +5,14 @@ @csrf
+ Logo +

Sign In

- -
- Your Social Campaigns -
-
@@ -34,18 +31,6 @@ - -
-
- - - - Forgot Password ? - - -
- -
- - -
- Not a Member yet? - - - Sign up - -
- diff --git a/Routes/auth.php b/Routes/auth.php index eb35bf9..f83645c 100644 --- a/Routes/auth.php +++ b/Routes/auth.php @@ -19,15 +19,7 @@ Route::get('login', [AuthenticatedSessionController::class, 'create']) ->name('login'); - if (isset($_ENV['METHOD_AUTH'])) { - if ($_ENV['METHOD_AUTH'] == 'usermanager') { - Route::post('login', [AuthenticatedSessionController::class, 'storeUserManager']); - }else { - Route::post('login', [AuthenticatedSessionController::class, 'store']); - } - } else { - Route::post('login', [AuthenticatedSessionController::class, 'store']); - } + Route::post('login', [AuthenticatedSessionController::class, 'store']); Route::get('forgot-password', [PasswordResetLinkController::class, 'create'])