From 009ce7a1a090e83bab6e81487d27207f7475037d Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Tue, 10 Jun 2025 15:29:34 +0800 Subject: [PATCH 1/2] bugfix uia comment 10/06/2025 --- app/Http/Controllers/TacController.php | 1 + app/Http/Kernel.php | 4 ++ app/Http/Middleware/LogViewerPassword.php | 33 +++++++++++ app/Http/Middleware/RegisterLog.php | 30 ++++++++++ resources/views/logs/login.blade.php | 71 +++++++++++++++++++++++ routes/web.php | 35 +++++++++-- 6 files changed, 168 insertions(+), 6 deletions(-) create mode 100644 app/Http/Middleware/LogViewerPassword.php create mode 100644 app/Http/Middleware/RegisterLog.php create mode 100644 resources/views/logs/login.blade.php diff --git a/app/Http/Controllers/TacController.php b/app/Http/Controllers/TacController.php index 7bf8dbb..503d4c7 100644 --- a/app/Http/Controllers/TacController.php +++ b/app/Http/Controllers/TacController.php @@ -16,6 +16,7 @@ class TacController extends Controller $tac = tacportal::where([['icno',$request->icno],['tac_no',$request->tac]])->get()->toArray(); if($tac){ + $request->session()->put('registerlog_tac_entered', true); $DetailsCustomer = $this->getCustomerData($request->icno, true); return response(['status' => 1, 'customerinfo' => $DetailsCustomer['customerinfo'],'namadaerah' => $DetailsCustomer['daerah']['namadaerah'],'namanegeri' => $DetailsCustomer['negeri']['negeri']]); }else{ diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 30020a5..3f1d4d7 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -4,6 +4,7 @@ namespace App\Http; use Illuminate\Foundation\Http\Kernel as HttpKernel; + class Kernel extends HttpKernel { /** @@ -62,5 +63,8 @@ class Kernel extends HttpKernel 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, + 'logauth' => \App\Http\Middleware\LogViewerPassword::class, + 'registerauth' => \App\Http\Middleware\RegisterLog::class, + ]; } diff --git a/app/Http/Middleware/LogViewerPassword.php b/app/Http/Middleware/LogViewerPassword.php new file mode 100644 index 0000000..d4e59ee --- /dev/null +++ b/app/Http/Middleware/LogViewerPassword.php @@ -0,0 +1,33 @@ +session()->get('logviewer_authenticated'); + $authenticatedAt = $request->session()->get('logviewer_authenticated_at'); + + if (!$isAuthenticated) { + return redirect()->route('log-login'); + } + + if(now()->diffInMinutes($authenticatedAt) > env('LOGVIEWER_SESSION_MINUTES', 10)) { + $request->session()->forget(['logviewer_authenticated', 'logviewer_authenticated_at']); + return redirect()->route('log-login')->with('error', 'Session expired. Please log in again.'); + } + + return $next($request); + } +} diff --git a/app/Http/Middleware/RegisterLog.php b/app/Http/Middleware/RegisterLog.php new file mode 100644 index 0000000..79f86b5 --- /dev/null +++ b/app/Http/Middleware/RegisterLog.php @@ -0,0 +1,30 @@ +all(); + $isAuthenticated = $request->session()->pull('registerlog_tac_entered'); + + $sizeofData = count($isEntered); + + if($isAuthenticated == false || $sizeofData == 0) { + return redirect()->route('login'); + } + + return $next($request); + } +} diff --git a/resources/views/logs/login.blade.php b/resources/views/logs/login.blade.php new file mode 100644 index 0000000..1ec5c5d --- /dev/null +++ b/resources/views/logs/login.blade.php @@ -0,0 +1,71 @@ + + + + Log Viewer Login + + + +
+

Masukkan Kata Laluan Untuk Akses

+ + @if (session('error')) +

{{ session('error') }}

+ @endif + +
+ @csrf + + +
+
+ + diff --git a/routes/web.php b/routes/web.php index fbbedbc..a5c7011 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,8 @@ environment('local')) { + + Route::middleware(['logauth'])->get('logs', [LogViewerController::class, 'index']) + ->name('log-viewer'); + + Route::post('/log-login', function (Request $request) { + if ($request->input('password') === env('LOGVIEWER_PASSWORD', '12345')) { + $request->session()->put('logviewer_authenticated', true); + $request->session()->put('logviewer_authenticated_at', now()); + return redirect()->route('log-viewer'); + } + + return redirect()->route('log-login')->with('error', 'Katalaluan Salah!'); + }); + + Route::get('/log-login', function () { + return view('logs.login'); + })->name('log-login'); +} Route::get('/', [App\Http\Controllers\HomeController::class, 'buffer'])->name('buffer'); Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home'); -Auth::routes(['verify' => true]); +Route::middleware('registerauth')->get('/register', [App\Http\Controllers\Auth\RegisterController::class, 'showRegistrationForm'])->name('register'); +Route::post('/register', [App\Http\Controllers\Auth\RegisterController::class, 'register']); + +Auth::routes(['register'=> false,'verify' => true]); Route::group(['middleware' => 'auth'], function () { From eee356f6e4755fba1ab903f2b337c7b2ab459a4d Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Mon, 16 Jun 2025 12:32:00 +0800 Subject: [PATCH 2/2] added delete carts edited --- app/Console/Commands/DeleteCarts.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/DeleteCarts.php b/app/Console/Commands/DeleteCarts.php index c674a95..f80ffe5 100644 --- a/app/Console/Commands/DeleteCarts.php +++ b/app/Console/Commands/DeleteCarts.php @@ -40,9 +40,10 @@ class DeleteCarts extends Command public function handle() { try{ - PersonalCarts::query()->onlyTrashed()->forceDelete(); - Log::info('All carts have been deleted.'); - $this->info('All carts have been deleted.'); + + $deleted = PersonalCarts::query()->delete(); + Log::info("$deleted carts have been deleted."); + $this->info("$deleted carts have been deleted."); }catch(\Exception $e){ Log::error('Error deleting carts: ' . $e->getMessage()); $this->error('Error deleting carts: ' . $e->getMessage());