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']) + +
+

+ {{ $pageTitle }} +

+ +
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);"> -
+
@include('layouts.partials.sidebar') -
- @include('layouts.partials.app-header') -
+ @include('layouts.partials.app-header') +
+
@yield('content')
- \ No newline at end of file + 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') -

{{ dd($data) }}

-

Profile