#2 fix conflict

This commit is contained in:
Saufi
2026-05-12 11:33:35 +08:00
19 changed files with 830 additions and 51 deletions

View File

@@ -24,6 +24,9 @@
<x-nav-link :href="route('role.index')" :active="request()->routeIs('role.index')">
{{ __('Roles') }}
</x-nav-link>
<x-nav-link :href="route('category.index')" :active="request()->routeIs('category.*')">
{{ __('Categories') }}
</x-nav-link>
</div>
</div>
@@ -88,6 +91,9 @@
<x-responsive-nav-link :href="route('role.index')" :active="request()->routeIs('role.index')">
{{ __('Roles') }}
</x-responsive-nav-link>
<x-responsive-nav-link :href="route('category.index')" :active="request()->routeIs('category.*')">
{{ __('Categories') }}
</x-responsive-nav-link>
</div>
<!-- Responsive Settings Options -->