From b9fd0b70c73c30a369140afcd1debb68c24a1013 Mon Sep 17 00:00:00 2001
From: Toy Rik <toyrik@gmail.com>
Date: Mon, 23 Feb 2026 08:04:22 +0300
Subject: [PATCH] =?UTF-8?q?FIX=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=88=D0=B8=D0=B5=20=D0=B2=D0=B8=D0=B7=D1=83=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/page-breadcrumb.blade.php          | 39 ++++++++++++++++++-
 src/resources/views/layouts/app.blade.php     | 14 ++++---
 .../views/layouts/partials/sidebar.blade.php  | 13 ++++++-
 src/resources/views/pages/user/show.blade.php |  2 -
 4 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/resources/views/components/common/page-breadcrumb.blade.php b/src/resources/views/components/common/page-breadcrumb.blade.php
index 60aaa6d..7a919c6 100644
--- a/src/resources/views/components/common/page-breadcrumb.blade.php
+++ b/src/resources/views/components/common/page-breadcrumb.blade.php
@@ -1 +1,38 @@
-@props(['pageTitle' => 'Page'])
\ No newline at end of file
+@props(['pageTitle' => 'Page'])
+
+<div class="flex flex-wrap items-center justify-between gap-3 mb-6">
+    <h2 class="text-xl font-semibold text-gray-800 dark:text-white/90">
+        {{ $pageTitle }}
+    </h2>
+    <nav>
+        <ol class="flex items-center gap-1.5">
+            <li>
+                <a
+                    class="inline-flex items-center gap-1.5 text-sm text-gray-500 dark:text-gray-400"
+                    href="{{ url('/') }}"
+                >
+                    Home
+                    <svg
+                        class="stroke-current"
+                        width="17"
+                        height="16"
+                        viewBox="0 0 17 16"
+                        fill="none"
+                        xmlns="http://www.w3.org/2000/svg"
+                    >
+                        <path
+                            d="M6.0765 12.667L10.2432 8.50033L6.0765 4.33366"
+                            stroke=""
+                            stroke-width="1.2"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                        />
+                    </svg>
+                </a>
+            </li>
+            <li class="text-sm text-gray-800 dark:text-white/23">
+                {{ $pageTitle }}
+            </li>
+        </ol>
+    </nav>
+</div>
diff --git a/src/resources/views/layouts/app.blade.php b/src/resources/views/layouts/app.blade.php
index 54cc6af..1ee481f 100644
--- a/src/resources/views/layouts/app.blade.php
+++ b/src/resources/views/layouts/app.blade.php
@@ -16,14 +16,18 @@
         }
     };
     window.addEventListener('resize', checkMobile);">
-        <div class="min-h-screen xl:flex">
+        <div class="min-h-screen">
             @include('layouts.partials.sidebar')
-            <div class="flex-1 transition-all duration-300 ease-in-out">
-                @include('layouts.partials.app-header')
-                <div class="p-4 mx-auto max-w-(--breakpoint-2xl) md:p-6">
+            @include('layouts.partials.app-header')
+            <div class="flex transition-all duration-300 ease-in-out pt-16 " 
+                 :class="{
+                     'xl:ml-[290px]': $store.sidebar.isExpanded || $store.sidebar.isHovered,
+                     'xl:ml-[90px]': !$store.sidebar.isExpanded && !$store.sidebar.isHovered
+                 }">
+                <div class="p-4 mx-auto max-w-(--breakpoint-2xl) md:p-6 w-full">
                     @yield('content')
                 </div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/resources/views/layouts/partials/sidebar.blade.php b/src/resources/views/layouts/partials/sidebar.blade.php
index 60e064d..dacf68d 100644
--- a/src/resources/views/layouts/partials/sidebar.blade.php
+++ b/src/resources/views/layouts/partials/sidebar.blade.php
@@ -47,7 +47,18 @@
             return this.openSubmenus[key] || false;
         },
         isActive(path) {
-            return window.location.pathname === path || '{{ $currentPath }}' === path.replace(/^\//, '');
+            let relativePath = path;
+            try {
+                if (path.startsWith('http')) {
+                    relativePath = new URL(path).pathname;
+                }
+            } catch (e) {
+            }
+            
+            const currentPath = window.location.pathname;
+            return currentPath === relativePath ||
+                   currentPath === relativePath.replace(/^\/+/, '') ||
+                   '/' + currentPath === relativePath;
         }
     }"
     :class="{
diff --git a/src/resources/views/pages/user/show.blade.php b/src/resources/views/pages/user/show.blade.php
index 481a456..bfc1435 100644
--- a/src/resources/views/pages/user/show.blade.php
+++ b/src/resources/views/pages/user/show.blade.php
@@ -1,8 +1,6 @@
 @extends ('layouts.app')
 
 @section ('content')
-    <h1>{{ dd($data) }}</h1>
-
     <x-common.page-breadcrumb pageTitle="User Profile" />
     <div class="rounded-2xl border border-gray-200 bg-white p-5 dark:border-gray-800 dark:bg-white/[0.03] lg:p-6">
         <h3 class="mb-5 text-lg font-semibold text-gray-800 dark:text-white/90 lg:mb-7">Profile</h3>