user and role module merged. conflict resolve
This commit is contained in:
@@ -18,6 +18,9 @@
|
||||
<x-nav-link :href="route('users.index')" :active="request()->routeIs('users.*')">
|
||||
{{ __('Users') }}
|
||||
</x-nav-link>
|
||||
<x-nav-link :href="route('roles.index')" :active="request()->routeIs('roles.*')">
|
||||
{{ __('Roles') }}
|
||||
</x-nav-link>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -76,6 +79,9 @@
|
||||
<x-responsive-nav-link :href="route('users.index')" :active="request()->routeIs('users.*')">
|
||||
{{ __('Users') }}
|
||||
</x-responsive-nav-link>
|
||||
<x-responsive-nav-link :href="route('roles.index')" :active="request()->routeIs('roles.*')">
|
||||
{{ __('Roles') }}
|
||||
</x-responsive-nav-link>
|
||||
</div>
|
||||
|
||||
<!-- Responsive Settings Options -->
|
||||
|
||||
Reference in New Issue
Block a user