From 72ae10ab0755310208d66c7b966e1bbecffe34dc Mon Sep 17 00:00:00 2001
From: Ananda Zakia S <117088186+zakiaass@users.noreply.github.com>
Date: Tue, 26 Dec 2023 15:52:48 +0700
Subject: [PATCH] Update Database

---
 app/Http/Controllers/AuthController.php       |   2 +-
 .../Controllers/CalculationController.php     |  64 +++
 app/Http/Controllers/CriteriaController.php   |  64 +++
 .../Controllers/ExtracurricularController.php |  64 +++
 .../Controllers/SubCriteriaController.php     |  64 +++
 app/Models/Criteria.php                       |  20 +
 app/Models/Extracuricullar.php                |  19 +
 app/Models/ExtracuricullarSubKriteria.php     |  27 ++
 app/Models/SubCriteria.php                    |  20 +
 ...23_12_26_053623_create_criterias_table.php |  30 ++
 ...2_26_053648_create_sub_criterias_table.php |  33 ++
 ...6_053717_create_extracuricullars_table.php |  28 ++
 ...te_extracuricullar_sub_kriterias_table.php |  35 ++
 public/css/style.css                          |   6 +-
 resources/views/ekstrakurikuler.blade.php     | 373 +++++++++---------
 resources/views/home.blade.php                |  10 +-
 resources/views/siswa/dashboard.blade.php     |   2 +-
 routes/web.php                                |  42 +-
 18 files changed, 689 insertions(+), 214 deletions(-)
 create mode 100644 app/Http/Controllers/CalculationController.php
 create mode 100644 app/Http/Controllers/CriteriaController.php
 create mode 100644 app/Http/Controllers/ExtracurricularController.php
 create mode 100644 app/Http/Controllers/SubCriteriaController.php
 create mode 100644 app/Models/Criteria.php
 create mode 100644 app/Models/Extracuricullar.php
 create mode 100644 app/Models/ExtracuricullarSubKriteria.php
 create mode 100644 app/Models/SubCriteria.php
 create mode 100644 database/migrations/2023_12_26_053623_create_criterias_table.php
 create mode 100644 database/migrations/2023_12_26_053648_create_sub_criterias_table.php
 create mode 100644 database/migrations/2023_12_26_053717_create_extracuricullars_table.php
 create mode 100644 database/migrations/2023_12_26_060234_create_extracuricullar_sub_kriterias_table.php

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index aa64c8f..dc6e1ec 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -172,6 +172,6 @@ public function logout(Request $request)
         // Logout pengguna
         Auth::guard($guard)->logout();
 
-        return redirect('/login')->with('success', 'Terimakasih sudah logout! Silakan login kembali.');
+        return redirect('/home')->with('success', 'Terimakasih sudah logout! Silakan login kembali.');
     }
 }
