Skip to content
This repository was archived by the owner on Mar 12, 2024. It is now read-only.

Commit 016f550

Browse files
sandervercamptsandervercampt
committed
Fixes L10 - part 1
1 parent 3393419 commit 016f550

File tree

15 files changed

+153
-128
lines changed

15 files changed

+153
-128
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"php": "^7.4|^8.0|^8.1",
1414
"livewire/livewire": "^2.0",
1515
"spatie/laravel-package-tools": "^1.1",
16-
"rappasoft/laravel-livewire-tables" : "^1.10"
16+
"rappasoft/laravel-livewire-tables" : "^2.0"
1717

1818
},
1919
"autoload": {

‎resources/views/menu-ui/developer-desktop.blade.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="ml-3 relative">
2-
<x-jet-dropdown align="right" width="48">
2+
<x-dropdown align="right" width="48">
33
<x-slot name="trigger">
44
<span class="inline-flex rounded-md">
55
<button type="button" class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:bg-gray-50 hover:text-gray-700 focus:outline-none focus:bg-gray-50 active:bg-gray-50 transition">
@@ -12,13 +12,13 @@
1212
</x-slot>
1313

1414
<x-slot name="content">
15-
<x-jet-dropdown-link href="{{ route('developers.permissions') }}">
15+
<x-dropdown-link href="{{ route('developers.permissions') }}">
1616
{{ __('Permissions') }}
17-
</x-jet-dropdown-link>
18-
<x-jet-dropdown-link href="{{ route('developers.menus') }}">
17+
</x-dropdown-link>
18+
<x-dropdown-link href="{{ route('developers.menus') }}">
1919
{{ __('Menus') }}
20-
</x-jet-dropdown-link>
20+
</x-dropdown-link>
2121
</x-slot>
22-
</x-jet-dropdown>
22+
</x-dropdown>
2323
</div>
2424

‎resources/views/menu-ui/developer-mobile.blade.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
{{ __('Developer Menu') }}
55
</div>
66
<div class="border-t border-gray-100"></div>
7-
<x-jet-responsive-nav-link href="{{ route('developers.permissions') }}">
7+
<x-responsive-nav-link href="{{ route('developers.permissions') }}">
88
{{ __('Permissions') }}
9-
</x-jet-responsive-nav-link>
10-
<x-jet-responsive-nav-link href="{{ route('developers.menus') }}">
9+
</x-responsive-nav-link>
10+
<x-responsive-nav-link href="{{ route('developers.menus') }}">
1111
{{ __('Menus') }}
12-
</x-jet-responsive-nav-link>
12+
</x-responsive-nav-link>

‎resources/views/menu-ui/menu.blade.php‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
</x-slot>
1616
<div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
17-
<x-jet-form-section submit="updateMenu">
17+
<x-form-section submit="updateMenu">
1818
<x-slot name="title">
1919
{{ __('Menu') }}
2020
</x-slot>
@@ -26,45 +26,45 @@
2626

2727
<x-slot name="form">
2828
<div class="col-span-6 sm:col-span-4">
29-
<x-jet-label for="name" value="{{ __('Menu name') }}"/>
30-
<x-jet-input id="name" type="text" class="mt-1 block w-full" wire:model.defer="menu.name" autocomplete="name"/>
31-
<x-jet-input-error for="permission.name" class="mt-2"/>
29+
<x-label for="name" value="{{ __('Menu name') }}"/>
30+
<x-input id="name" type="text" class="mt-1 block w-full" wire:model.defer="menu.name" autocomplete="name"/>
31+
<x-input-error for="permission.name" class="mt-2"/>
3232
</div>
3333
<div class="col-span-6 sm:col-span-4">
34-
<x-jet-label for="name" value="{{ __('Menu parent') }}"/>
34+
<x-label for="name" value="{{ __('Menu parent') }}"/>
3535
<select wire:model.defer="menu.parent_id" id="parent_id" name="parent_id" autocomplete="activity_id" class="mt-1 block w-full border-gray-300 focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 rounded-md shadow-sm">
3636
<option value="0">{{ __('Choose') }}</option>
3737

3838
@foreach($parents as $id => $label)
3939
<option value="{{ $id }}">{{ $label }}</option>
4040
@endforeach
4141
</select>
42-
<x-jet-input-error for="permission.parent" class="mt-2"/>
42+
<x-input-error for="permission.parent" class="mt-2"/>
4343
</div>
4444
<div class="col-span-6 sm:col-span-4">
45-
<x-jet-label for="route" value="{{ __('Menu links to route ( empty for no link )') }}"/>
46-
<x-jet-input id="route" type="text" class="mt-1 block w-full" wire:model.defer="menu.route" autocomplete="route"/>
47-
<x-jet-input-error for="menu.route" class="mt-2"/>
45+
<x-label for="route" value="{{ __('Menu links to route ( empty for no link )') }}"/>
46+
<x-input id="route" type="text" class="mt-1 block w-full" wire:model.defer="menu.route" autocomplete="route"/>
47+
<x-input-error for="menu.route" class="mt-2"/>
4848
</div>
4949
<div class="col-span-6 sm:col-span-4">
50-
<x-jet-label for="sort_order" value="{{ __('Sort order') }}"/>
51-
<x-jet-input id="sort_order" type="text" class="mt-1 block w-full" wire:model.defer="menu.sort_order" autocomplete="sort order "/>
52-
<x-jet-input-error for="menu.sort_order" class="mt-2"/>
50+
<x-label for="sort_order" value="{{ __('Sort order') }}"/>
51+
<x-input id="sort_order" type="text" class="mt-1 block w-full" wire:model.defer="menu.sort_order" autocomplete="sort order "/>
52+
<x-input-error for="menu.sort_order" class="mt-2"/>
5353
</div>
5454
</x-slot>
5555
<x-slot name="actions">
56-
<x-jet-action-message class="mr-3" on="saved">
56+
<x-action-message class="mr-3" on="saved">
5757
{{ __('Saved.') }}
58-
</x-jet-action-message>
58+
</x-action-message>
5959

60-
<x-jet-button wire:loading.attr="disabled">
60+
<x-button wire:loading.attr="disabled">
6161
{{ __('Save') }}
62-
</x-jet-button>
62+
</x-button>
6363
</x-slot>
64-
</x-jet-form-section>
65-
<x-jet-section-border/>
64+
</x-form-section>
65+
<x-section-border/>
6666

67-
<x-jet-form-section submit="updateMenu">
67+
<x-form-section submit="updateMenu">
6868

6969
<x-slot name="title">
7070
{{ __('Perks') }}
@@ -76,31 +76,31 @@
7676
<x-slot name="form">
7777

7878
<div class="col-span-6 sm:col-span-4">
79-
<x-jet-label for="permission" value="{{ __('Permission') }}"/>
79+
<x-label for="permission" value="{{ __('Permission') }}"/>
8080
{{ $menu->permission }}
8181
</div>
8282
<div class="col-span-6 sm:col-span-4">
83-
<x-jet-label for="permission" value="{{ __('Label') }}"/>
83+
<x-label for="permission" value="{{ __('Label') }}"/>
8484
__('{{ $menu->name }}')
8585
</div>
8686
@if(empty($menu->parent_id))
8787
<div class="col-span-6 sm:col-span-4">
88-
<x-jet-label for="icon" value="{{ __('Menu icon') }}"/>
89-
<x-jet-input id="icon" type="text" class="mt-1 block w-full" wire:model.defer="menu.icon" autocomplete="icon"/>
90-
<x-jet-input-error for="menu.icon" class="mt-2"/>
88+
<x-label for="icon" value="{{ __('Menu icon') }}"/>
89+
<x-input id="icon" type="text" class="mt-1 block w-full" wire:model.defer="menu.icon" autocomplete="icon"/>
90+
<x-input-error for="menu.icon" class="mt-2"/>
9191
</div>
9292
@endif
9393
</x-slot>
9494
<x-slot name="actions">
95-
<x-jet-action-message class="mr-3" on="saved">
95+
<x-action-message class="mr-3" on="saved">
9696
{{ __('Saved.') }}
97-
</x-jet-action-message>
97+
</x-action-message>
9898

99-
<x-jet-button wire:loading.attr="disabled">
99+
<x-button wire:loading.attr="disabled">
100100
{{ __('Save') }}
101-
</x-jet-button>
101+
</x-button>
102102
</x-slot>
103-
</x-jet-form-section>
103+
</x-form-section>
104104
</div>
105105

106106
</div>

‎resources/views/menu-ui/user-desktop.blade.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="ml-3 relative">
2-
<x-jet-dropdown align="right" width="48">
2+
<x-dropdown align="right" width="48">
33
<x-slot name="trigger">
44
<span class="inline-flex rounded-md">
55
<button type="button" class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:bg-gray-50 hover:text-gray-700 focus:outline-none focus:bg-gray-50 active:bg-gray-50 transition">
@@ -12,13 +12,13 @@
1212
</x-slot>
1313

1414
<x-slot name="content">
15-
<x-jet-dropdown-link href="{{ route('users.index') }}">
15+
<x-dropdown-link href="{{ route('users.index') }}">
1616
{{ __('Manage Users') }}
17-
</x-jet-dropdown-link>
18-
<x-jet-dropdown-link href="{{ route('users.roles') }}">
17+
</x-dropdown-link>
18+
<x-dropdown-link href="{{ route('users.roles') }}">
1919
{{ __('Manage Roles') }}
20-
</x-jet-dropdown-link>
20+
</x-dropdown-link>
2121
</x-slot>
22-
</x-jet-dropdown>
22+
</x-dropdown>
2323
</div>
2424

‎resources/views/menu-ui/user-mobile.blade.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<div class="block px-4 py-2 text-xs text-gray-400">
44
{{ __('User Management') }}
55
</div>
6-
<x-jet-responsive-nav-link href="{{ route('users.index') }}">
6+
<x-responsive-nav-link href="{{ route('users.index') }}">
77
{{ __('Manage Users') }}
8-
</x-jet-responsive-nav-link>
9-
<x-jet-responsive-nav-link href="{{ route('users.roles') }}">
8+
</x-responsive-nav-link>
9+
<x-responsive-nav-link href="{{ route('users.roles') }}">
1010
{{ __('Manage Roles') }}
11-
</x-jet-responsive-nav-link>
11+
</x-responsive-nav-link>
1212

‎resources/views/permission-ui/permission.blade.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</h2>
1212
</x-slot>
1313
<div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
14-
<x-jet-form-section submit="updatePermission">
14+
<x-form-section submit="updatePermission">
1515
<x-slot name="title">
1616
{{ __('Permission') }}
1717
</x-slot>
@@ -28,19 +28,19 @@
2828

2929
<x-slot name="form">
3030
<div class="col-span-6 sm:col-span-4">
31-
<x-jet-label for="name" value="{{ __('Permission name') }}"/>
32-
<x-jet-input id="name" type="text" class="mt-1 block w-full" wire:model.defer="permission.name" autocomplete="name"/>
33-
<x-jet-input-error for="permission.name" class="mt-2"/>
31+
<x-label for="name" value="{{ __('Permission name') }}"/>
32+
<x-input id="name" type="text" class="mt-1 block w-full" wire:model.defer="permission.name" autocomplete="name"/>
33+
<x-input-error for="permission.name" class="mt-2"/>
3434
</div>
3535
</x-slot>
3636
<x-slot name="actions">
37-
<x-jet-action-message class="mr-3" on="saved">
37+
<x-action-message class="mr-3" on="saved">
3838
{{ __('Saved.') }}
39-
</x-jet-action-message>
39+
</x-action-message>
4040

41-
<x-jet-button wire:loading.attr="disabled">
41+
<x-button wire:loading.attr="disabled">
4242
{{ __('Save') }}
43-
</x-jet-button>
43+
</x-button>
4444
</x-slot>
45-
</x-jet-form-section>
45+
</x-form-section>
4646
</div>

‎resources/views/user-ui/role.blade.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</h2>
1212
</x-slot>
1313
<div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
14-
<x-jet-form-section submit="updateRole">
14+
<x-form-section submit="updateRole">
1515
<x-slot name="title">
1616
{{ __('Role') }}
1717
</x-slot>
@@ -22,36 +22,36 @@
2222

2323
<x-slot name="form">
2424
<div class="col-span-6 sm:col-span-4">
25-
<x-jet-label for="name" value="{{ __('Role name') }}"/>
26-
<x-jet-input id="name" type="text" class="mt-1 block w-full" wire:model.defer="role.name" autocomplete="name"/>
27-
<x-jet-input-error for="role.name" class="mt-2"/>
25+
<x-label for="name" value="{{ __('Role name') }}"/>
26+
<x-input id="name" type="text" class="mt-1 block w-full" wire:model.defer="role.name" autocomplete="name"/>
27+
<x-input-error for="role.name" class="mt-2"/>
2828
</div>
2929
<div class="col-span-6 sm:col-span-4">
30-
<x-jet-label for="description" value="{{ __('Role description') }}"/>
31-
<x-jet-input id="description" type="text" class="mt-1 block w-full" wire:model.defer="role.description" autocomplete="description"/>
32-
<x-jet-input-error for="role.description" class="mt-2"/>
30+
<x-label for="description" value="{{ __('Role description') }}"/>
31+
<x-input id="description" type="text" class="mt-1 block w-full" wire:model.defer="role.description" autocomplete="description"/>
32+
<x-input-error for="role.description" class="mt-2"/>
3333
</div>
3434
</x-slot>
3535
<x-slot name="actions">
36-
<x-jet-action-message class="mr-3" on="saved">
36+
<x-action-message class="mr-3" on="saved">
3737
{{ __('Saved.') }}
38-
</x-jet-action-message>
38+
</x-action-message>
3939

40-
<x-jet-button wire:loading.attr="disabled" wire:target="photo">
40+
<x-button wire:loading.attr="disabled" wire:target="photo">
4141
{{ __('Save') }}
42-
</x-jet-button>
42+
</x-button>
4343
</x-slot>
44-
</x-jet-form-section>
45-
<x-jet-section-border/>
44+
</x-form-section>
45+
<x-section-border/>
4646
<div class="md:grid md:grid-cols-3 md:gap-6">
47-
<x-jet-section-title>
47+
<x-section-title>
4848
<x-slot name="title">
4949
{{ __('Permissions') }}
5050
</x-slot>
5151
<x-slot name="description">
5252
{{ __('These are the role specific permissions') }}
5353
</x-slot>
54-
</x-jet-section-title>
54+
</x-section-title>
5555
<div class="mt-5 md:mt-0 md:col-span-2">
5656
<div class="px-4 py-5 bg-white sm:p-6 shadow sm:rounded-md">
5757
@include('LLoadoutInforce-views::user-ui.access')

0 commit comments

Comments
 (0)