Squashed commit of the following:

commit cd2a9ef Author: Andi Fahruddin Akas <[email protected]> Date: Fri Jul 1 09:12:16 2022 +0800 Catatan rilis commit 283f203 Author: Afila <[email protected]> Date: Fri Jul 1 02:04:41 2022 +0700 update versi dan catatan rilis (#444) commit cde2904 Author: Afila <[email protected]> Date: Thu Jun 30 09:57:15 2022 +0700 perbaikan status pengunjung tidak bertambah (#443) * perbaiki counter pengunjung * Fix styling * [ci skip] Mutakhirkan catatan rilis Co-authored-by: apidong <[email protected]> Co-authored-by: Agung Sugiarto <[email protected]> commit f89a535 Merge: b79d881 23b00fc Author: Afila <[email protected]> Date: Sun Jun 26 15:34:05 2022 +0700 Merge branch 'vickyrolanda-vickyrolanda' into dev commit 23b00fc Author: Afila <[email protected]> Date: Sun Jun 26 15:33:36 2022 +0700 update catatan rilis commit 7c3a4d9 Merge: b79d881 81f30ff Author: Afila <[email protected]> Date: Sun Jun 26 15:30:14 2022 +0700 Merge branch 'vickyrolanda' of github.com:vickyrolanda/OpenDK into vickyrolanda-vickyrolanda commit b79d881 Author: Afila <[email protected]> Date: Sun Jun 26 14:34:20 2022 +0700 perbaiki lihat daftar prosedur pada web di menu unduhan - error 500 (#442) * perbaikan slug untuk prosedur * Fix styling * [ci skip] Mutakhirkan catatan rilis Co-authored-by: apidong <[email protected]> Co-authored-by: Agung Sugiarto <[email protected]> commit 8266154 Merge: d7016c0 549a44b Author: Agung Sugiarto <[email protected]> Date: Tue Jun 21 09:28:04 2022 +0700 Merge branch 'totoprayogo1916-ignore-phpcs-cache' into dev commit 549a44b Author: Agung Sugiarto <[email protected]> Date: Tue Jun 21 09:27:25 2022 +0700 [ci skip] Mutakhirkan catatan rilis commit fc16803 Merge: d7016c0 9822777 Author: Agung Sugiarto <[email protected]> Date: Tue Jun 21 09:26:02 2022 +0700 Merge branch 'ignore-phpcs-cache' of https://github.com/totoprayogo1916/OpenDK into totoprayogo1916-ignore-phpcs-cache commit d7016c0 Author: Afila <[email protected]> Date: Tue Jun 21 09:16:10 2022 +0700 error 500 setelah login (#427) * Update web.php * [ci skip] Mutakhirkan catatan rilis Co-authored-by: Agung Sugiarto <[email protected]> commit 81f30ff Author: vickyrolanda <[email protected]> Date: Tue Jun 14 13:20:36 2022 +0700 mengembalikan code dan hanya update untuk photo camat saja commit 7ce1f4f Author: vickyrolanda <[email protected]> Date: Tue Jun 14 13:17:56 2022 +0700 mengembalikan code dan hanya update untuk photo camat saja commit 842fd25 Merge: 6106098 9aee753 Author: Andi Fahruddin Akas <[email protected]> Date: Mon Jun 13 10:50:12 2022 +0800 Merge branch 'master' into dev commit 9822777 Author: Toto Prayogo <[email protected]> Date: Thu Jun 9 20:53:57 2022 +0700 ignore `.phpcs-cache` commit abdabcd Author: vickyrolanda <[email protected]> Date: Thu Jun 9 16:25:21 2022 +0700 Solusi Eror 500 Ketika Klik lihat prosedur commit f019f39 Author: vickyrolanda <[email protected]> Date: Thu Jun 9 14:48:22 2022 +0700 Penambahan Foto Camat Pada Sidebar commit 2433f02 Author: vickyrolanda <[email protected]> Date: Thu Jun 9 14:28:15 2022 +0700 Penambahan Keterangan Solusi commit a990842 Author: vickyrolanda <[email protected]> Date: Thu Jun 9 08:12:52 2022 +0700 Menambahkan Solusi penambahan widget photo camat commit 6106098 Author: Afila <[email protected]> Date: Wed Jun 1 00:11:40 2022 +0700 update v22.06.01 commit 974e029 Author: Andi Fahruddin Akas <[email protected]> Date: Tue May 31 22:43:11 2022 +0800 Default foto jika null commit 45ad233 Author: Andi Fahruddin Akas <[email protected]> Date: Tue May 31 22:28:09 2022 +0800 Sesuaikan tampilan tabel data pembangunan commit d8bde83 Author: Andi Fahruddin Akas <[email protected]> Date: Tue May 31 22:03:01 2022 +0800 Gunakan contoh impor dari OpenSID commit 2feb46d Author: Andi Fahruddin Akas <[email protected]> Date: Tue May 31 21:00:54 2022 +0800 Susulan perbaikan (#421) * Perbaiki dan hapus yang tidak digunakan * Update program_bantuan_22_12_2020_opendk.zip * Hapus yang tidak digunakan * Update 2022_04_20_115358_alter_programbantuan.php * Fix styling * Update 2022_04_20_115358_alter_programbantuan.php * Revert "Update 2022_04_20_115358_alter_programbantuan.php" This reverts commit efbfb3a. * Revert "Update 2022_04_20_115358_alter_programbantuan.php" This reverts commit d84c3ee. * Update ProgramBantuanController.php * Ganti kode_desa jadi desa_id * Update SinkronPesertaBantuan.php * Update SinkronPembangunan.php * Update PembangunanController.php Co-authored-by: andifahruddinakas <[email protected]> commit 7047c29 Author: Afila <[email protected]> Date: Tue May 31 09:54:17 2022 +0700 pr susulan : peta wilayah (#423) * Update edit.blade.php * pindahkan peta wilayah ke tab lainnnya * Update edit.blade.php Co-authored-by: Andi Fahruddin Akas <[email protected]> commit ec302f7 Author: Afila <[email protected]> Date: Tue May 31 08:22:55 2022 +0700 Susulan : sinkronsisai bantuan dan sinkronisasi program (#422) * perbaikan detail bantuan * Fix styling Co-authored-by: apidong <[email protected]> commit 0c96bea Author: Afila <[email protected]> Date: Mon May 30 14:41:55 2022 +0700 perbaiki peta tidak tampil (#419) commit b9b8a7b Author: Andi Fahruddin Akas <[email protected]> Date: Mon May 30 14:03:54 2022 +0800 #412 Perbaiki error contoh data website demo saat intalasi awal. commit 029be28 Author: Andi Fahruddin Akas <[email protected]> Date: Mon May 30 10:44:20 2022 +0800 Sesuaikan middleware API kirim data dari OpenSID commit b7f186e Author: Afila <[email protected]> Date: Mon May 30 07:43:37 2022 +0700 perbaikan api pembangunan (#418) commit a5c8ce1 Author: Andi Fahruddin Akas <[email protected]> Date: Fri May 27 08:21:38 2022 +0800 Update DataDesa.php commit 539298b Author: Afila <[email protected]> Date: Fri May 27 01:32:19 2022 +0700 #368 Sediakan impor data Bantuan dari OpenSID. Co-authored-by: Andi Fahruddin Akas <[email protected]> commit f0ea366 Author: Afila <[email protected]> Date: Thu May 26 23:54:46 2022 +0700 #416 Sinkronisasi Data Program Bantuan OpenSID ke OpenDK. Sesuaikan tampilan, perbaiki data yang tidak tampil commit d830509 Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed May 25 11:40:10 2022 +0000 docs: update .all-contributorsrc commit 6ef02ba Author: widoagus17 <[email protected]> Date: Wed May 25 18:39:36 2022 +0700 #400 Perbaiki select data penyakit tidak sesuai dengan inputan pada form ubah data modul Epidemi Penyakit. commit ac91c1a Author: Afila <[email protected]> Date: Wed May 25 18:18:45 2022 +0700 #402 Perbaiki artikel baru tidak tampil dan sesuaikan urutannya. commit a1e5dae Author: Afila <[email protected]> Date: Tue May 24 10:47:55 2022 +0700 #384 Sediakan ganti password saat selesai login jika menggunakan password masih default. commit c46570d Author: Afila <[email protected]> Date: Tue May 24 09:11:50 2022 +0700 #391 Perbaiki gagal upload foto profil user. Co-authored-by: Andi Fahruddin Akas <[email protected]> commit 251d28e Author: Afila <[email protected]> Date: Mon May 23 09:38:37 2022 +0700 #401 Perbaiki tidak bisa ubah gambar slider. commit 3adf59b Author: Afila <[email protected]> Date: Tue May 17 09:13:57 2022 +0700 #333 Sinkronisasi Data Pembangunan OpenSID ke OpenDK. Co-authored-by: Andi Fahruddin Akas <[email protected]> commit 2cc3424 Author: Andi Fahruddin Akas <[email protected]> Date: Sun May 15 13:46:11 2022 +0800 Sesuaikan sebutan desa yang tidak muncul. commit 52e63fe Author: Afila <[email protected]> Date: Sun May 15 12:38:04 2022 +0700 #302 Pengaturan peta kecamatan yang sesuai perda setempat pada data kecamatan. Co-authored-by: Andi Fahruddin Akas <[email protected]> commit c2f8c1e Author: Andi Fahruddin Akas <[email protected]> Date: Sat May 14 00:23:05 2022 +0800 Update phpcs.yml commit 1dcaff6 Author: Afila <[email protected]> Date: Thu May 12 19:36:17 2022 +0700 #72 Amankan route api penduduk dengan middleware.
OpenSID · Jul 1, 2022 · e870f93 · e870f93
1 parent 9aee753
commit e870f93
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ copy_public.sh
 public/error_log
 composer.lock
 .php-cs-fixer.cache
+.phpcs-cache
diff --git a/.phpcs-cache b/.phpcs-cache
diff --git a/app/Helpers/Counter.php b/app/Helpers/Counter.php
@@ -162,9 +162,9 @@ public function allVisitors($days = null)
     {
         $prefix = config('database.connections.' . config('database.default') . '.prefix');
         if ($days) {
-            $hits = DB::table($prefix . 'das_counter_page_visitor')->groupBy('visitor_id')->where('created_at', '>=', Carbon::now()->subDays($days))->count();
+            $hits = DB::table($prefix . 'das_counter_page_visitor')->distinct('visitor_id')->where('created_at', '>=', Carbon::now()->subDays($days))->count();
         } else {
-            $hits = DB::table($prefix . 'das_counter_page_visitor')->groupBy('visitor_id')->count();
+            $hits = DB::table($prefix . 'das_counter_page_visitor')->distinct('visitor_id')->count();
         }
 
         return number_format($hits);
@@ -200,7 +200,7 @@ private function processHit($page)
      */
     private static function hashVisitor()
     {
-        $cookie  = Cookie::get(env('COUNTER_COOKIE', 'kryptonit3-counter'));
+        $cookie  = Cookie::get(env('COUNTER_COOKIE', 'kd_session'));
         $visitor = $cookie !== false ? $cookie : $_SERVER['REMOTE_ADDR'];
         return hash("SHA256", env('APP_KEY') . $visitor);
     }

diff --git a/app/Http/Controllers/Informasi/ProsedurController.php b/app/Http/Controllers/Informasi/ProsedurController.php
@@ -85,7 +85,7 @@ public function store(ProsedurRequest $request)
                 $file_name = time() . rand(100, 999) . '_' . $original_name;
                 $path     = "storage/regulasi/";
                 $file->move($path, $file_name);
-
+                $input['slug'] = str_slug($request->input('judul_prosedur'));
                 $input['file_prosedur'] = $path . $file_name;
                 $input['mime_type'] = $file->getClientOriginalExtension();
             }
@@ -131,6 +131,7 @@ public function update(Prosedur $prosedur, ProsedurRequest $request)
                 $input['file_prosedur'] = $path . $file_name;
                 $input['mime_type'] = $file->getClientOriginalExtension();
             }