diff --git a/app/Http/Controllers/CalculationController.php b/app/Http/Controllers/CalculationController.php
new file mode 100644
index 0000000..fc34b4b
--- /dev/null
+++ b/app/Http/Controllers/CalculationController.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class CalculationController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(string $id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit(string $id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, string $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(string $id)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/CriteriaController.php b/app/Http/Controllers/CriteriaController.php
new file mode 100644
index 0000000..a7a5d52
--- /dev/null
+++ b/app/Http/Controllers/CriteriaController.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class CriteriaController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(string $id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit(string $id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, string $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(string $id)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/ExtracurricularController.php b/app/Http/Controllers/ExtracurricularController.php
new file mode 100644
index 0000000..04c0649
--- /dev/null
+++ b/app/Http/Controllers/ExtracurricularController.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class ExtracurricularController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(string $id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit(string $id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, string $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(string $id)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/SubCriteriaController.php b/app/Http/Controllers/SubCriteriaController.php
new file mode 100644
index 0000000..6bf5cec
--- /dev/null
+++ b/app/Http/Controllers/SubCriteriaController.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class SubCriteriaController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(string $id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit(string $id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, string $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(string $id)
+    {
+        //
+    }
+}
diff --git a/app/Models/Criteria.php b/app/Models/Criteria.php
new file mode 100644
index 0000000..13d5a0e
--- /dev/null
+++ b/app/Models/Criteria.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Criteria extends Model
+{
+    protected $fillable = ['nama' , 'prioritas' .'bobot'];
+
+    public function SubCriteria() {
+        return $this->hasMany(SubCriteria::class);
+    }
+
+    public function ExtracuricullarSubCriteria() {
+        return $this->hasMany(ExtracuricullarSubKriteria::class);
+    }
+
+}
diff --git a/app/Models/Extracuricullar.php b/app/Models/Extracuricullar.php
new file mode 100644
index 0000000..f6240dd
--- /dev/null
+++ b/app/Models/Extracuricullar.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Extracuricullar extends Model
+{
+    protected $fillable = ['nama','kategori'];
+
+    protected $rules = [
+        'kategori' => 'in:olahraga, seni',
+    ];
+
+    public function ExtracuricullarSubCriteria() {
+        return $this->hasMany(ExtracuricullarSubKriteria::class);
+    }
+}
diff --git a/app/Models/ExtracuricullarSubKriteria.php b/app/Models/ExtracuricullarSubKriteria.php
new file mode 100644
index 0000000..4edffe2
--- /dev/null
+++ b/app/Models/ExtracuricullarSubKriteria.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class ExtracuricullarSubKriteria extends Model
+{
+    protected $fillable = ['extracuricullar_id','criteria_id','sub_criteria_id'];
+
+    public function Extracuricullar()
+    {
+        return $this->belongsTo(Extracuricullar::class);
+    }
+
+    public function Criteria()
+    {
+        return $this->belongsTo(Criteria::class);
+    }
+
+    public function SubCriteria()
+    {
+        return $this->belongsTo(SubCriteria::class);
+    }
+}
+
diff --git a/app/Models/SubCriteria.php b/app/Models/SubCriteria.php
new file mode 100644
index 0000000..f2c26cb
--- /dev/null
+++ b/app/Models/SubCriteria.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class SubCriteria extends Model
+{
+    protected $fillable = ['criteria_id', 'nama', 'prioritas', 'bobot'];
+
+    public function Criteria()
+    {
+        return $this->belongsTo(Criteria::class);
+    }
+
+    public function ExtracuricullarSubCriteria() {
+        return $this->hasMany(ExtracuricullarSubKriteria::class);
+    }
+}
diff --git a/database/migrations/2023_12_26_053623_create_criterias_table.php b/database/migrations/2023_12_26_053623_create_criterias_table.php
new file mode 100644
index 0000000..5e71c4a
--- /dev/null
+++ b/database/migrations/2023_12_26_053623_create_criterias_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('criterias', function (Blueprint $table) {
+            $table->id();
+            $table->string('nama');
+            $table->integer('prioritas');
+            $table->string('bobot');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('criterias');
+    }
+};
diff --git a/database/migrations/2023_12_26_053648_create_sub_criterias_table.php b/database/migrations/2023_12_26_053648_create_sub_criterias_table.php
new file mode 100644
index 0000000..32cebc2
--- /dev/null
+++ b/database/migrations/2023_12_26_053648_create_sub_criterias_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('sub_criterias', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('criteria_id');
+            $table->string('nama');
+            $table->string('prioritas');
+            $table->string('bobot');
+            $table->timestamps();
+
+            $table->foreign('criteria_id')->references('id')->on('criterias');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('sub_criterias');
+    }
+};
diff --git a/database/migrations/2023_12_26_053717_create_extracuricullars_table.php b/database/migrations/2023_12_26_053717_create_extracuricullars_table.php
new file mode 100644
index 0000000..40e3d75
--- /dev/null
+++ b/database/migrations/2023_12_26_053717_create_extracuricullars_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('extracuricullars', function (Blueprint $table) {
+            $table->id();
+            $table->string('nama');
+            $table->string('kategori');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('extracuricullars');
+    }
+};
diff --git a/database/migrations/2023_12_26_060234_create_extracuricullar_sub_kriterias_table.php b/database/migrations/2023_12_26_060234_create_extracuricullar_sub_kriterias_table.php
new file mode 100644
index 0000000..4b28108
--- /dev/null
+++ b/database/migrations/2023_12_26_060234_create_extracuricullar_sub_kriterias_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+{
+    Schema::create('extracuricullar_sub_kriterias', function (Blueprint $table) {
+        $table->id();
+        $table->unsignedBigInteger('extracuricullar_id');
+        $table->unsignedBigInteger('criteria_id');
+        $table->unsignedBigInteger('sub_criteria_id');
+        $table->timestamps();
+
+        $table->foreign('extracuricullar_id')->references('id')->on('extracuricullars');
+        $table->foreign('criteria_id')->references('id')->on('criterias');
+        $table->foreign('sub_criteria_id')->references('id')->on('sub_criterias');
+    });
+}
+
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('extracuricullar_sub_kriterias');
+    }
+};
diff --git a/public/css/style.css b/public/css/style.css
index 154d9f6..87a919c 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -136,9 +136,9 @@ .custom_nav-container .navbar-nav .nav-item .nav-link {
   transition: all 0.3s;
 }
 
-.custom_nav-container .navbar-nav .nav-item:hover .nav-link, .custom_nav-container .navbar-nav .nav-item.active .nav-link {
-  color: #000000;
-  background-color: #ffffff;
+.custom_nav-container .navbar-nav .nav-item .nav-link:active {
+    color: #000000;
+    background-color: #ffffff;
 }
 
 .custom_nav-container .navbar-toggler {
diff --git a/resources/views/ekstrakurikuler.blade.php b/resources/views/ekstrakurikuler.blade.php
index 27af3cd..219f3ed 100644
--- a/resources/views/ekstrakurikuler.blade.php
+++ b/resources/views/ekstrakurikuler.blade.php
@@ -2,223 +2,224 @@
 <html lang="en">
 
 <head>
-  <!-- Basic -->
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <!-- Mobile Metas -->
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-  <!-- Site Metas -->
-  <meta name="keywords" content="" />
-  <meta name="description" content="" />
-  <meta name="author" content="" />
+    <!-- Basic -->
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <!-- Mobile Metas -->
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <!-- Site Metas -->
+    <meta name="keywords" content="" />
+    <meta name="description" content="" />
+    <meta name="author" content="" />
 
-  <title>Home | SIPEX</title>
+    <title>SIPEX | {{ $title }}</title>
 
 
-  <!-- bootstrap core css -->
-  <link rel="stylesheet" type="text/css" href="{{ asset('css/bootstrap.css') }}" />
+    <!-- bootstrap core css -->
+    <link rel="stylesheet" type="text/css" href="{{ asset('css/bootstrap.css') }}" />
 
-  <!-- Swiper CSS -->
-  <link rel="stylesheet" href="https://unpkg.com/swiper/swiper-bundle.min.css" />
+    <!-- Swiper CSS -->
+    <link rel="stylesheet" href="https://unpkg.com/swiper/swiper-bundle.min.css" />
 
-  <!-- font awesome style -->
-  <link href="{{ asset('css/font-awesome.min.css') }}" rel="stylesheet" />
+    <!-- font awesome style -->
+    <link href="{{ asset('css/font-awesome.min.css') }}" rel="stylesheet" />
 
-  <!-- Custom styles for this template -->
-  <link href="{{ asset('css/style.css') }}" rel="stylesheet" />
-  <!-- responsive style -->
-  <link href="{{ asset('css/responsive.css') }}" rel="stylesheet" />
+    <!-- Custom styles for this template -->
+    <link href="{{ asset('css/style.css') }}" rel="stylesheet" />
+    <!-- responsive style -->
+    <link href="{{ asset('css/responsive.css') }}" rel="stylesheet" />
 
 </head>
 
 <body>
     <!-- header section strats -->
     <header class="header_section">
-      <div class="container-fluid">
-        <nav class="navbar navbar-expand-lg custom_nav-container ">
-          
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-            <span class=""> </span>
-          </button>
+        <div class="container-fluid">
+            <nav class="navbar navbar-expand-lg custom_nav-container ">
 
-          <div class="collapse navbar-collapse" id="navbarSupportedContent">
-            <ul class="navbar-nav">
-                <ul class="navbar-nav">
-                    <li class="nav-item active">
-                        <a class="nav-link" href="{{ route('home') }}">Home <span class="sr-only">(current)</span></a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('ekstrakurikuler') }}">Ekstrakurikuler</a>
-                    </li>
-                </ul>                
-            </ul>
-            <div class="quote_btn-container">
-                <a href="{{ route('login') }}" class="quote_btn">
-                    Login
-                </a>
-            </div>
+                <button class="navbar-toggler" type="button" data-toggle="collapse"
+                    data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
+                    aria-label="Toggle navigation">
+                    <span class=""> </span>
+                </button>
+
+                <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                    <ul class="navbar-nav">
+                        <ul class="navbar-nav">
+                            <li class="nav-item">
+                                <a class="nav-link {{ $title === 'Home' ? 'active' : '' }}"
+                                    href="/home">Home</span></a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link {{ $title === 'Ekstrakurikuler' ? 'active' : '' }}"
+                                    href="/ekstrakurikuler">Ekstrakurikuler</a>
+                            </li>
+                        </ul>
+                    </ul>
+                    <div class="quote_btn-container">
+                        <a href="{{ route('login') }}" class="quote_btn">
+                            Login
+                        </a>
+                    </div>
+                </div>
+
+            </nav>
         </div>
-
-        </nav>
-      </div>
     </header>
     <!-- end header section -->
 
-  <!-- ekstrakurikuler section -->
-  <section id="ekstrakurikuler" class="service_section layout_padding">
-    <div class="container">
-        <div class="heading_container">
-            <h2>
-                Ekstrakurikuler
-            </h2>
-            <p>
-                Kegiatan Ekstrakurikuler Siswa di MAN 3 Banyuwangi
-            </p>
-        </div>
-        <div id="ekstrakurikulerCarousel" class="carousel slide" data-ride="carousel">
-            <div class="carousel-inner">
-                @php
-                    $totalCards = 12;
-                    $images = ['img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg',
-                    'img/login.jpeg', 'img/login.jpeg','img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg',
-                    'img/login.jpeg', 'img/login.jpeg','img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg',
-                    'img/login.jpeg', 'img/login.jpeg','img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg',
-                    'img/login.jpeg', 'img/login.jpeg','img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg',
-                    'img/login.jpeg', 'img/login.jpeg','img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg',
-                    'img/login.jpeg', 'img/login.jpeg', /* add more image paths here */];
-                @endphp
+    <!-- ekstrakurikuler section -->
+    <section id="ekstrakurikuler" class="service_section layout_padding">
+        <div class="container">
+            <div class="heading_container">
+                <h2>
+                    Ekstrakurikuler
+                </h2>
+                <p>
+                    Kegiatan Ekstrakurikuler Siswa di MAN 3 Banyuwangi
+                </p>
+            </div>
+            <div id="ekstrakurikulerCarousel" class="carousel slide" data-ride="carousel">
+                <div class="carousel-inner">
+                    @php
+                        $totalCards = 12;
+                        $images = ['img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg', 'img/login.jpeg'];
+                    @endphp
 
-                @for ($i = 0; $i < count($images); $i += $totalCards)
-                    <div class="carousel-item {{ $i === 0 ? 'active' : '' }}">
-                        <div class="row">
-                            @for ($j = $i; $j < $i + $totalCards && $j < count($images); $j++)
-                                <div class="col-md-6 col-lg-3">
-                                    <div class="box" style="width: 17rem;">
-                                        <img src="{{ asset($images[$j]) }}" class="card-img-top" alt="...">
-                                        <div class="card-body">
-                                            <div class="detail-box">
-                                                <h5>
-                                                    Futsal
-                                                </h5>
-                                                <p>
-                                                    Ekstrakurikuler di bidang olahraga
-                                                </p>
+                    @for ($i = 0; $i < count($images); $i += $totalCards)
+                        <div class="carousel-item {{ $i === 0 ? 'active' : '' }}">
+                            <div class="row">
+                                @for ($j = $i; $j < $i + $totalCards && $j < count($images); $j++)
+                                    <div class="col-md-6 col-lg-3">
+                                        <div class="box" style="width: 17rem;">
+                                            <img src="{{ asset($images[$j]) }}" class="card-img-top" alt="...">
+                                            <div class="card-body">
+                                                <div class="detail-box">
+                                                    <h5>
+                                                        Futsal
+                                                    </h5>
+                                                    <p>
+                                                        Ekstrakurikuler di bidang olahraga
+                                                    </p>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                            @endfor
+                                @endfor
+                            </div>
                         </div>
-                    </div>
-                @endfor
-            </div>
-            <div class="carousel-indicators mt-2">
-              @for ($i = 0; $i < ceil(count($images) / $totalCards); $i++)
-                  <span data-target="#ekstrakurikulerCarousel" data-slide-to="{{ $i }}" class="{{ $i === 0 ? 'active' : '' }}" onclick="goToSlide({{ $i }})"></span>
-              @endfor
-            </div>
-            <script>
-              function goToSlide(index) {
-                  $('#ekstrakurikulerCarousel').carousel(index);
-              }
-            </script>
-        </div>
-    </div>
-</section>
-
-  <div class="footer_container">
-    <!-- info section -->
-
-    <section class="info_section ">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-4">
-                    <div class="info_detail">
-                        <h4>
-                            Sistem Pendukung Keputusan Pemilihan Ekstrakurikuler Siswa di MAN 3 Banyuwangi
-                        </h4>
-                    </div>
+                    @endfor
                 </div>
-                <div class="col-md-4">
-                    <div class="info_link_box">
-                        <h4>
-                            Links
-                        </h4>
-                        <div class="info_links">
-                            <a class="" href="#home">
-                                Home
-                            </a>
-                            <a class="" href="#ekstrakurikuler">
-                                Ekstrakurikuler
-                            </a>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-4">
-                    <div class="info_contact">
-                        <h4>
-                            Address
-                        </h4>
-                        <div class="contact_link_box">
-                            <a href="https://maps.app.goo.gl/ibCGWyfsxw8pbR6i9">
-                                <i class="fa fa-map-marker" aria-hidden="true"></i>
-                                <span>
-                                    Location
-                                </span>
-                            </a>
-                            <a href="mailto:man3banyuwangi@gmail.com">
-                                <i class="fa fa-envelope" aria-hidden="true"></i>
-                                <span>
-                                    Email
-                                </span>
-                            </a>
-                            <a href="tel:+62333397173">
-                                <i class="fa fa-phone" aria-hidden="true"></i>
-                                <span>
-                                    Telepon
-                                </span>
-                            </a>
-                            <a href="https://www.instagram.com/osimman3banyuwangi" target="_blank">
-                                <i class="fa fa-instagram" aria-hidden="true"></i>
-                                <span>
-                                    Instagram
-                                </span>
-                            </a>
-                        </div>
-                    </div>
+                <div class="carousel-indicators mt-2">
+                    @for ($i = 0; $i < ceil(count($images) / $totalCards); $i++)
+                        <span data-target="#ekstrakurikulerCarousel" data-slide-to="{{ $i }}"
+                            class="{{ $i === 0 ? 'active' : '' }}" onclick="goToSlide({{ $i }})"></span>
+                    @endfor
                 </div>
+                <script>
+                    function goToSlide(index) {
+                        $('#ekstrakurikulerCarousel').carousel(index);
+                    }
+                </script>
             </div>
         </div>
     </section>
 
+    <div class="footer_container">
+        <!-- info section -->
 
-    <!-- end info section -->
+        <section class="info_section ">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-4">
+                        <div class="info_detail">
+                            <h4>
+                                Sistem Pendukung Keputusan Pemilihan Ekstrakurikuler Siswa di MAN 3 Banyuwangi
+                            </h4>
+                        </div>
+                    </div>
+                    <div class="col-md-4">
+                        <div class="info_link_box">
+                            <h4>
+                                Links
+                            </h4>
+                            <div class="info_links">
+                                <a class="" href="#home">
+                                    Home
+                                </a>
+                                <a class="" href="#ekstrakurikuler">
+                                    Ekstrakurikuler
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-4">
+                        <div class="info_contact">
+                            <h4>
+                                Address
+                            </h4>
+                            <div class="contact_link_box">
+                                <a href="https://maps.app.goo.gl/ibCGWyfsxw8pbR6i9">
+                                    <i class="fa fa-map-marker" aria-hidden="true"></i>
+                                    <span>
+                                        Location
+                                    </span>
+                                </a>
+                                <a href="mailto:man3banyuwangi@gmail.com">
+                                    <i class="fa fa-envelope" aria-hidden="true"></i>
+                                    <span>
+                                        Email
+                                    </span>
+                                </a>
+                                <a href="tel:+62333397173">
+                                    <i class="fa fa-phone" aria-hidden="true"></i>
+                                    <span>
+                                        Telepon
+                                    </span>
+                                </a>
+                                <a href="https://www.instagram.com/osimman3banyuwangi" target="_blank">
+                                    <i class="fa fa-instagram" aria-hidden="true"></i>
+                                    <span>
+                                        Instagram
+                                    </span>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </section>
 
-    <!-- footer section -->
-    <footer class="footer_section">
-      <div class="container">
-        <p>
-          &copy; <span id="displayYear"></span> All Rights Reserved By
-          <a href="home">SIPEX</a>
-        </p>
-      </div>
-    </footer>
-    <!-- footer section -->
-  </div>
 
-  <!-- jQery -->
-  <script src="js/jquery-3.4.1.min.js"></script>
-  <!-- popper js -->
-  <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous">
-  </script>
-  <!-- bootstrap js -->
-  <script src="js/bootstrap.js"></script>
-  <script src="js/custom.js"></script>
-  <!-- Google Map -->
-  <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCh39n5U-4IoWpsVGUHWdqB6puEkhRLdmI&callback=myMap"></script>
-  <!-- End Google Map -->
-  <!-- Swiper JS -->
-  <script src="https://unpkg.com/swiper/swiper-bundle.min.js"></script>
+        <!-- end info section -->
+
+        <!-- footer section -->
+        <footer class="footer_section">
+            <div class="container">
+                <p>
+                    &copy; <span id="displayYear"></span> All Rights Reserved By
+                    <a href="home">SIPEX</a>
+                </p>
+            </div>
+        </footer>
+        <!-- footer section -->
+    </div>
+
+    <!-- jQery -->
+    <script src="js/jquery-3.4.1.min.js"></script>
+    <!-- popper js -->
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
+        integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous">
+    </script>
+    <!-- bootstrap js -->
+    <script src="js/bootstrap.js"></script>
+    <script src="js/custom.js"></script>
+    <!-- Google Map -->
+    <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCh39n5U-4IoWpsVGUHWdqB6puEkhRLdmI&callback=myMap">
+    </script>
+    <!-- End Google Map -->
+    <!-- Swiper JS -->
+    <script src="https://unpkg.com/swiper/swiper-bundle.min.js"></script>
 
 </body>
 
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 6637353..2b361fc 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -12,7 +12,7 @@
   <meta name="description" content="" />
   <meta name="author" content="" />
 
-  <title>Home | SIPEX</title>
+  <title>SIPEX | {{ $title }}</title>
 
 
   <!-- bootstrap core css -->
@@ -38,7 +38,7 @@
     <header class="header_section">
       <div class="container-fluid">
         <nav class="navbar navbar-expand-lg custom_nav-container ">
-          <a class="navbar-brand" href="home.blade.php">
+          <a class="navbar-brand" href="/home">
           </a>
 
           <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
@@ -47,11 +47,11 @@
 
           <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav">
-              <li class="nav-item active">
-                  <a class="nav-link" href="{{ route('home') }}">Home <span class="sr-only">(current)</span></a>
+              <li class="nav-item">
+                  <a class="nav-link {{ ($title === "Home") ? 'active' : ''}}" href="/home">Home</a>
               </li>
               <li class="nav-item">
-                  <a class="nav-link" href="{{ route('ekstrakurikuler') }}">Ekstrakurikuler</a>
+                  <a class="nav-link {{ ($title === "Ekstrakurikuler") ? 'active' : ''}}" href="/ekstrakurikuler">Ekstrakurikuler</a>
               </li>
           </ul>
 
diff --git a/resources/views/siswa/dashboard.blade.php b/resources/views/siswa/dashboard.blade.php
index abf4fa9..e5d7c06 100644
--- a/resources/views/siswa/dashboard.blade.php
+++ b/resources/views/siswa/dashboard.blade.php
@@ -11,7 +11,7 @@
                 <div class="col-md-8">
                     <h1 class="font-20 weight-500 mb-10 text-capitalize">
                         Welcome Back!
-                        <div class="weight-600 font-30 text-blue">{{ auth()->user()->name }}!</div>
+                        <div class="weight-600 font-20 text-blue">{{ auth()->user()->name }}</div>
                     </h1>
                 </div>
             </div>
diff --git a/routes/web.php b/routes/web.php
index 7957ec9..32d2988 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -18,34 +18,40 @@
 */
 
 Route::get('/', function () {
-    return view('home');
+    return view('home', [
+        "title" => "Home"
+    ]);
 });
 
 Route::get('/home', function () {
-    return view('home'); // Ganti 'welcome' dengan nama file blade yang sesuai
+    return view('home',[
+        "title" => "Home"
+    ]);
 })->name('home');
 
 Route::get('/ekstrakurikuler', function () {
-    return view('ekstrakurikuler'); // Ganti 'ekstrakurikuler' dengan nama file blade yang sesuai
-})->name('ekstrakurikuler');
+    return view('ekstrakurikuler', [
+        "title" => "Ekstrakurikuler"
+    ]);
+});
 
 
-// Route::get('/login', function () {
-//     if (Auth::check()) {
-//         return redirect('/dashboard');
-//     }
-//     return view('auth.login');
-// })->name('login');
-Route::get('/login', [AuthController::class, 'showLoginForm'])->name('login');
+Route::get('/login', function () {
+    if (Auth::check()) {
+        return redirect('/siswa/dashboard');
+    }
+    return view('auth.login');
+})->name('login');
+// Route::get('/login', [AuthController::class, 'showLoginForm'])->name('login');
 Route::post('/login', [AuthController::class, 'login']);
 
-// Route::get('/register', function () {
-//     if (Auth::check()) {
-//         return redirect('/dashboard');
-//     }
-//     return view('auth.register');
-// })->name('register');
-Route::get('/register', [AuthController::class, 'showRegisterForm'])->name('register');
+Route::get('/register', function () {
+    if (Auth::check()) {
+        return redirect('/siswa/dashboard');
+    }
+    return view('auth.register');
+})->name('register');
+// Route::get('/register', [AuthController::class, 'showRegisterForm'])->name('register');
 Route::post('/register', [AuthController::class, 'register']);
 
 Route::get('/forgot-password', function () {