Merge pull request #185 from kangketikonlen/061124-024117

[06-11-2024 02:42] 061124-024117 - Request merge 061124-024117 to stable branch
kangketikonlen · Nov 5, 2024 · ae01d48 · ae01d48
2 parents ce65663 + 59620e3
commit ae01d48
Show file tree

Hide file tree

Showing 49 changed files with 524 additions and 400 deletions.
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
@@ -7,6 +7,7 @@
 use App\Models\System\Module;
 use App\Models\System\ModuleCustom;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
 
 class DashboardController extends Controller
@@ -70,7 +71,7 @@ public function switch_task(Request $request): RedirectResponse
 
     public function reset(): RedirectResponse
     {
-        $user = auth()->user();
+        $user = Auth::user();
         $session = array(
             'role_id' => $user?->role_id,
             'role_name' => $user?->roles?->name,

diff --git a/app/Http/Controllers/PortalController.php b/app/Http/Controllers/PortalController.php
@@ -6,6 +6,7 @@
 use App\Models\System\AppInfo;
 use App\Models\System\Institution;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
 use Illuminate\View\View;
 
@@ -25,9 +26,9 @@ public function auth(Request $request): RedirectResponse
             'password' => 'required'
         ]);
 
-        if (auth()->attempt($formFields)) {
+        if (Auth::attempt($formFields)) {
             $request->session()->regenerate();
-            $user = auth()->user();
+            $user = Auth::user();
 
             // Create session
             $session = array(
@@ -57,7 +58,7 @@ public function logout(Request $request): RedirectResponse
 
     private function invalidate_session(Request $request): void
     {
-        auth()->logout();
+        Auth::logout();
         $request->session()->invalidate();
         $request->session()->regenerateToken();
         $request->session()->flush();

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
@@ -5,6 +5,7 @@
 use App\Models\User;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\View\View;
 
 class ProfileController extends Controller
@@ -13,7 +14,7 @@ class ProfileController extends Controller
 
     public function index(): View
     {
-        $data['user'] = auth()->user();
+        $data['user'] = Auth::user();
         return view('pages.profile', $data);
     }
 
@@ -33,7 +34,7 @@ public function update(Request $request): RedirectResponse
             $formFields['picture'] = '/storage/images/profile/' . $filename;
         }
 
-        $user = User::find(auth()->user()?->id);
+        $user = User::find(Auth::user()?->id);
         $user?->update($formFields);
 
         $this->invalidate_session($request);
@@ -48,15 +49,15 @@ public function reset(): RedirectResponse
         $newPassword = "USR" . $serialCode . "P";
 
         $hashedPassword['password'] = bcrypt($newPassword);
-        $user = User::find(auth()->user()?->id);
+        $user = User::find(Auth::user()?->id);
         $user?->update($hashedPassword);
 
         return redirect($this->url)->with('alert', ['message' => 'Password has been reset, your new password is ' . $newPassword, 'status' => 'success']);
     }
 
     private function invalidate_session(Request $request): void
     {
-        auth()->logout();
+        Auth::logout();
         $request->session()->invalidate();
         $request->session()->regenerateToken();
         $request->session()->flush();

diff --git a/app/Http/Controllers/Report/ActivityLogController.php b/app/Http/Controllers/Report/ActivityLogController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Report;
+
+use Illuminate\Http\Request;
+use App\Models\System\ActivityLog;
+use App\Http\Controllers\Controller;
+use Illuminate\View\View;
+
+class ActivityLogController extends Controller
+{
+    protected string $url = "/report/activity-log";
+
+    public function index(Request $request): View
+    {
+        $activityLogs = ActivityLog::orderBy('id', 'desc');
+        $dateStart = $request->input('dateStart');
+        $dateEnd = $request->input('dateEnd');
+
+        if (!empty($dateStart)) {
+            $activityLogs->whereBetween('date', [$dateStart, $dateEnd]);
+        }
+
+        $data['query'] = $request->input('query');
+        $data['activityLog'] = $activityLogs->paginate(10)->appends($request->query());
+        return view('pages.report.activity-log.index', $data);
+    }
+}
diff --git a/app/Http/Controllers/Report/ErrorLogController.php b/app/Http/Controllers/Report/ErrorLogController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Report;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class ErrorLogController extends Controller
+{
+    public function index(Request $request)
+    {
+        return view('pages.report.error-log.index');
+    }
+}
diff --git a/app/Http/Controllers/Setting/InstitutionController.php b/app/Http/Controllers/Setting/InstitutionController.php
@@ -3,8 +3,6 @@
 namespace App\Http\Controllers\Setting;
 
 use Illuminate\View\View;
-use Intervention\Image\ImageManagerStatic as Image;
-use App\Models\System\Institution;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use App\Http\Requests\Institution\UpdateInstitutionRequest;

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -36,6 +36,7 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\ActivityLogMiddleware::class,
         ],
 
         'api' => [

diff --git a/app/Http/Middleware/ActivityLogMiddleware.php b/app/Http/Middleware/ActivityLogMiddleware.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use App\Models\System\ActivityLog;
+use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\Response;
+
+class ActivityLogMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        $auth = Auth::check();
+        $path = $request->path();
+
+        if ($auth) {
+            $logData['session_id'] = $request->session()->getId();
+            $logData['date'] = date("Y-m-d");
+            $logData['time'] = date("H:i:s");
+            $logData['ip_address'] = $request->ip();
+            $logData['method'] = $request->method();
+            $logData['referer'] = $request->headers->get('referer');
+
+            if ($path == "/") {
+                $logData['path'] = "portal";
+            } else {
+                $logData['path'] = $path;
+            }
+
+            $logData['user'] = Auth::user()?->name;
+            $logData['role'] = Auth::user()?->roles?->name;
+            $logData['description'] = $logData['user'] . " (" . $logData['ip_address'] . ") telah mendarat di halaman " . $logData['path'];
+
+            $activityLog = ActivityLog::where('date', $logData['date'])->where('session_id', $logData['session_id'])->where('path', $logData['path'])->first();
+
+            if ($logData['path'] != "dashboard") {
+                if (empty($activityLog)) {
+                    ActivityLog::create($logData);
+                } else {
+                    $newLogData['time'] = date("H:i:s");
+
+                    $activityLog->increment('totalHit');
+                    $activityLog->update($newLogData);
+                }
+            }
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -21,7 +21,7 @@ public function handle(Request $request, Closure $next, string ...$guards): Resp
 
         foreach ($guards as $guard) {
             if (Auth::guard($guard)->check()) {
-                $user = auth()->user();
+                $user = Auth::user();
                 $url = $user?->roles?->dashboard_url;
 
                 return redirect($url);

diff --git a/app/Models/System/ActivityLog.php b/app/Models/System/ActivityLog.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Models\System;
+
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class ActivityLog extends Model
+{
+    use HasFactory;
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->created_by = Auth::check() ? session('name') : "System";
+        });
+
+        static::updating(function ($model) {
+            $model->updated_by = Auth::check() ? session('name') : null;
+        });
+    }
+}
diff --git a/app/Models/System/AppInfo.php b/app/Models/System/AppInfo.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class AppInfo extends Model
 {
@@ -14,13 +15,11 @@ protected static function boot()
         parent::boot();
 
         static::creating(function ($model) {
-            $model->createdAt = $model->freshTimestamp();
-            $model->createdBy = auth()->check() ? session('name') : "System";
+            $model->created_by = Auth::check() ? session('name') : "System";
         });
 
         static::updating(function ($model) {
-            $model->updatedAt = $model->freshTimestamp();
-            $model->updatedBy = auth()->check() ? session('name') : "System";
+            $model->updated_by = Auth::check() ? session('name') : null;
         });
     }
 }
diff --git a/app/Models/System/Institution.php b/app/Models/System/Institution.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class Institution extends Model
 {
@@ -14,13 +15,11 @@ protected static function boot()
         parent::boot();
 
         static::creating(function ($model) {
-            $model->createdAt = $model->freshTimestamp();
-            $model->createdBy = auth()->check() ? session('name') : "System";
+            $model->created_by = Auth::check() ? session('name') : "System";
         });
 
         static::updating(function ($model) {
-            $model->updatedAt = $model->freshTimestamp();
-            $model->updatedBy = auth()->check() ? session('name') : "System";
+            $model->updated_by = Auth::check() ? session('name') : null;
         });
     }
 }
diff --git a/app/Models/System/Module.php b/app/Models/System/Module.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Auth;
 
 class Module extends Model
 {
@@ -14,13 +15,11 @@ protected static function boot()
         parent::boot();
 
         static::creating(function ($model) {
-            $model->createdAt = $model->freshTimestamp();
-            $model->createdBy = auth()->check() ? session('name') : "System";
+            $model->created_by = Auth::check() ? session('name') : "System";
         });
 
         static::updating(function ($model) {
-            $model->updatedAt = $model->freshTimestamp();
-            $model->updatedBy = auth()->check() ? session('name') : "System";
+            $model->updated_by = Auth::check() ? session('name') : null;
         });
     }
 }
