diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 6d45f93..d7f2236 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -3,6 +3,8 @@
 
 use Illuminate\Http\Request;
 use App\Models\User;
+use Illuminate\Support\Facades\Auth;        // 🔥 TAMBAH
+use Illuminate\Support\Facades\Storage;    // 🔥 TAMBAH
 
 class UserController extends Controller
 {
@@ -20,7 +22,7 @@ public function index(Request $request)
 
         $users = $query->paginate(10)->withQueryString();
 
-        return view('data_user', compact('users')); // sesuaikan dengan blade kamu
+        return view('data_user', compact('users'));
     }
 
     public function create()
@@ -33,4 +35,27 @@ public function destroy($id)
         User::where('id_user', $id)->delete();
         return redirect()->back()->with('success', 'User berhasil dihapus.');
     }
+
+    // 🔥🔥🔥 TAMBAHAN UNTUK UPLOAD PP
+    public function uploadPP(Request $request)
+    {
+        $request->validate([
+            'foto' => 'required|image|mimes:jpg,jpeg,png|max:2048'
+        ]);
+
+        // 🔥 WAJIB pakai ini
+        $user = Auth::user();
+
+        if ($request->hasFile('foto')) {
+            $file = $request->file('foto');
+            $namaFile = time().'_'.$file->getClientOriginalName();
+            $file->move(public_path('uploads/profile'), $namaFile);
+
+            $user->profile_photo = $namaFile;
+        }
+
+        $user->save();
+
+        return back()->with('success', 'Berhasil upload PP');
+    }
 }
\ No newline at end of file
diff --git a/resources/views/detail-katalog.blade.php b/resources/views/detail-katalog.blade.php
index 42127a8..5d5eba5 100644
--- a/resources/views/detail-katalog.blade.php
+++ b/resources/views/detail-katalog.blade.php
@@ -1197,14 +1197,17 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -1217,29 +1220,19 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/detail-pemesanan.blade.php b/resources/views/detail-pemesanan.blade.php
index 158d067..db191c7 100644
--- a/resources/views/detail-pemesanan.blade.php
+++ b/resources/views/detail-pemesanan.blade.php
@@ -841,25 +841,29 @@ class="nav-item {{ request()->routeIs('halaman-katalog') ? 'active' : '' }}">
                 class="nav-item {{ request()->routeIs('halaman-chatbot') ? 'active' : '' }}">
                     ChatBot
                 </a>
-                <a href="{{ route('riwayat-pemesanan') }}"
-                class="nav-item {{ request()->routeIs('riwayat-pemesanan') ? 'active' : '' }}">
+                @auth
+                <a href="{{ route('riwayat-pemesanan') }}" class="nav-item {{ request()->routeIs('riwayat-pemesanan') ? 'active' : '' }}">
                     Riwayat Pemesanan
                 </a>
+                @endauth
                 <a href="{{ route('halaman-kontak') }}"
-                class="nav-item {{ request()->routeIs('halaman-kontak') ? 'active' : '' }}">
+                class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                     Kontak
                 </a>
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -872,29 +876,19 @@ class="nav-item {{ request()->routeIs('halaman-kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/form-pemesanan.blade.php b/resources/views/form-pemesanan.blade.php
index e96d1aa..1d4da90 100644
--- a/resources/views/form-pemesanan.blade.php
+++ b/resources/views/form-pemesanan.blade.php
@@ -610,14 +610,17 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -630,29 +633,19 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/halaman-chatbot.blade.php b/resources/views/halaman-chatbot.blade.php
index 0812f86..f33c287 100644
--- a/resources/views/halaman-chatbot.blade.php
+++ b/resources/views/halaman-chatbot.blade.php
@@ -695,14 +695,17 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -715,29 +718,19 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/halaman-katalog.blade.php b/resources/views/halaman-katalog.blade.php
index 5311dfb..68e1477 100644
--- a/resources/views/halaman-katalog.blade.php
+++ b/resources/views/halaman-katalog.blade.php
@@ -888,14 +888,17 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -908,29 +911,19 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/halaman-kontak.blade.php b/resources/views/halaman-kontak.blade.php
index 02f8d79..5ec9deb 100644
--- a/resources/views/halaman-kontak.blade.php
+++ b/resources/views/halaman-kontak.blade.php
@@ -46,25 +46,29 @@ class="nav-item {{ request()->routeIs('halaman-katalog') ? 'active' : '' }}">
                 class="nav-item {{ request()->routeIs('halaman-chatbot') ? 'active' : '' }}">
                     ChatBot
                 </a>
