From 78fc7906de9e48fbe3a2a5d7f360bcaaaa10665b Mon Sep 17 00:00:00 2001 From: Afila Date: Sun, 25 Jun 2023 22:35:26 +0700 Subject: [PATCH 01/12] permision --- app/Enums/Modul.php | 20 +----- .../Controllers/Api/PermisionController.php | 64 +++++++++++++++++++ app/Http/Controllers/Api/TeamController.php | 2 +- app/Models/Permision.php | 11 ++++ app/Models/Team.php | 9 ++- .../2023_06_13_073258_create_role.php | 20 +++++- .../2023_06_21_190927_permision.php | 60 +++++++++++++++++ 7 files changed, 163 insertions(+), 23 deletions(-) create mode 100644 app/Http/Controllers/Api/PermisionController.php create mode 100644 app/Models/Permision.php create mode 100644 database/migrations/2023_06_21_190927_permision.php diff --git a/app/Enums/Modul.php b/app/Enums/Modul.php index 8a1c5ba6..c9470d83 100644 --- a/app/Enums/Modul.php +++ b/app/Enums/Modul.php @@ -13,24 +13,8 @@ */ final class Modul extends Enum { - const Data = [ - 'wilayah', - 'kependudukan', - 'penduduk', - 'dokumen', - 'bantuan', - 'statistik', - 'statistik-penduduk', - 'statistik-keluarga', - 'statistik-rtm', - 'statistik-bantuan', - 'master-data', - 'master-data-bantuan', - 'master-data-artikel', - 'master-data-pengaturan', - 'pengaturan', - 'pengaturan-identitas', - 'pengaturan-users', + const permision = [ + 'read', 'write', 'edit', 'delete' ]; const Menu = [ diff --git a/app/Http/Controllers/Api/PermisionController.php b/app/Http/Controllers/Api/PermisionController.php new file mode 100644 index 00000000..61635c5a --- /dev/null +++ b/app/Http/Controllers/Api/PermisionController.php @@ -0,0 +1,64 @@ +fractal($this->team->listTeam()->where('id', $id)->first(), function ($team) { + return $this->fractal($this->team->listTeam()->with(['role', 'role.permissions'])->where('id', $id)->first(), function ($team) { return $team->toArray(); }, 'team')->respond(); } diff --git a/app/Models/Permision.php b/app/Models/Permision.php new file mode 100644 index 00000000..3bec247a --- /dev/null +++ b/app/Models/Permision.php @@ -0,0 +1,11 @@ + 'json', ]; + + public function role(): HasMany + { + return $this->hasMany(Role::class, 'team_id', 'id'); + } } diff --git a/database/migrations/2023_06_13_073258_create_role.php b/database/migrations/2023_06_13_073258_create_role.php index 51c9e81d..2677e8be 100644 --- a/database/migrations/2023_06_13_073258_create_role.php +++ b/database/migrations/2023_06_13_073258_create_role.php @@ -30,15 +30,29 @@ public function up() 'id_team' => $team->id, ]); - foreach (Modul::Data as $value) { - $role = Role::create( + foreach (Modul::Menu as $main_menu) { + // buat role + $role= Role::create( [ - 'name' => $value, + 'name' => $main_menu['role'], 'team_id' => $team->id, 'guard_name' => 'web', ] ); $user->assignRole($role->id); + + if (isset($main_menu['submenu'])) { + foreach ($main_menu['submenu'] as $sub_menu) { + $role = Role::create( + [ + 'name' => $sub_menu['role'], + 'team_id' => $team->id, + 'guard_name' => 'web', + ] + ); + $user->assignRole($role->id); + } + } } } diff --git a/database/migrations/2023_06_21_190927_permision.php b/database/migrations/2023_06_21_190927_permision.php new file mode 100644 index 00000000..09ec4fab --- /dev/null +++ b/database/migrations/2023_06_21_190927_permision.php @@ -0,0 +1,60 @@ +get(); + + foreach (Modul::permision as $permision) { + $name_permision = $main_menu['role'] . '-' . $permision; + $permision = Permission::create(['name' => $name_permision]); + foreach ($roles as $role) { + $role->givePermissionTo($name_permision); + } + } + + if (isset($main_menu['submenu'])) { + foreach ($main_menu['submenu'] as $sub_menu) { + $roles = Role::where('name', $sub_menu['role'])->get(); + foreach (Modul::permision as $permision) { + $name_permision = $sub_menu['role'] . '-' . $permision; + Permission::create(['name' => $name_permision]); + foreach ($roles as $role) { + $role->givePermissionTo($name_permision); + } + } + } + } + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +}; From fd07b8cb0c347281dc82114c2c711e684a82f4fe Mon Sep 17 00:00:00 2001 From: apidong Date: Sun, 25 Jun 2023 15:38:02 +0000 Subject: [PATCH 02/12] Fix styling --- app/Enums/Modul.php | 2 +- app/Http/Controllers/Api/IdentitasController.php | 1 - app/Http/Controllers/Api/PermisionController.php | 11 ++++++----- app/Http/Controllers/Api/TeamController.php | 1 - app/Http/Controllers/UserController.php | 3 +-- app/Models/Agama.php | 2 -- app/Models/Hamil.php | 2 -- app/Models/Kategori.php | 1 - app/Models/KelasSosial.php | 1 - app/Models/Ktp.php | 1 - app/Models/Pekerjaan.php | 2 -- app/Models/Pendidikan.php | 2 -- app/Models/PendudukAsuransi.php | 2 -- app/Models/SettingAplikasi.php | 1 - app/Models/Sex.php | 2 -- app/Models/Team.php | 2 +- app/Models/Umur.php | 1 - app/Models/Wilayah.php | 1 - app/Providers/EventServiceProvider.php | 1 - .../migrations/2023_06_13_073258_create_role.php | 2 +- database/migrations/2023_06_21_190927_permision.php | 12 ++++-------- 21 files changed, 14 insertions(+), 39 deletions(-) diff --git a/app/Enums/Modul.php b/app/Enums/Modul.php index c9470d83..bef64baa 100644 --- a/app/Enums/Modul.php +++ b/app/Enums/Modul.php @@ -14,7 +14,7 @@ final class Modul extends Enum { const permision = [ - 'read', 'write', 'edit', 'delete' + 'read', 'write', 'edit', 'delete', ]; const Menu = [ diff --git a/app/Http/Controllers/Api/IdentitasController.php b/app/Http/Controllers/Api/IdentitasController.php index a559baba..3b454399 100644 --- a/app/Http/Controllers/Api/IdentitasController.php +++ b/app/Http/Controllers/Api/IdentitasController.php @@ -7,7 +7,6 @@ use App\Http\Requests\UploadImageRequest; use App\Http\Transformers\IdentitasTransformer; use App\Models\Identitas; -use Illuminate\Support\Facades\Storage; use Intervention\Image\Facades\Image; use Symfony\Component\HttpFoundation\Response; diff --git a/app/Http/Controllers/Api/PermisionController.php b/app/Http/Controllers/Api/PermisionController.php index 61635c5a..f32e92b5 100644 --- a/app/Http/Controllers/Api/PermisionController.php +++ b/app/Http/Controllers/Api/PermisionController.php @@ -20,7 +20,6 @@ public function index() /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function store(Request $request) @@ -31,7 +30,8 @@ public function store(Request $request) /** * Display the specified resource. * - * @param int $id + * @param int $id + * * @return \Illuminate\Http\Response */ public function show($id) @@ -42,8 +42,8 @@ public function show($id) /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param int $id + * * @return \Illuminate\Http\Response */ public function update(Request $request, $id) @@ -54,7 +54,8 @@ public function update(Request $request, $id) /** * Remove the specified resource from storage. * - * @param int $id + * @param int $id + * * @return \Illuminate\Http\Response */ public function destroy($id) diff --git a/app/Http/Controllers/Api/TeamController.php b/app/Http/Controllers/Api/TeamController.php index 3ed3cf04..c0821cf0 100644 --- a/app/Http/Controllers/Api/TeamController.php +++ b/app/Http/Controllers/Api/TeamController.php @@ -73,7 +73,6 @@ public function store(Request $request) if (isset($main_menu['submenu'])) { foreach ($main_menu['submenu'] as $sub_menu) { - Role::create( [ 'name' => $sub_menu['role'], diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 58b0b81a..1531d846 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -87,7 +87,7 @@ public function store(UserRequest $request) 'company' => $data['company'], 'phone' => $data['phone'], 'password' => $data['password'], - 'active' => 1 + 'active' => 1, ]); // joinkan user ke group @@ -185,7 +185,6 @@ public function update(UserRequest $request, User $user) return redirect()->route('users.index')->with('success', 'Pengguna berhasil diubah!'); } catch (\Exception $e) { - report($e); return back()->withInput()->with('error', $e->getMessage()); diff --git a/app/Models/Agama.php b/app/Models/Agama.php index 5fffac92..969f1138 100644 --- a/app/Models/Agama.php +++ b/app/Models/Agama.php @@ -2,8 +2,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Agama extends BaseModel { /** diff --git a/app/Models/Hamil.php b/app/Models/Hamil.php index 235bbd95..f79ec51c 100644 --- a/app/Models/Hamil.php +++ b/app/Models/Hamil.php @@ -2,8 +2,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Hamil extends BaseModel { /** diff --git a/app/Models/Kategori.php b/app/Models/Kategori.php index 47ad3e66..cd0a6588 100644 --- a/app/Models/Kategori.php +++ b/app/Models/Kategori.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; class Kategori extends BaseModel { diff --git a/app/Models/KelasSosial.php b/app/Models/KelasSosial.php index 06b81422..e6d5ef8f 100644 --- a/app/Models/KelasSosial.php +++ b/app/Models/KelasSosial.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Models\Traits\ConfigIdTrait; -use Illuminate\Database\Eloquent\Model; class KelasSosial extends BaseModel { diff --git a/app/Models/Ktp.php b/app/Models/Ktp.php index 103d9961..4f641fc8 100644 --- a/app/Models/Ktp.php +++ b/app/Models/Ktp.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Models\Traits\ConfigIdTrait; -use Illuminate\Database\Eloquent\Model; class Ktp extends BaseModel { diff --git a/app/Models/Pekerjaan.php b/app/Models/Pekerjaan.php index 0e81a51d..1ebfc1fe 100644 --- a/app/Models/Pekerjaan.php +++ b/app/Models/Pekerjaan.php @@ -2,8 +2,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Pekerjaan extends BaseModel { /** diff --git a/app/Models/Pendidikan.php b/app/Models/Pendidikan.php index 311db715..e1fa7058 100644 --- a/app/Models/Pendidikan.php +++ b/app/Models/Pendidikan.php @@ -2,8 +2,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Pendidikan extends BaseModel { /** diff --git a/app/Models/PendudukAsuransi.php b/app/Models/PendudukAsuransi.php index 5f169a5d..1616e2bd 100644 --- a/app/Models/PendudukAsuransi.php +++ b/app/Models/PendudukAsuransi.php @@ -2,8 +2,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class PendudukAsuransi extends BaseModel { /** diff --git a/app/Models/SettingAplikasi.php b/app/Models/SettingAplikasi.php index 8cdb6dc0..98cb9f56 100644 --- a/app/Models/SettingAplikasi.php +++ b/app/Models/SettingAplikasi.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; class SettingAplikasi extends BaseModel { diff --git a/app/Models/Sex.php b/app/Models/Sex.php index a75a7bae..567ba7c7 100644 --- a/app/Models/Sex.php +++ b/app/Models/Sex.php @@ -2,8 +2,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Sex extends BaseModel { /** diff --git a/app/Models/Team.php b/app/Models/Team.php index c49d7e2a..27dd4204 100644 --- a/app/Models/Team.php +++ b/app/Models/Team.php @@ -2,9 +2,9 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Spatie\Permission\Models\Role; class Team extends Model diff --git a/app/Models/Umur.php b/app/Models/Umur.php index 8d08b450..70d4384c 100644 --- a/app/Models/Umur.php +++ b/app/Models/Umur.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Models\Traits\ConfigIdTrait; -use Illuminate\Database\Eloquent\Model; class Umur extends BaseModel { diff --git a/app/Models/Wilayah.php b/app/Models/Wilayah.php index f8ec7442..9807cf2e 100644 --- a/app/Models/Wilayah.php +++ b/app/Models/Wilayah.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; class Wilayah extends BaseModel { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 91ea4fa5..45ec9d36 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -5,7 +5,6 @@ use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; -use Illuminate\Support\Facades\Event; use JeroenNoten\LaravelAdminLte\Events\BuildingMenu; class EventServiceProvider extends ServiceProvider diff --git a/database/migrations/2023_06_13_073258_create_role.php b/database/migrations/2023_06_13_073258_create_role.php index 2677e8be..f4e3889b 100644 --- a/database/migrations/2023_06_13_073258_create_role.php +++ b/database/migrations/2023_06_13_073258_create_role.php @@ -32,7 +32,7 @@ public function up() foreach (Modul::Menu as $main_menu) { // buat role - $role= Role::create( + $role = Role::create( [ 'name' => $main_menu['role'], 'team_id' => $team->id, diff --git a/database/migrations/2023_06_21_190927_permision.php b/database/migrations/2023_06_21_190927_permision.php index 09ec4fab..1a5bc5b1 100644 --- a/database/migrations/2023_06_21_190927_permision.php +++ b/database/migrations/2023_06_21_190927_permision.php @@ -1,12 +1,9 @@ get(); foreach (Modul::permision as $permision) { - $name_permision = $main_menu['role'] . '-' . $permision; + $name_permision = $main_menu['role'].'-'.$permision; $permision = Permission::create(['name' => $name_permision]); foreach ($roles as $role) { $role->givePermissionTo($name_permision); @@ -37,7 +33,7 @@ public function up() foreach ($main_menu['submenu'] as $sub_menu) { $roles = Role::where('name', $sub_menu['role'])->get(); foreach (Modul::permision as $permision) { - $name_permision = $sub_menu['role'] . '-' . $permision; + $name_permision = $sub_menu['role'].'-'.$permision; Permission::create(['name' => $name_permision]); foreach ($roles as $role) { $role->givePermissionTo($name_permision); From d32df2c29b87c9b7776ac0b98c28405793594d30 Mon Sep 17 00:00:00 2001 From: sarwono Date: Mon, 3 Jul 2023 19:40:55 +0700 Subject: [PATCH 03/12] perbaiki seeder awal --- ...23_04_29_131347_create_identitas_table.php | 6 ++++ .../2023_05_04_180525_seed_identitas.php | 30 ------------------- database/seeders/DatabaseSeeder.php | 5 +--- 3 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 database/migrations/2023_05_04_180525_seed_identitas.php diff --git a/database/migrations/2023_04_29_131347_create_identitas_table.php b/database/migrations/2023_04_29_131347_create_identitas_table.php index 8d3f4e47..7826dc00 100644 --- a/database/migrations/2023_04_29_131347_create_identitas_table.php +++ b/database/migrations/2023_04_29_131347_create_identitas_table.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Schema; return new class extends Migration @@ -26,6 +27,11 @@ public function up() $table->string('sebutan_kab', 100); $table->timestamps(); }); + + Artisan::call('db:seed', [ + '--class' => 'IdentitasSeeder', + '--force' => true, + ]); } /** diff --git a/database/migrations/2023_05_04_180525_seed_identitas.php b/database/migrations/2023_05_04_180525_seed_identitas.php deleted file mode 100644 index 775cb73e..00000000 --- a/database/migrations/2023_05_04_180525_seed_identitas.php +++ /dev/null @@ -1,30 +0,0 @@ - 'IdentitasSeeder', - '--force' => true, - ]); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } -}; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index ceaa8ae2..fec85d33 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -14,9 +14,6 @@ class DatabaseSeeder extends Seeder */ public function run() { - $this->call([ - CreateAdminUserSeeder::class, - IdentitasSeeder::class, - ]); + // } } From cc9114714a3f16c023df7845b3be97c4d908a281 Mon Sep 17 00:00:00 2001 From: sarwono Date: Mon, 3 Jul 2023 22:26:52 +0700 Subject: [PATCH 04/12] penamaan sebutan pada dasbor --- app/Http/Controllers/DasborController.php | 8 +++++++- resources/views/dasbor/index.blade.php | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/DasborController.php b/app/Http/Controllers/DasborController.php index e8ebee60..022a1ea0 100644 --- a/app/Http/Controllers/DasborController.php +++ b/app/Http/Controllers/DasborController.php @@ -6,6 +6,12 @@ class DasborController extends Controller { public function index() { - return view('dasbor.index'); + $identitas = Identitas::first(); + $data['nama_aplikasi'] = $identitas->nama_aplikasi ?? config('app.namaAplikasi'); + $data['sebutanKab'] = $identitas->sebutan_kab ?? config('app.sebutanKab'); + $nama_kabupaten = preg_replace("/KAB/", "", $identitas->nama_kabupaten) ?? config('app.namaKab'); + $data['nama_kabupaten'] = strtolower($data['sebutanKab']) == 'kota' ? $nama_kabupaten : $data['sebutanKab'] . ' ' . $nama_kabupaten; + + return view('dasbor.index', compact('data')); } } diff --git a/resources/views/dasbor/index.blade.php b/resources/views/dasbor/index.blade.php index fdbeb36c..71a32d32 100644 --- a/resources/views/dasbor/index.blade.php +++ b/resources/views/dasbor/index.blade.php @@ -12,7 +12,7 @@ @section('content') Selamat datang {{ Auth::user()->username ?? '' }} di Dasbor Utama - {{ config('app.namaAplikasi') . ' ' . config('app.sebutanKab') . ' ' . config('app.namaKab') }}. + {{ ucwords(strtolower($data['nama_aplikasi'])) . ' ' . ucwords(strtolower($data['nama_kabupaten'])) }}.
From 587685d0f57c5b527e57bbf1b76e84216fb77974 Mon Sep 17 00:00:00 2001 From: sarwono Date: Tue, 4 Jul 2023 05:51:02 +0700 Subject: [PATCH 05/12] identitas --- app/Http/Controllers/DasborController.php | 9 ++++----- app/Models/Identitas.php | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/DasborController.php b/app/Http/Controllers/DasborController.php index 022a1ea0..b7d3d349 100644 --- a/app/Http/Controllers/DasborController.php +++ b/app/Http/Controllers/DasborController.php @@ -2,15 +2,14 @@ namespace App\Http\Controllers; +use App\Models\Identitas; + class DasborController extends Controller { public function index() { - $identitas = Identitas::first(); - $data['nama_aplikasi'] = $identitas->nama_aplikasi ?? config('app.namaAplikasi'); - $data['sebutanKab'] = $identitas->sebutan_kab ?? config('app.sebutanKab'); - $nama_kabupaten = preg_replace("/KAB/", "", $identitas->nama_kabupaten) ?? config('app.namaKab'); - $data['nama_kabupaten'] = strtolower($data['sebutanKab']) == 'kota' ? $nama_kabupaten : $data['sebutanKab'] . ' ' . $nama_kabupaten; + $identitas = new Identitas(); + $data = $identitas->pengaturan(); return view('dasbor.index', compact('data')); } diff --git a/app/Models/Identitas.php b/app/Models/Identitas.php index e9a95c89..59301cc8 100644 --- a/app/Models/Identitas.php +++ b/app/Models/Identitas.php @@ -8,4 +8,24 @@ class Identitas extends Model { use HasFactory; + + protected $table = "identitas"; + + protected $fillable = [ + "nama_aplikasi", "deskripsi", "favicon", + "logo", "nama_kabupaten", "kode_kabupaten", + "nama_provinsi", "kode_provinsi", "sebutan_kab" + ]; + + public static function pengaturan() + { + $identitas = self::first(); + + $data['nama_aplikasi'] = $identitas->nama_aplikasi ?? config('app.namaAplikasi'); + $data['sebutanKab'] = $identitas->sebutan_kab ?? config('app.sebutanKab'); + $nama_kabupaten = preg_replace("/KAB/", "", $identitas->nama_kabupaten) ?? config('app.namaKab'); + $data['nama_kabupaten'] = strtolower($data['sebutanKab']) == 'kota' ? $nama_kabupaten : $data['sebutanKab'] . ' ' . $nama_kabupaten; + + return $data; + } } From 8c9dfff877a6ed2336c0dd526e9202ce3da19413 Mon Sep 17 00:00:00 2001 From: sarwono <68048807+scqolbu24@users.noreply.github.com> Date: Tue, 4 Jul 2023 12:00:05 +0700 Subject: [PATCH 06/12] hilangkan url sementara (#224) --- resources/views/dasbor/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/dasbor/index.blade.php b/resources/views/dasbor/index.blade.php index fdbeb36c..daaa5a73 100644 --- a/resources/views/dasbor/index.blade.php +++ b/resources/views/dasbor/index.blade.php @@ -21,12 +21,12 @@ icon-theme="blue" /> - + - + From 00db5e1ed50e9c0577cd1ba687d30b70d399f6b8 Mon Sep 17 00:00:00 2001 From: sarwono Date: Mon, 17 Jul 2023 14:30:20 +0700 Subject: [PATCH 07/12] force https --- resources/views/components/progressive-image.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/components/progressive-image.blade.php b/resources/views/components/progressive-image.blade.php index 60e4bfaf..8f30de93 100644 --- a/resources/views/components/progressive-image.blade.php +++ b/resources/views/components/progressive-image.blade.php @@ -1,4 +1,5 @@ @push('css') + @endpush From 9b793c46ca3ff310f6784e586a88eb84bbc99588 Mon Sep 17 00:00:00 2001 From: sarwono Date: Mon, 24 Jul 2023 11:27:38 +0700 Subject: [PATCH 08/12] perbaiki penamaan aplikasi --- .env.example | 2 +- config/adminlte.php | 4 ++-- resources/views/group/index.blade.php | 4 ++-- resources/views/identitas/edit.blade.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 1c3a43d8..d31912fa 100644 --- a/.env.example +++ b/.env.example @@ -11,7 +11,7 @@ LOG_LEVEL=debug # default connection ke database utama DB_CONNECTION=mysql -# database utama aplikasi openkab +# database utama aplikasi OpenKab DB_HOST=127.0.0.1 DB_PORT=3306 DB_DATABASE=openkab diff --git a/config/adminlte.php b/config/adminlte.php index aa72b7c3..0468785b 100644 --- a/config/adminlte.php +++ b/config/adminlte.php @@ -14,7 +14,7 @@ | */ - 'title' => 'OpenKAB', + 'title' => 'OpenKab', 'title_prefix' => '', 'title_postfix' => '', @@ -68,7 +68,7 @@ 'logo_img_class' => 'brand-image elevation-3', 'logo_img_xl' => null, 'logo_img_xl_class' => 'brand-image-xs', - 'logo_img_alt' => 'OpenKAB', + 'logo_img_alt' => 'OpenKab', /* |-------------------------------------------------------------------------- diff --git a/resources/views/group/index.blade.php b/resources/views/group/index.blade.php index e411671f..3b27142e 100644 --- a/resources/views/group/index.blade.php +++ b/resources/views/group/index.blade.php @@ -1,9 +1,9 @@ @extends('layouts.index') -@section('title', 'Identitas OpenKAB') +@section('title', 'Identitas OpenKab') @section('content_header') -

Group OpenKAB

+

Group OpenKab

@stop @section('content') diff --git a/resources/views/identitas/edit.blade.php b/resources/views/identitas/edit.blade.php index 959e75bd..509e9145 100644 --- a/resources/views/identitas/edit.blade.php +++ b/resources/views/identitas/edit.blade.php @@ -22,7 +22,7 @@ Logo -
Logo OpenKAB
+
Logo OpenKab
From 3fc8848f164ae5d13cf0325dc189180d6fd299de Mon Sep 17 00:00:00 2001 From: sarwono Date: Mon, 24 Jul 2023 11:54:40 +0700 Subject: [PATCH 09/12] perbaiki menggunakan config --- resources/views/group/index.blade.php | 2 +- resources/views/identitas/edit.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/group/index.blade.php b/resources/views/group/index.blade.php index 3b27142e..d7738f5f 100644 --- a/resources/views/group/index.blade.php +++ b/resources/views/group/index.blade.php @@ -3,7 +3,7 @@ @section('title', 'Identitas OpenKab') @section('content_header') -

Group OpenKab

+

Group {{ config('app.namaAplikasi') }}

@stop @section('content') diff --git a/resources/views/identitas/edit.blade.php b/resources/views/identitas/edit.blade.php index 509e9145..816d2b50 100644 --- a/resources/views/identitas/edit.blade.php +++ b/resources/views/identitas/edit.blade.php @@ -22,7 +22,7 @@ Logo -
Logo OpenKab
+
Logo {{ config('app.namaAplikasi') }}
From c17ade8fac2d29b3a018131cf1439c2219543efc Mon Sep 17 00:00:00 2001 From: sarwono Date: Mon, 24 Jul 2023 12:00:59 +0700 Subject: [PATCH 10/12] title --- app/Http/Controllers/GroupController.php | 11 ++++++++++- resources/views/group/index.blade.php | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php index 9ba2c401..22fbc7d0 100644 --- a/app/Http/Controllers/GroupController.php +++ b/app/Http/Controllers/GroupController.php @@ -4,9 +4,18 @@ class GroupController extends Controller { + private $nama_aplikasi; + + public function __construct() + { + $this->nama_aplikasi = 'Group ' . config('app.namaAplikasi'); + } + public function index() { - return view('group.index'); + return view('group.index', [ + 'nama_aplikasi' => $this->nama_aplikasi + ]); } public function create() diff --git a/resources/views/group/index.blade.php b/resources/views/group/index.blade.php index d7738f5f..4f1a70e8 100644 --- a/resources/views/group/index.blade.php +++ b/resources/views/group/index.blade.php @@ -1,9 +1,9 @@ @extends('layouts.index') -@section('title', 'Identitas OpenKab') +@section('title', $nama_aplikasi) @section('content_header') -

Group {{ config('app.namaAplikasi') }}

+

{{ $nama_aplikasi }}

@stop @section('content') From 7d276119921e8b54c341525c7fbcb31fe67abfd3 Mon Sep 17 00:00:00 2001 From: sarwono Date: Mon, 31 Jul 2023 14:22:47 +0700 Subject: [PATCH 11/12] Rilis v2308.0.0 --- app/Helpers/general.php | 28 ++++++++++++++-------------- catatan_rilis.md | 13 +++++++++++++ 2 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 catatan_rilis.md diff --git a/app/Helpers/general.php b/app/Helpers/general.php index 31189710..c1551e1f 100644 --- a/app/Helpers/general.php +++ b/app/Helpers/general.php @@ -4,17 +4,17 @@ use App\Models\SettingAplikasi; use Illuminate\Support\Str; -if (! function_exists('openkab_versi')) { +if (!function_exists('openkab_versi')) { /** * OpenKab database gabungan versi. */ function openkab_versi() { - return 'v2307.0.0'; + return 'v2308.0.0'; } } -if (! function_exists('persen')) { +if (!function_exists('persen')) { /** * Menampilkan nilai persentase. * @@ -24,12 +24,12 @@ function persen(int $pembilang = 0, int $penyebut = 0, int $desimal = 2, string { $hasil = ($penyebut == 0) ? 0 : $pembilang / $penyebut * 100; - return number_format($hasil, $desimal, $pemisah).'%'; + return number_format($hasil, $desimal, $pemisah) . '%'; } } // setting('sebutan_desa'); -if (! function_exists('setting')) { +if (!function_exists('setting')) { function setting($config_id = null, $params = null) { if ($params && $config_id) { @@ -43,7 +43,7 @@ function setting($config_id = null, $params = null) } } -if (! function_exists('identitas')) { +if (!function_exists('identitas')) { /** * Get identitas desa. * @@ -62,7 +62,7 @@ function identitas(int $config_id = null, string $params = null) } } -if (! function_exists('bulan')) { +if (!function_exists('bulan')) { /** * Nama bulan dalam bahasa Indonesia. */ @@ -86,7 +86,7 @@ function bulan(int $bulan): string } } -if (! function_exists('url_title')) { +if (!function_exists('url_title')) { /** * Create URL Title. * @@ -117,12 +117,12 @@ function url_title($str, $separator = '-', $lowercase = false) '&.+?;' => '', '[^\w\d _-]' => '', '\s+' => $separator, - '('.$q_separator.')+' => $separator, + '(' . $q_separator . ')+' => $separator, ]; $str = strip_tags($str); foreach ($trans as $key => $val) { - $str = preg_replace('#'.$key.'#i', $val, $str); + $str = preg_replace('#' . $key . '#i', $val, $str); } if ($lowercase === true) { @@ -135,7 +135,7 @@ function url_title($str, $separator = '-', $lowercase = false) function ambilBerkas($pathBerkas, $tampil = true) { - if (! file_exists($pathBerkas)) { + if (!file_exists($pathBerkas)) { $pathBerkas = public_path('assets/img/opensid_logo.png'); } @@ -174,11 +174,11 @@ function ambilBerkas($pathBerkas, $tampil = true) } // Generate the server headers - header('Content-Type: '.$mime); - header('Content-Disposition: inline; filename="'.Str::random(10).'"'); + header('Content-Type: ' . $mime); + header('Content-Disposition: inline; filename="' . Str::random(10) . '"'); header('Expires: 0'); header('Content-Transfer-Encoding: binary'); - header('Content-Length: '.filesize($pathBerkas)); + header('Content-Length: ' . filesize($pathBerkas)); header('Cache-Control: private, no-transform, no-store, must-revalidate'); return readfile($pathBerkas); diff --git a/catatan_rilis.md b/catatan_rilis.md new file mode 100644 index 00000000..7e5505d0 --- /dev/null +++ b/catatan_rilis.md @@ -0,0 +1,13 @@ +Di rilis v2308.0.0 berisi penambahan fitur dan perbaikan lain sesuai dengan pelayanan ke pelanggan. + +#### Penambahan Fitur + +1. [#198](https://github.com/OpenSID/OpenKab/issues/198) Sediakan API untuk manajemen hak akses pengguna OpenKab. + +#### Perbaikan BUG + +1. [#206](https://github.com/OpenSID/OpenKab/issues/206) Perbaikan filter pada bantuan tidak berjalan. +2. [#219](https://github.com/OpenSID/OpenKab/issues/219) Perbaikan hilangkan url pada widget keluarga dan rtm. +3. [#218](https://github.com/OpenSID/OpenKab/issues/218) Perbaikan Sambutan selamat datang tidak sesuai dengan pengaturan. +4. [#220](https://github.com/OpenSID/OpenKab/issues/220) Perbaikan hilangkan duplikat seeder. +5. [#226](https://github.com/OpenSID/OpenKab/issues/226) Perbaikan semua penamaan OpenKAB menjadi OpenKab. From 96107907b0c87b3e2ef7a48d024a09f855c69ab0 Mon Sep 17 00:00:00 2001 From: scqolbu24 Date: Mon, 31 Jul 2023 07:25:10 +0000 Subject: [PATCH 12/12] Fix styling --- app/Helpers/general.php | 26 ++++++++++++------------ app/Http/Controllers/GroupController.php | 4 ++-- app/Models/Identitas.php | 12 +++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/Helpers/general.php b/app/Helpers/general.php index c1551e1f..aa361d18 100644 --- a/app/Helpers/general.php +++ b/app/Helpers/general.php @@ -4,7 +4,7 @@ use App\Models\SettingAplikasi; use Illuminate\Support\Str; -if (!function_exists('openkab_versi')) { +if (! function_exists('openkab_versi')) { /** * OpenKab database gabungan versi. */ @@ -14,7 +14,7 @@ function openkab_versi() } } -if (!function_exists('persen')) { +if (! function_exists('persen')) { /** * Menampilkan nilai persentase. * @@ -24,12 +24,12 @@ function persen(int $pembilang = 0, int $penyebut = 0, int $desimal = 2, string { $hasil = ($penyebut == 0) ? 0 : $pembilang / $penyebut * 100; - return number_format($hasil, $desimal, $pemisah) . '%'; + return number_format($hasil, $desimal, $pemisah).'%'; } } // setting('sebutan_desa'); -if (!function_exists('setting')) { +if (! function_exists('setting')) { function setting($config_id = null, $params = null) { if ($params && $config_id) { @@ -43,7 +43,7 @@ function setting($config_id = null, $params = null) } } -if (!function_exists('identitas')) { +if (! function_exists('identitas')) { /** * Get identitas desa. * @@ -62,7 +62,7 @@ function identitas(int $config_id = null, string $params = null) } } -if (!function_exists('bulan')) { +if (! function_exists('bulan')) { /** * Nama bulan dalam bahasa Indonesia. */ @@ -86,7 +86,7 @@ function bulan(int $bulan): string } } -if (!function_exists('url_title')) { +if (! function_exists('url_title')) { /** * Create URL Title. * @@ -117,12 +117,12 @@ function url_title($str, $separator = '-', $lowercase = false) '&.+?;' => '', '[^\w\d _-]' => '', '\s+' => $separator, - '(' . $q_separator . ')+' => $separator, + '('.$q_separator.')+' => $separator, ]; $str = strip_tags($str); foreach ($trans as $key => $val) { - $str = preg_replace('#' . $key . '#i', $val, $str); + $str = preg_replace('#'.$key.'#i', $val, $str); } if ($lowercase === true) { @@ -135,7 +135,7 @@ function url_title($str, $separator = '-', $lowercase = false) function ambilBerkas($pathBerkas, $tampil = true) { - if (!file_exists($pathBerkas)) { + if (! file_exists($pathBerkas)) { $pathBerkas = public_path('assets/img/opensid_logo.png'); } @@ -174,11 +174,11 @@ function ambilBerkas($pathBerkas, $tampil = true) } // Generate the server headers - header('Content-Type: ' . $mime); - header('Content-Disposition: inline; filename="' . Str::random(10) . '"'); + header('Content-Type: '.$mime); + header('Content-Disposition: inline; filename="'.Str::random(10).'"'); header('Expires: 0'); header('Content-Transfer-Encoding: binary'); - header('Content-Length: ' . filesize($pathBerkas)); + header('Content-Length: '.filesize($pathBerkas)); header('Cache-Control: private, no-transform, no-store, must-revalidate'); return readfile($pathBerkas); diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php index 22fbc7d0..97972a8d 100644 --- a/app/Http/Controllers/GroupController.php +++ b/app/Http/Controllers/GroupController.php @@ -8,13 +8,13 @@ class GroupController extends Controller public function __construct() { - $this->nama_aplikasi = 'Group ' . config('app.namaAplikasi'); + $this->nama_aplikasi = 'Group '.config('app.namaAplikasi'); } public function index() { return view('group.index', [ - 'nama_aplikasi' => $this->nama_aplikasi + 'nama_aplikasi' => $this->nama_aplikasi, ]); } diff --git a/app/Models/Identitas.php b/app/Models/Identitas.php index 59301cc8..c3b45edf 100644 --- a/app/Models/Identitas.php +++ b/app/Models/Identitas.php @@ -9,12 +9,12 @@ class Identitas extends Model { use HasFactory; - protected $table = "identitas"; + protected $table = 'identitas'; protected $fillable = [ - "nama_aplikasi", "deskripsi", "favicon", - "logo", "nama_kabupaten", "kode_kabupaten", - "nama_provinsi", "kode_provinsi", "sebutan_kab" + 'nama_aplikasi', 'deskripsi', 'favicon', + 'logo', 'nama_kabupaten', 'kode_kabupaten', + 'nama_provinsi', 'kode_provinsi', 'sebutan_kab', ]; public static function pengaturan() @@ -23,8 +23,8 @@ public static function pengaturan() $data['nama_aplikasi'] = $identitas->nama_aplikasi ?? config('app.namaAplikasi'); $data['sebutanKab'] = $identitas->sebutan_kab ?? config('app.sebutanKab'); - $nama_kabupaten = preg_replace("/KAB/", "", $identitas->nama_kabupaten) ?? config('app.namaKab'); - $data['nama_kabupaten'] = strtolower($data['sebutanKab']) == 'kota' ? $nama_kabupaten : $data['sebutanKab'] . ' ' . $nama_kabupaten; + $nama_kabupaten = preg_replace('/KAB/', '', $identitas->nama_kabupaten) ?? config('app.namaKab'); + $data['nama_kabupaten'] = strtolower($data['sebutanKab']) == 'kota' ? $nama_kabupaten : $data['sebutanKab'].' '.$nama_kabupaten; return $data; }