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 @@

- Selamat Datang, + Selamat Datang {{ auth()->user()->role }},
{{ auth()->user()->name }}

@@ -85,7 +85,7 @@
@@ -157,20 +157,6 @@
- {{--
-
-
-

Activity

-
-
-
-
-
-

Lead Target

-
-
-
-
--}}