+            $input['slug'] = str_slug($request->input('judul_prosedur'));
 
             $prosedur->update($input);
         } catch (\Exception $e) {

diff --git a/app/Http/Controllers/Page/DownloadController.php b/app/Http/Controllers/Page/DownloadController.php
@@ -66,7 +66,7 @@ public function getDataProsedur()
 
     public function showProsedur($nama_prosedur)
     {
-        $prosedur   = Prosedur::where('judul_prosedur', str_replace('-', ' ', $nama_prosedur))->first();
+        $prosedur   = Prosedur::where('slug', $nama_prosedur)->first();
         $page_title = 'Detail Prosedur :' . $prosedur->judul_prosedur;
 
         return view('pages.unduhan.prosedur_show', compact('page_title', 'prosedur'));

diff --git a/app/Models/Prosedur.php b/app/Models/Prosedur.php
@@ -41,5 +41,6 @@ class Prosedur extends Model
         'judul_prosedur',
         'file_prosedur',
         'mime_type',
+        'slug'
     ];
 }
diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -1,25 +1,22 @@
-#### [v22.06.01]
+#### [v22.07.01]
 
-Di rilis v22.06.01, menyediakan Sinkronisasi Data Program Bantuan dan Pembangunan OpenSID. Rilis ini juga berisi perbaikan lain yang diminta Komunitas OpenDK.
+Di rilis v22.07.01, menyediakan Widget Sidebar Foto Camat Rilis ini juga berisi perbaikan lain yang diminta Komunitas OpenDK.
+
+Terima kasih pada totoprayogo1916 yang terus berkontribusi. Terima kasih pula pada vickyrolanda yang baru mulai berkontribusi.
 
 
 #### Penambahan Fitur
