From f6331d5f13fd92f9327d9ad552342eed9085afbc Mon Sep 17 00:00:00 2001
From: Zakiaass <117088186+zakiaass@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:00:11 +0700
Subject: [PATCH] Delete Middleware PreventBackHistory

---
 app/Http/Kernel.php                        |  7 ++++---
 app/Http/Middleware/CheckRole.php          | 13 ++++---------
 app/Http/Middleware/PreventBackHistory.php | 10 +++++-----
 resources/views/dashboard/index.blade.php  |  2 --
 routes/web.php                             | 12 +-----------
 5 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 7ff24ae..1ead9c6 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -36,7 +36,7 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\PreventBackHistory::class,
+            // \App\Http\Middleware\PreventBackHistory::class,
 
         ],
 
@@ -66,11 +66,12 @@ class Kernel extends HttpKernel
         'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'PreventBackHistory' =>\App\Http\Middleware\PreventBackHistory::class,
+        'role' => \App\Http\Middleware\CheckRole::class,
+        // 'PreventBackHistory' =>\App\Http\Middleware\PreventBackHistory::class,
     ];
 
     protected $routeMiddleware = [
         // ...
-        'role' => \App\Http\Middleware\CheckRole::class,
+        // 'role' => \App\Http\Middleware\CheckRole::class,
     ];
 }
diff --git a/app/Http/Middleware/CheckRole.php b/app/Http/Middleware/CheckRole.php
index a1dcf33..fdeb591 100644
--- a/app/Http/Middleware/CheckRole.php
+++ b/app/Http/Middleware/CheckRole.php
@@ -13,16 +13,11 @@ class CheckRole
      *
      * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
      */
-    public function handle($request, Closure $next, $role)
+    public function handle(Request $request, Closure $next, ...$roles)
     {
-        if (!$request->user() || $request->user()->role != $role) {
-            return redirect()->route('home');
-        }
+    if ($request->user() && in_array($request->user()->role, $roles)) {
         return $next($request);
-    // if (auth()->check() && auth()->user()->role === $role) {
-    //     return $next($request);
-    //     }
-
-    // return redirect('/login');
+    }
+    return redirect('dashboard');
     }
 }
diff --git a/app/Http/Middleware/PreventBackHistory.php b/app/Http/Middleware/PreventBackHistory.php
index 1aeb30b..280b826 100644
--- a/app/Http/Middleware/PreventBackHistory.php
+++ b/app/Http/Middleware/PreventBackHistory.php
@@ -13,12 +13,12 @@ class PreventBackHistory
      *
      * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
      */
-    public function handle(Request $request, Closure $next): Response
+    public function handle($request, Closure $next)
     {
-        $response = $next($request);
+        // $response = $next($request);
 
-        return $response->header('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0')
-                        ->header('Pragma', 'no-cache')
-                        ->header('Expires', '0');
+        // return $response->header('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0')
+        //                 ->header('Pragma', 'no-cache')
+        //                 ->header('Expires', '0');
     }
 }
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index bed6847..efa1268 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -130,7 +130,6 @@
                                                         <th>Kriteria</th>
                                                         <th>Sub Kriteria</th>
                                                         <th>Deskripsi</th>
-                                                        <th>Prioritas</th>
                                                     </tr>
                                                 </thead>
                                                 <tbody>
@@ -140,7 +139,6 @@
                                                             <td>{{ $subcriteria->criteria->nama }}</td>
                                                             <td>{{ $subcriteria->nama }}</td>
                                                             <td>{{ $subcriteria->deskripsi }}</td>
-                                                            <td>{{ $subcriteria->prioritas }}</td>
                                                         </tr>
                                                     @empty
                                                         <tr>
diff --git a/routes/web.php b/routes/web.php
index 478c79d..8f1bf11 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -73,17 +73,7 @@
 Route::get('/reset-password/{token}', [AuthController::class, 'showResetForm'])->name('password.reset');
 Route::post('/reset-password', [AuthController::class, 'resetPassword'])->name('password.update');
 
-// Route::middleware(['auth', 'role:wakil_kepala'])->group(function () {
-//     Route::get('/wakil_kepala/dashboard', [WakilKepalaController::class, 'dashboard'])->name('wakil_kepala.dashboard');
-//     Route::get('/wakil_kepala/kriteria', [WakilKepalaController::class, 'kriteria'])->name('wakil_kepala.kriteria');
-//     Route::get('/wakil_kepala/subkriteria', [WakilKepalaController::class, 'subkriteria'])->name('wakil_kepala.subkriteria');
-// });
-
-// Route::middleware(['auth', 'role:siswa'])->group(function () {
-//     Route::get('/siswa/dashboard', [SiswaController::class, 'dashboard'])->name('siswa.dashboard');
-// });
-
-Route::middleware(['auth','web','PreventBackHistory'])->group(function () {
+Route::middleware(['auth','web'])->group(function () {
 // Route::get('/dashboard', function () {
 //     return view('dashboard.index');
 // })->name('dashboard.index');