diff --git a/app/Components/Dashboard.php b/app/Components/Dashboard.php
new file mode 100644
index 0000000..41e888e
--- /dev/null
+++ b/app/Components/Dashboard.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Components;   // <-- đổi namespace
+
+use Livewire\Component;
+
+class Dashboard extends Component
+{
+    public function render()
+    {
+        return view('components.dashboard');
+    }
+}
diff --git a/app/Http/Controllers/Dashboard.php b/app/Http/Controllers/Dashboard.php
deleted file mode 100644
index 8fb4b2a..0000000
--- a/app/Http/Controllers/Dashboard.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Livewire\Component;
-
-class Dashboard extends Component
-{
-    public function render()
-    {
-
-        return view('component.dashboard')
-            ->layoutData(['title' => 'Dashboard'])  // truyền thêm data nếu cần
-            ->layout('layouts.app');
-    }
-}
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
new file mode 100644
index 0000000..fa1899f
--- /dev/null
+++ b/app/Http/Controllers/DashboardController.php
@@ -0,0 +1,13 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+
+class DashboardController extends Controller
+{
+    public function index()
+    {
+        // Trả về Blade wrapper, Livewire component sẽ được gọi trong đó
+        return view('admin.dashboard');
+    }
+}
diff --git a/app/Livewire/Auth/Login.php b/app/Livewire/Auth/Login.php
deleted file mode 100644
index ee35bc3..0000000
--- a/app/Livewire/Auth/Login.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Livewire\Auth;
-
-use Illuminate\Support\Facades\Auth;
-use Livewire\Component;
-
-class Login extends Component
-{
-    public $email = '';
-    public $password = '';
-    public $remember = false;
-
-    protected $rules = [
-        'email' => 'required|email',
-        'password' => 'required',
-    ];
-
-    public function login()
-    {
-        $this->validate();
-
-        if (Auth::attempt(['email' => $this->email, 'password' => $this->password], $this->remember)) {
-            request()->session()->regenerate();
-            return redirect()->intended('/dashboard');
-        }
-
-        $this->addError('email', 'Email hoặc mật khẩu không đúng.');
-    }
-
-    public function render()
-    {
-        return view('auth.login')->layout('layouts.auth');
-    }
-}
diff --git a/config/livewire.php b/config/livewire.php
index ccc3931..86329eb 100644
--- a/config/livewire.php
+++ b/config/livewire.php
@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'class_namespace' => 'App\\Livewire',
+    'class_namespace' => 'App\\Components',
 
     /*
     |---------------------------------------------------------------------------
@@ -26,7 +26,7 @@ return [
     |
     */
 
-    'view_path' => resource_path('views/component'),
+    'view_path' => resource_path('views/components'),
 
     /*
     |---------------------------------------------------------------------------
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index 30c79a2..5504cd1 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -1,10 +1,8 @@
-{{-- resources/views/admin/dashboard.blade.php --}}
 @extends('layouts.app')
 
 @section('title', 'Dashboard')
 
 @section('content')
-
-    {{-- Gọi Livewire component --}}
+    {{-- Đây chính là chỗ Livewire inject component --}}
     <livewire:dashboard />
 @endsection
diff --git a/resources/views/component/dashboard.blade.php b/resources/views/components/dashboard.blade.php
similarity index 100%
rename from resources/views/component/dashboard.blade.php
rename to resources/views/components/dashboard.blade.php
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index c79c5eb..73eaf28 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>@yield('title', 'Admin Page')</title>
+    <title>{{ $title ?? 'Admin Page' }}</title>
 
     {{-- Favicons --}}
     <link rel="apple-touch-icon" sizes="76x76" href="{{ asset('soft-ui/assets/img/apple-icon.png') }}">
diff --git a/routes/web.php b/routes/web.php
index f6f5641..c2d830f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,9 +2,7 @@
 
 use App\Http\Controllers\Auth\LoginController;
 use Illuminate\Support\Facades\Route;
-use App\Http\Controllers\Dashboard;
+use App\Http\Controllers\DashboardController;
 
 // Dashboard route (Livewire) for authenticated users only
-Route::get('dashboard', Dashboard::class)
-    ->middleware('auth')
-    ->name('dashboard');
+Route::get('dashboard', [DashboardController::class, 'index'])->name('dashboard');