-1. [#302](https://github.com/OpenSID/OpenDK/issues/302) Pengaturan peta kecamatan yang sesuai perda setempat pada data kecamatan.
-2. [#333](https://github.com/OpenSID/OpenDK/issues/333) Sinkronisasi Data Pembangunan OpenSID ke OpenDK.
-3. [#384](https://github.com/OpenSID/OpenDK/issues/384) Sediakan ganti password saat selesai login jika menggunakan password masih default.
-4. [#368](https://github.com/OpenSID/OpenDK/issues/368) Sinkronisasi Data Program Bantuan OpenSID ke OpenDK.
-5. [#368](https://github.com/OpenSID/OpenDK/issues/368) Sediakan impor data Bantuan dari OpenSID.
 
+1. [#142](https://github.com/OpenSID/OpenDK/issues/142) Sediakan Widget Sidebar Foto Camat.
 
 #### Perbaikan BUG
-1. [#401](https://github.com/OpenSID/OpenDK/issues/401) Perbaiki tidak bisa ubah gambar slider. 
-2. [#391](https://github.com/OpenSID/OpenDK/issues/391) Perbaiki gagal upload foto profil user.
-3. [#402](https://github.com/OpenSID/OpenDK/issues/402) Perbaiki artikel baru tidak tampil dan sesuaikan urutannya.
-4. [#400](https://github.com/OpenSID/OpenDK/issues/400) Perbaiki select data penyakit tidak sesuai dengan inputan pada form ubah data modul Epidemi Penyakit.
-5. [#412](https://github.com/OpenSID/OpenDK/issues/412) Perbaiki error contoh data website demo saat intalasi awal.
+
+1. [#430](https://github.com/OpenSID/OpenDK/issues/430) Perbaiki fungsi Lihat file pada daftar prosedur di menu unduhan.
+2. [#441](https://github.com/OpenSID/OpenDK/issues/441) Perbaiki perhitungan statistik pengunjung website.
 
 
 #### TEKNIS
-1. [#72](https://github.com/OpenSID/OpenDK/issues/72) Amankan route api penduduk dengan middleware.
-2. Sesuaikan sebutan desa yang tidak muncul.
+
+1. [#427](https://github.com/OpenSID/OpenDK/pull/427) Teknis - Perbaiki error 500 setelah login.
+2. [#431](https://github.com/OpenSID/OpenDK/pull/431) Teknis - ignore .phpcs-cache.
 
diff --git a/config/app.php b/config/app.php
@@ -37,7 +37,7 @@
     |--------------------------------------------------------------------------
     */
 
-    'version' => 'v22.06.01',
+    'version' => 'v22.07.01',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/database/migrations/2022_06_22_205014_add_slug_prosedur.php b/database/migrations/2022_06_22_205014_add_slug_prosedur.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2022 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2022 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class AddSlugProsedur extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('das_prosedur', function (Blueprint $table) {
+            $table->char('slug', 50)->after('judul_prosedur')->nullable(false);
+        });
+
+        // update data slug pada das prosedur
+        DB::table('das_prosedur')->update(['slug' => DB::raw("lower(replace(judul_prosedur, ' ' , '-'))")]);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('das_prosedur', function (Blueprint $table) {
+            $table->dropColumn('slug');
+        });
+    }
+}
diff --git a/resources/views/layouts/frontends/sidebar.blade.php b/resources/views/layouts/frontends/sidebar.blade.php
@@ -1,4 +1,7 @@
 <div class="col-md-4">
+    <div class="box box-widget">
+        @include('widgets.camat')
+    </div>
     <div class="box box-widget">
         @include('widgets.komplain')
     </div>

diff --git a/resources/views/widgets/camat.blade.php b/resources/views/widgets/camat.blade.php
@@ -0,0 +1,11 @@
+
+   <div class="pad text-bold bg-white" style="text-align:center;">
+       <img src="@if(isset($profil->foto_kepala_wilayah)) {{ asset($profil->foto_kepala_wilayah) }} @else {{ asset('img/no-profile.png') }} @endif" width="200px" class="img-user" style="max-height: 256px; object-fit: contain;  width: 250px;">
+
+    </div>
+    <div class="box-header text-center  with-border bg-blue">
+        <h2 class="box-title text-bold" data-toggle="tooltip" data-placement="top" >
+          {{ $profil->nama_camat }} <br />  <span style="font-size: 14px;color: #ecf0f5;"> {{ $sebutan_kepala_wilayah }} {{ $profil->nama_kecamatan }} </span></h6>
+        </h2>
+    </div>
+<!-- /.col -->
diff --git a/routes/web.php b/routes/web.php
@@ -165,7 +165,7 @@
         // Route::get('logout', ['as' => 'logout', 'uses' => 'Auth\AuthController@logout']);
 
         Route::get('/dashboard', 'DashboardController')->name('dashboard');
-        Route::namespace('auth')->group(function () {
+        Route::namespace('Auth')->group(function () {
             Route::group(['prefix' => 'changedefault', 'middleware' => ['role:administrator-website|super-admin|admin-kecamatan|kontributor-artikel']], function () {
                 Route::get('/', 'ChangeDefaultController@index')->name('change-default');
                 Route::post('store', ['as' => 'changedefault.store', 'uses' => 'ChangeDefaultController@store']);