From c284d7792a8adc78d1a52d04f1f2b5aa9f688b6c Mon Sep 17 00:00:00 2001
From: Zakiaass <117088186+zakiaass@users.noreply.github.com>
Date: Wed, 13 Mar 2024 14:48:49 +0700
Subject: [PATCH] Update Authorization Sidebar

---
 app/Http/Middleware/CheckRole.php              | 10 +++++++---
 .../2014_10_12_000000_create_users_table.php   |  2 +-
 resources/views/dashboard/index.blade.php      | 18 ++----------------
 resources/views/layout/sidebar.blade.php       |  2 ++
 routes/web.php                                 |  2 +-
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/Http/Middleware/CheckRole.php b/app/Http/Middleware/CheckRole.php
index b4bfe56..a1dcf33 100644
--- a/app/Http/Middleware/CheckRole.php
+++ b/app/Http/Middleware/CheckRole.php
@@ -15,10 +15,14 @@ class CheckRole
      */
     public function handle($request, Closure $next, $role)
     {
-    if (auth()->check() && auth()->user()->role === $role) {
-        return $next($request);
+        if (!$request->user() || $request->user()->role != $role) {
+            return redirect()->route('home');
         }
+        return $next($request);
+    // if (auth()->check() && auth()->user()->role === $role) {
+    //     return $next($request);
+    //     }
 
-    return redirect('/login');
+    // return redirect('/login');
     }
 }
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index e993bd8..1046e45 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -18,7 +18,7 @@ public function up(): void
             $table->string('email')->unique();
             $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
-            $table->string('role');
+            $table->enum('role', ['admin', 'siswa']);
             $table->string('profile_picture')->nullable();
             $table->rememberToken();
             $table->timestamps();
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index 3d1b8b7..bed6847 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -15,7 +15,7 @@
                 <div class="row align-items-center">
                     <div class="col-md-8">
                         <h1 class="font-20 weight-500 mb-10 text-capitalize">
-                            Selamat Datang,
+                            Selamat Datang {{ auth()->user()->role }},
                             <div class="weight-600 font-20 text-blue">{{ auth()->user()->name }}</div>
                         </h1>
                     </div>
@@ -85,7 +85,7 @@
                                 </li>
                                 <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#subkriteria"
-                                        role="tab">Data  Sub Kriteria</a>
+                                        role="tab">Data Sub Kriteria</a>
                                 </li>
                             </ul>
                             <div class="tab-content">
@@ -157,20 +157,6 @@
                     </div>
                 </div>
             </div>
-            {{-- <div class="row">
-                <div class="col-xl-8 mb-30">
-                    <div class="card-box height-100-p pd-20">
-                        <h2 class="h4 mb-20">Activity</h2>
-                        <div id="chart5"></div>
-                    </div>
-                </div>
-                <div class="col-xl-4 mb-30">
-                    <div class="card-box height-100-p pd-20">
-                        <h2 class="h4 mb-20">Lead Target</h2>
-                        <div id="chart6"></div>
-                    </div>
-                </div>
-            </div> --}}
         </div>
         <div class="footer-wrap pd-20 mb-20 card-box">
             <strong>Sistem Pendukung Keputusan Pemilihan Ekstrakurikuler Metode SMARTER</strong>
diff --git a/resources/views/layout/sidebar.blade.php b/resources/views/layout/sidebar.blade.php
index 0f8fc0f..d247c2e 100644
--- a/resources/views/layout/sidebar.blade.php
+++ b/resources/views/layout/sidebar.blade.php
@@ -21,6 +21,7 @@
                         <li><a href="{{ route('dashboard.index') }}">Dashboard</a></li>
                     </ul>
                 </li>
+                @if (auth()->user()->role=='admin')
                 <li class="dropdown">
                     <a class="dropdown-toggle">
                         <span class="micon bi bi-textarea-resize"></span><span class="mtext">Data Master</span>
@@ -32,6 +33,7 @@
                         <li><a href="{{ route('user.index') }}">Data User</a></li>
                     </ul>
                 </li>
+                @endif
                 <li class="dropdown">
                     <a href="javascript:;" class="dropdown-toggle">
                         <span class="micon bi bi-table"></span><span class="mtext">Penilaian</span>
diff --git a/routes/web.php b/routes/web.php
index 5461a74..478c79d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -115,7 +115,7 @@
 Route::post('/kriteria/calculate', [PerhitunganController::class, 'calculateBobotKriteria'])->name('kriteria.calculate');
 Route::post('/subkriteria/calculate', [PerhitunganController::class, 'calculateBobotSubKriteria'])->name('subkriteria.calculate');
 Route::get('input-nilai', [PerhitunganController::class, 'penilaian'])->name(('penilaian.input-nilai'));
-Route::post('/perhitungan/transformasiNilai', [PerhitunganController::class, 'transformasiNilai'])->name(('perhitungan.transformasiNilai'));
+Route::post('perhitungan/transformasi-nilai', [PerhitunganController::class, 'transformasiNilai'])->name('perhitungan.transformasiNilai');
 
 // Route::resource('input-nilai', PenilaianController::class);