Rilis 2311 (#914)

Co-authored-by: Syahran Saputra <[email protected]> Co-authored-by: yogiperdana <[email protected]> Co-authored-by: sarwono <[email protected]> Co-authored-by: Afila <[email protected]> Co-authored-by: sarwono <[email protected]> Co-authored-by: Suyadi <[email protected]> Co-authored-by: apidong <[email protected]> Co-authored-by: Andi Fahruddin Akas <[email protected]> Co-authored-by: andifahruddinakas <[email protected]> Co-authored-by: vickyrolanda <[email protected]> Co-authored-by: ahmad afandi <[email protected]> Co-authored-by: Agung Sugiarto <[email protected]> Co-authored-by: agungsugiarto <[email protected]> Co-authored-by: Toto <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
OpenSID · Nov 1, 2023 · e028441 · e028441
1 parent 57665df
commit e028441
Show file tree

Hide file tree

Showing 438 changed files with 2,157 additions and 323 deletions.
diff --git a/.env.example b/.env.example
@@ -3,7 +3,7 @@ APP_ENV=production
 APP_KEY=base64:rN3vXWFRHDKFP2sMySe9f4gna7WulisoXTqn7Yo4Ye8=
 APP_DEBUG=false
 APP_LOG_LEVEL=debug
-APP_URL=http://demo.opendk.my.id/
+APP_URL=https://demodk.opendesa.id
 APP_DEMO=false
 
 DB_CONNECTION=mysql

diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,6 @@ yarn-error.log
 .phpunit.result.cache
 composer.log
 /storage/installed
-/storage/framework
 Vagrantfile.*
 Vagrantfile
 # Shell script di cPanel > Terminal untuk menyalin folder public ke public_html

diff --git a/.htaccess b/.htaccess
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
diff --git a/app/Facades/Counter.php b/app/Facades/Counter.php
diff --git a/app/Helpers/Counter.php b/app/Helpers/Counter.php
diff --git a/app/Http/Controllers/Auth/ChangeDefaultController.php b/app/Http/Controllers/Auth/ChangeDefaultController.php
@@ -58,7 +58,7 @@ public function index()
 
     public function store(ChangeRequest $request)
     {
-        auth()->user()->update(['email' => $request->email, 'password' => $request->password]);
+        auth()->user()->update(['password' => $request->password]);
         return redirect()->route('dashboard');
     }
 }
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -150,19 +150,19 @@ public function __construct()
 
     protected function kirimTrack()
     {
-        // if (config('app.demo') == true) { // jika posisi demo, matikan tracking
-        //     return;
-        // }
+        if (config('app.demo') == true) { // jika posisi demo, matikan tracking
+            return;
+        }
 
-        // if (session('track') != null && session('track') == date('Y m d')) {
-        //     return;
-        // }
+        if (cache()->get('track') != null && cache()->get('track') == date('Y m d')) {
+            return;
+        }
 
         $host_pantau = config('app.host_pantau');
         $data = [
             'url' => url('/'),
             'versi' => config('app.version'),
-            'jumlah_desa' => DataDesa::count(),
+            'jml_desa' => DataDesa::count(),
             'desa' => json_encode(DataDesa::select(['desa_id', 'nama', 'sebutan_desa', 'path', 'website'])->get()),
             'jumlahdesa_sinkronisasi' => DataDesa::count(),
             'jumlah_penduduk' => Penduduk::where('status_dasar', 1)->count(),
@@ -190,7 +190,7 @@ protected function kirimTrack()
             $response = Http::withHeaders([
                 'token' => config('app.token_pantau')
             ])->post($host_pantau . 'track/opendk?token=' . config('app.token_pantau'), $data);
-            session(['track' => date('Y m d')]);
+            cache()->put('track', date('Y m d'), 60 * 60 * 24);
             return;
         } catch (Exception $e) {
             Log::notice($e);

diff --git a/app/Http/Controllers/Counter/CounterController.php b/app/Http/Controllers/Counter/CounterController.php
diff --git a/app/Http/Controllers/Data/AdminKomplainController.php b/app/Http/Controllers/Data/AdminKomplainController.php
diff --git a/app/Http/Controllers/Data/AnggaranDesaController.php b/app/Http/Controllers/Data/AnggaranDesaController.php
diff --git a/app/Http/Controllers/Data/AnggaranRealisasiController.php b/app/Http/Controllers/Data/AnggaranRealisasiController.php
diff --git a/app/Http/Controllers/Data/DataDesaController.php b/app/Http/Controllers/Data/DataDesaController.php
diff --git a/app/Http/Controllers/Data/KeluargaController.php b/app/Http/Controllers/Data/KeluargaController.php