Refactor nav-item.blade.php for improved readability

laraxot · Feb 5, 2024 · 75b0050 · 75b0050
1 parent a4eeb90
commit 75b0050
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/Resources/views/components/nav-item.blade.php b/Resources/views/components/nav-item.blade.php
@@ -24,12 +24,18 @@
                 </button>
             @endif
 
+<<<<<<< HEAD
             <button type="button" @if (!$disableRecordEdit) wire:click="editItem('{{ $statePath }}')" wire:loading.attr="disabled" @endif
                 class="appearance-none px-3 py-2 text-left">
                 <div style="float:left;">
                     <span>{{ $item['label'] }}</span>
                     <div wire:loading wire:target="editItem('{{ $statePath }}')"> @svg('heroicon-o-arrow-path', 'w-3 h-3 text-blue-500 hover:text-blue-900 animate-spin') </div>
                 </div>
+=======
+            <button type="button" @if (!$disableRecordEdit) wire:click="editItem('{{ $statePath }}')" @endif
+                class="appearance-none px-3 py-2 text-left">
+                <span>{{ $item['label'] }}</span>
+>>>>>>> 5e954a5 (.)
             </button>
 
             @if (count($item['children']) > 0)
@@ -54,25 +60,39 @@ class="appearance-none text-gray-500">
         ])>
 
             @if (!$disableNewChildRecordCreation)
+<<<<<<< HEAD
                 <button wire:loading.remove wire:target="addChild('{{ $statePath }}')" x-init x-tooltip.raw.duration.0="{{ __('ui::filament-navigation.items.add-child') }}"
+=======
+                <button x-init x-tooltip.raw.duration.0="{{ __('ui::filament-navigation.items.add-child') }}"
+>>>>>>> 5e954a5 (.)
                     type="button" wire:click="addChild('{{ $statePath }}')" class="p-1"
                     title="{{ __('ui::filament-navigation.items.add-child') }}">
                     @svg('heroicon-o-plus', 'w-3 h-3 text-gray-500 hover:text-gray-900')
                 </button>
+<<<<<<< HEAD
                 <button wire:loading wire:target="addChild('{{ $statePath }}')" type="button" class="p-1">
                     @svg('heroicon-o-arrow-path', 'w-3 h-3 text-blue-500 hover:text-blue-900 animate-spin')
                 </button>
             @endif
 
             @if (!$disableRecordDeletion)
                 <button wire:loading.remove wire:target="removeItem('{{ $statePath }}')" x-init x-tooltip.raw.duration.0="{{ __('ui::filament-navigation.items.remove') }}"
+=======
+            @endif
+
+            @if (!$disableRecordDeletion)
+                <button x-init x-tooltip.raw.duration.0="{{ __('ui::filament-navigation.items.remove') }}"
+>>>>>>> 5e954a5 (.)
                     type="button" wire:click="removeItem('{{ $statePath }}')" class="p-1"
                     title="{{ __('ui::filament-navigation.items.remove') }}">
                     @svg('heroicon-o-trash', 'w-3 h-3 text-danger-500 hover:text-danger-900')
                 </button>
+<<<<<<< HEAD
                 <button wire:loading wire:target="removeItem('{{ $statePath }}')" type="button" class="p-1">
                     @svg('heroicon-o-arrow-path', 'w-3 h-3 text-blue-500 hover:text-blue-900 animate-spin')
                 </button>
+=======
+>>>>>>> 5e954a5 (.)
             @endif
         </div>
     </div>