-                <a href="{{ route('riwayat-pemesanan') }}"
-                class="nav-item {{ request()->routeIs('riwayat-pemesanan') ? 'active' : '' }}">
+                @auth
+                <a href="{{ route('riwayat-pemesanan') }}" class="nav-item {{ request()->routeIs('riwayat-pemesanan') ? 'active' : '' }}">
                     Riwayat Pemesanan
                 </a>
+                @endauth
                 <a href="{{ route('halaman-kontak') }}"
-                class="nav-item {{ request()->routeIs('halaman-kontak') ? 'active' : '' }}">
+                class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                     Kontak
                 </a>
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -77,29 +81,19 @@ class="nav-item {{ request()->routeIs('halaman-kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/halaman-notifikasi.blade.php b/resources/views/halaman-notifikasi.blade.php
index e270e85..caf4d64 100644
--- a/resources/views/halaman-notifikasi.blade.php
+++ b/resources/views/halaman-notifikasi.blade.php
@@ -515,15 +515,17 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
             </nav>
             
             <div class="user-actions">
-    
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -536,29 +538,19 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/halaman-pembayaran.blade.php b/resources/views/halaman-pembayaran.blade.php
index 2f1d1dd..41b6fb9 100644
--- a/resources/views/halaman-pembayaran.blade.php
+++ b/resources/views/halaman-pembayaran.blade.php
@@ -690,14 +690,17 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -710,29 +713,19 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/halaman-profil.blade.php b/resources/views/halaman-profil.blade.php
index 813fe95..8c88f72 100644
--- a/resources/views/halaman-profil.blade.php
+++ b/resources/views/halaman-profil.blade.php
@@ -215,6 +215,75 @@
             color: #64748b;
             font-size: 1.1rem;
         }
