update release for sit

This commit is contained in:
Daeng Deni Mardaeni 2023-08-10 21:26:56 +07:00
parent fb6e423c06
commit a30879a337
8 changed files with 99 additions and 58 deletions

View File

@ -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();

View File

@ -28,7 +28,12 @@
return [
['name' => 'User'],
['name' => 'Role'],
['name' => 'Permission']
['name' => 'Permission'],
['name' => 'system'],
['name' => 'master'],
['name' => 'document'],
['name' => 'setting'],
['name' => 'Logs']
];
}
}

View File

@ -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;

View File

@ -27,7 +27,11 @@
{
return [
['name' => 'administrator'],
['name' => 'user'],
['name' => 'ad'],
['name' => 'dd'],
['name' => 'eo'],
['name' => 'siskon'],
['name' => 'siskon_otorisator']
];
}
}

View File

@ -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);
}
}
}
}

View File

@ -29,7 +29,7 @@
public function rules()
{
return [
'email' => ['required', 'string', 'email'],
'email' => ['required', 'string'],
'password' => ['required', 'string'],
];
}

View File

@ -5,17 +5,14 @@
@csrf
<!--begin::Heading-->
<div class="text-center mb-11">
<img alt="Logo" src="{{ image('logos/logo_agi.png') }}" class="h-150px app-sidebar-logo-default" style="margin-bottom: 100px;" />
<!--begin::Title-->
<h1 class="text-dark fw-bolder mb-3">
Sign In
</h1>
<!--end::Title-->
<!--begin::Subtitle-->
<div class="text-gray-500 fw-semibold fs-6">
Your Social Campaigns
</div>
<!--end::Subtitle--->
</div>
<!--begin::Heading-->
@ -34,18 +31,6 @@
</div>
<!--end::Input group--->
<!--begin::Wrapper-->
<div class="d-flex flex-stack flex-wrap gap-3 fs-base fw-semibold mb-8">
<div></div>
<!--begin::Link-->
<a href="/forgot-password" class="link-primary">
Forgot Password ?
</a>
<!--end::Link-->
</div>
<!--end::Wrapper-->
<!--begin::Submit button-->
<div class="d-grid mb-10">
<button type="submit" id="kt_sign_in_submit" class="btn btn-primary">
@ -53,16 +38,6 @@
</button>
</div>
<!--end::Submit button-->
<!--begin::Sign up-->
<div class="text-gray-500 text-center fw-semibold fs-6">
Not a Member yet?
<a href="/register" class="link-primary">
Sign up
</a>
</div>
<!--end::Sign up-->
</form>
<!--end::Form-->

View File

@ -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'])