diff --git a/app/Models/System/ModuleCustom.php b/app/Models/System/ModuleCustom.php
@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Auth;
 
 class ModuleCustom extends Model
 {
@@ -20,13 +21,11 @@ protected static function boot()
         parent::boot();
 
         static::creating(function ($model) {
-            $model->createdAt = $model->freshTimestamp();
-            $model->createdBy = auth()->check() ? session('name') : "System";
+            $model->created_by = Auth::check() ? session('name') : "System";
         });
 
         static::updating(function ($model) {
-            $model->updatedAt = $model->freshTimestamp();
-            $model->updatedBy = auth()->check() ? session('name') : "System";
+            $model->updated_by = Auth::check() ? session('name') : null;
         });
     }
 }
diff --git a/app/Models/System/ModuleCustomUser.php b/app/Models/System/ModuleCustomUser.php
@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Auth;
 
 class ModuleCustomUser extends Model
 {
@@ -26,13 +27,11 @@ protected static function boot()
         parent::boot();
 
         static::creating(function ($model) {
-            $model->createdAt = $model->freshTimestamp();
-            $model->createdBy = auth()->check() ? session('name') : "System";
+            $model->created_by = Auth::check() ? session('name') : "System";
         });
 
         static::updating(function ($model) {
-            $model->updatedAt = $model->freshTimestamp();
-            $model->updatedBy = auth()->check() ? session('name') : "System";
+            $model->updated_by = Auth::check() ? session('name') : null;
         });
     }
 }
diff --git a/app/Models/System/Navbar.php b/app/Models/System/Navbar.php
@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Facades\Auth;
 
 class Navbar extends Model
 {
@@ -21,13 +22,11 @@ protected static function boot()
         parent::boot();
 
         static::creating(function ($model) {
-            $model->createdAt = $model->freshTimestamp();
-            $model->createdBy = auth()->check() ? session('name') : "System";
+            $model->created_by = Auth::check() ? session('name') : "System";
         });
 
         static::updating(function ($model) {
-            $model->updatedAt = $model->freshTimestamp();
-            $model->updatedBy = auth()->check() ? session('name') : "System";
+            $model->updated_by = Auth::check() ? session('name') : null;
         });
     }
 }