+
+        /* PP */
+        .avatar-wrapper {
+            position: relative;
+            width: 80px;
+            height: 80px;
+            margin: auto;
+        }
+
+        .profile-avatar,
+        .profile-avatar-img {
+            width: 80px;
+            height: 80px;
+            border-radius: 50%;
+        }
+
+        .profile-avatar {
+            background: #7AB2D3;
+            color: white;
+            font-size: 2rem;
+            font-weight: bold;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .profile-avatar-img {
+            object-fit: cover;
+        }
+
+        /* tombol + */
+        .edit-avatar {
+            position: absolute;
+            bottom: 0;
+            right: 0;
+            background: #1E3A5F;
+            color: white;
+            width: 24px;
+            height: 24px;
+            border-radius: 50%;
+            font-size: 12px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            cursor: pointer;
+        }
+
+        .form-input {
+            width: 100%;
+            padding: 10px 12px;
+            border-radius: 10px;
+            border: 1px solid #ddd;
+            font-size: 0.9rem;
+            margin-top: 5px;
+        }
+
+        .form-input:focus {
+            outline: none;
+            border-color: #7AB2D3;
+        }
+
+        .btn-save {
+            background: #22c55e;
+            color: white;
+        }
+
+        .btn-save:hover {
+            background: #16a34a;
+        }
         
         /* Personal Information Section */
         .personal-info {
@@ -547,25 +616,29 @@ class="nav-item {{ request()->routeIs('halaman-katalog') ? 'active' : '' }}">
                 class="nav-item {{ request()->routeIs('halaman-chatbot') ? 'active' : '' }}">
                     ChatBot
                 </a>
-                <a href="{{ route('riwayat-pemesanan') }}"
-                class="nav-item {{ request()->routeIs('riwayat-pemesanan') ? 'active' : '' }}">
+                @auth
+                <a href="{{ route('riwayat-pemesanan') }}" class="nav-item {{ request()->routeIs('riwayat-pemesanan') ? 'active' : '' }}">
                     Riwayat Pemesanan
                 </a>
+                @endauth
                 <a href="{{ route('halaman-kontak') }}"
-                class="nav-item {{ request()->routeIs('halaman-kontak') ? 'active' : '' }}">
+                class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                     Kontak
                 </a>
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -578,29 +651,19 @@ class="nav-item {{ request()->routeIs('halaman-kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
@@ -609,58 +672,110 @@ class="nav-item {{ request()->routeIs('halaman-kontak') ? 'active' : '' }}">
     <!-- Main Content -->
     <div class="main-content">
         <div class="profile-container">
+
+            @php
+                $user = Auth::user();
+                $inisial = strtoupper(substr($user->name, 0, 1));
+            @endphp
+
             <!-- Profile Header -->
             <div class="profile-header">
-                <div class="profile-avatar">N</div>
-                <h2 class="profile-name">Nayla Putri Wijaya</h2>
-                <p class="profile-email">nayla.pw@gmail.com</p>
+                @php
+                    $user = Auth::user();
+                    $inisial = strtoupper(substr($user->name, 0, 1));
+                @endphp
+
+                <div class="avatar-wrapper">
+                    @if($user->profile_photo)
+                        <img src="{{ asset('storage/profile_photos/' . $user->profile_photo) }}" 
+                            class="profile-avatar-img">
+                    @else
+                        <div class="profile-avatar">{{ $inisial }}</div>
+                    @endif
+
+                    <!-- tombol upload -->
+                    <label for="upload-photo" class="edit-avatar">
+                        <i class="fas fa-plus"></i>
+                    </label>
+
+                    <form action="{{ route('upload.pp') }}" method="POST" enctype="multipart/form-data">
+                        @csrf
+                        <input type="file" id="upload-photo" name="photo" hidden onchange="this.form.submit()">
+                    </form>
+                </div>
+
+                <h2 class="profile-name">{{ $user->name }}</h2>
+                <p class="profile-email">{{ $user->email }}</p>
             </div>
             
             <!-- Personal Information -->
-            <div class="personal-info">
-                <h3 class="section-title">Informasi Pribadi</h3>
-                <div class="info-grid">
-                    <div class="info-item">
-                        <span class="info-label">Nama Lengkap</span>
-                        <span class="info-value">Nayla Putri Wijaya</span>
-                    </div>
-                    <div class="info-item">
-                        <span class="info-label">Nomor HP</span>
-                        <span class="info-value">0813-4567-8901</span>
-                    </div>
-                    <div class="info-item">
-                        <span class="info-label">Email</span>
-                        <span class="info-value">nayla.pw@gmail.com</span>
-                    </div>
-                    <div class="info-item">
-                        <span class="info-label">Nomor KTP</span>
-                        <span class="info-value">3171012345678901</span>
-                    </div>
-                    <div class="info-item">
-                        <span class="info-label">Alamat</span>
-                        <span class="info-value">Jl. Melati No. 45, RT 05/RW 03, Kelurahan Menteng, Kecamatan Menteng, Jakarta Pusat</span>
-                    </div>
-                    <div class="info-item">
-                        <span class="info-label">Pekerjaan</span>
-                        <span class="info-value">PNS - Marketing Staff</span>
+            <form action="{{ route('profile.update') }}" method="POST">
+                @csrf
+
+                <div class="personal-info">
+                    <h3 class="section-title">Informasi Pribadi</h3>
+
+                    <div class="info-grid">
+
+                        <div class="info-item">
+                            <span class="info-label">Nama Lengkap</span>
+                            <input type="text" name="nama_user" 
+                                value="{{ $user->nama_user }}" class="form-input">
+                        </div>
+
+                        <div class="info-item">
+                            <span class="info-label">Nomor HP</span>
+                            <input type="text" name="no_hp" 
+                                value="{{ $user->no_hp }}" class="form-input">
+                        </div>
+
+                        <div class="info-item">
+                            <span class="info-label">Email</span>
+                            <input type="email" name="email_user" 
+                                value="{{ $user->email_user }}" class="form-input">
+                        </div>
+
+                        <div class="info-item full">
+                            <span class="info-label">Alamat</span>
+                            <textarea name="alamat" class="form-input">{{ $user->alamat }}</textarea>
+                        </div>
+
+                        <div class="info-item">
+                            <span class="info-label">Pekerjaan</span>
+                            <input type="text" name="pekerjaan" 
+                                value="{{ $user->pekerjaan }}" class="form-input">
+                        </div>
+
                     </div>
                 </div>
-            </div>
-            
-            <!-- Security Settings -->
-            <div class="security-section">
-                <h4 class="security-title">Pengaturan Keamanan</h4>
-                <div class="security-actions">
-                    <button class="security-btn btn-change-password">
-                        <i class="fas fa-lock"></i> Ganti Password
-                    </button>
-                    <button class="security-btn btn-logout">
-                        <i class="fas fa-sign-out-alt"></i> Logout
-                    </button>
+
+                <!-- Security Settings -->
+                <div class="security-section">
+                    <h4 class="security-title">Pengaturan Keamanan</h4>
+
+                    <div class="security-actions">
+                        <button type="button" class="security-btn btn-change-password">
+                            <i class="fas fa-lock"></i> Ganti Password
+                        </button>
+
+                        <button type="submit" class="security-btn btn-save">
+                            <i class="fas fa-save"></i> Simpan Perubahan
+                        </button>
+
+                        <button type="button" class="security-btn btn-logout"
+                                onclick="document.getElementById('logout-form').submit();">
+                            <i class="fas fa-sign-out-alt"></i> Logout
+                        </button>
+                    </div>
                 </div>
-            </div>
+            </form>
+
+            <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display:none;">
+                @csrf
+            </form>
         </div>
     </div>
+    
 
     <script>
     document.addEventListener("DOMContentLoaded", function () {
diff --git a/resources/views/riwayat-pemesanan.blade.php b/resources/views/riwayat-pemesanan.blade.php
index ae80784..2040855 100644
--- a/resources/views/riwayat-pemesanan.blade.php
+++ b/resources/views/riwayat-pemesanan.blade.php
@@ -723,25 +723,29 @@ class="nav-item {{ request()->routeIs('halaman-katalog') ? 'active' : '' }}">
                 class="nav-item {{ request()->routeIs('halaman-chatbot') ? 'active' : '' }}">
                     ChatBot
                 </a>
-                <a href="{{ route('riwayat-pemesanan') }}"
-                class="nav-item {{ request()->routeIs('riwayat-pemesanan') ? 'active' : '' }}">
+                @auth
+                <a href="{{ route('riwayat-pemesanan') }}" class="nav-item {{ request()->routeIs('riwayat-pemesanan') ? 'active' : '' }}">
                     Riwayat Pemesanan
                 </a>
+                @endauth
                 <a href="{{ route('halaman-kontak') }}"
-                class="nav-item {{ request()->routeIs('halaman-kontak') ? 'active' : '' }}">
+                class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                     Kontak
                 </a>
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -754,29 +758,19 @@ class="nav-item {{ request()->routeIs('halaman-kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/tentang-kami.blade.php b/resources/views/tentang-kami.blade.php
index def2593..8388d4e 100644
--- a/resources/views/tentang-kami.blade.php
+++ b/resources/views/tentang-kami.blade.php
@@ -1482,14 +1482,17 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
             </nav>
             
             <div class="user-actions">
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -1502,29 +1505,19 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 50976a1..df1b8fc 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1806,15 +1806,17 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
             </nav>
             
             <div class="user-actions">
-    
-                {{-- Notifikasi hanya muncul kalau sudah login --}}
+
+                {{-- Notifikasi hanya kalau login --}}
                 @auth
                 <a href="{{ route('halaman-notifikasi') }}" class="notification-icon" style="position:relative;">
                     <i class="fas fa-bell"></i>
+
                     @php
                         $jumlahBelumBaca = \App\Models\Notifikasi::where('id_user', Auth::id())
                             ->where('status_baca', 0)->count();
                     @endphp
+
                     @if($jumlahBelumBaca > 0)
                         <span style="position:absolute; top:-5px; right:-5px; 
                                     background:#ef4444; color:white; border-radius:50%; 
@@ -1827,29 +1829,19 @@ class="nav-item {{ request()->routeIs('kontak') ? 'active' : '' }}">
                 </a>
                 @endauth
 
-                {{-- Conditional: Guest vs Authenticated --}}
+                {{-- Guest --}}
                 @guest
                     <a href="{{ route('login') }}" class="nav-item login-link">
                         <i class="fas fa-sign-in-alt me-1"></i> Login
                     </a>
                 @else
-                    <div class="profile-dropdown">
-                        <div class="profile-icon" onclick="toggleDropdown()">
-                            <i class="fas fa-user"></i>
-                        </div>
-                        <div class="dropdown-menu" id="dropdownMenu">
-                            <a href="{{ route('halaman-profil') }}">
-                                <i class="fas fa-user-circle"></i> Lihat Profil
-                            </a>
-                            <hr>
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
-                                <button type="submit">
-                                    <i class="fas fa-sign-out-alt"></i> Logout
-                                </button>
-                            </form>
-                        </div>
-                    </div>
+                    {{-- HANYA ICON PROFILE --}}
+                    <a href="{{ route('halaman-profil') }}" class="profile-icon">
+                        <img src="{{ Auth::user()->profile_photo 
+                            ? asset('storage/profile_photos/' . Auth::user()->profile_photo) 
+                            : asset('default-avatar.png') }}" 
+                            alt="Profile" class="profile-img">
+                    </a>
                 @endguest
             </div>
         </div>
diff --git a/routes/web.php b/routes/web.php
index 5baa299..19758ec 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -4,6 +4,7 @@
 use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\ChatbotController;
 use App\Http\Controllers\AuthController;
+use App\Http\Controllers\UserController;
 
 /*
 |--------------------------------------------------------------------------
@@ -142,9 +143,14 @@
         return view('halaman-profil');
     })->name('halaman-profil');
 
+    // 🔥 TAMBAHAN INI
+    Route::post('/upload-pp', [UserController::class, 'uploadPP'])->name('upload.pp');
+    Route::post('/update-profile', [UserController::class, 'updateProfile'])->name('profile.update');
+
 });
 
 
+
 /*
 |--------------------------------------------------------------------------
 | 👨‍💻 ADMIN ROUTES (Hanya Admin)