Mas ajustes de estilos y iconos

resources/views/components/icons/arrow-left.blade.php

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M5 12l14 0"/>
+    <path d="M5 12l6 6"/>
+    <path d="M5 12l6 -6"/>
+</svg>

resources/views/components/icons/cash.blade.php

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M7 9m0 2a2 2 0 0 1 2 -2h10a2 2 0 0 1 2 2v6a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2 -2z"/>
+    <path d="M14 14m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0"/>
+    <path d="M17 9v-2a2 2 0 0 0 -2 -2h-10a2 2 0 0 0 -2 2v6a2 2 0 0 0 2 2h2"/>
+</svg>

resources/views/components/icons/credit-card.blade.php

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M3 5m0 3a3 3 0 0 1 3 -3h12a3 3 0 0 1 3 3v8a3 3 0 0 1 -3 3h-12a3 3 0 0 1 -3 -3z"/>
+    <path d="M3 10l18 0"/>
+    <path d="M7 15l.01 0"/>
+    <path d="M11 15l2 0"/>
+</svg>

resources/views/components/icons/currency-dollar.blade.php

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M16.7 8a3 3 0 0 0 -2.7 -2h-4a3 3 0 0 0 0 6h4a3 3 0 0 1 0 6h-4a3 3 0 0 1 -2.7 -2"/>
+    <path d="M12 3v3m0 12v3"/>
+</svg>

resources/views/components/icons/device-floppy.blade.php

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M6 4h10l4 4v10a2 2 0 0 1 -2 2h-12a2 2 0 0 1 -2 -2v-12a2 2 0 0 1 2 -2"/>
+    <path d="M12 14m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0"/>
+    <path d="M14 4l0 4l-6 0l0 -4"/>
+</svg>

resources/views/components/icons/edit.blade.php

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M7 7h-1a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-1"/>
+    <path d="M20.385 6.585a2.1 2.1 0 0 0 -2.97 -2.97l-8.415 8.385v3h3l8.385 -8.415z"/>
+    <path d="M16 5l3 3"/>
+</svg>

resources/views/components/icons/home.blade.php

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M5 12l-2 0l9 -9l9 9l-2 0"/>
+    <path d="M5 12v7a2 2 0 0 0 2 2h10a2 2 0 0 0 2 -2v-7"/>
+    <path d="M9 21v-6a2 2 0 0 1 2 -2h2a2 2 0 0 1 2 2v6"/>
+</svg>

resources/views/components/icons/minus.blade.php

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M5 12l14 0"/>
+</svg>

resources/views/components/icons/plus-minus.blade.php

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M4 7h6"/>
+    <path d="M7 4v6"/>
+    <path d="M20 18h-6"/>
+    <path d="M5 19l14 -14"/>
+</svg>

resources/views/components/icons/plus.blade.php

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M12 5l0 14"/>
+    <path d="M5 12l14 0"/>
+</svg>

resources/views/components/icons/report.blade.php

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M8 5h-2a2 2 0 0 0 -2 2v12a2 2 0 0 0 2 2h5.697"/>
+    <path d="M18 14v4h4"/>
+    <path d="M18 11v-4a2 2 0 0 0 -2 -2h-2"/>
+    <path d="M8 3m0 2a2 2 0 0 1 2 -2h2a2 2 0 0 1 2 2v0a2 2 0 0 1 -2 2h-2a2 2 0 0 1 -2 -2z"/>
+    <path d="M18 18m-4 0a4 4 0 1 0 8 0a4 4 0 1 0 -8 0"/>
+    <path d="M8 11h4"/>
+    <path d="M8 15h3"/>
+</svg>

resources/views/components/icons/settings.blade.php

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path
+        d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z"/>
+    <path d="M9 12a3 3 0 1 0 6 0a3 3 0 0 0 -6 0"/>
+</svg>

resources/views/components/icons/trash.blade.php

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    {{$attributes}}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path d="M4 7l16 0"/>
+    <path d="M10 11l0 6"/>
+    <path d="M14 11l0 6"/>
+    <path d="M5 7l1 12a2 2 0 0 0 2 2h8a2 2 0 0 0 2 -2l1 -12"/>
+    <path d="M9 7v-3a1 1 0 0 1 1 -1h4a1 1 0 0 1 1 1v3"/>
+</svg>

resources/views/components/navbar.blade.php

@@ -24,15 +24,15 @@
             </div>
         </div>
     </div>
-
+    <div class="container mx-auto">
-    <div class="border-b">
+        <ul class="menu lg:menu-horizontal">
-        <nav class="container mx-auto flex flex-col sm:h-14 sm:flex-row sm:px-4">
+            <x-navlink icon="home" :route="route('home.index')" :active="Route::is('home.*')"
-            <x-navlink icon="home" :route="route('home.index')" :active="Route::is('home.*')" title="Inicio"/>
+                       title="Inicio"/>
             <x-navlink icon="cash" :route="route('cajas.index')" :active="Route::is('cajas.*')" title="Cajas"/>
             <x-navlink icon="report" :route="route('reportes.index')" :active="Route::is('reportes.*')"
                        title="Reportes"/>
             <x-navlink icon="settings" :route="route('configuracion.index')" :active="Route::is('configuracion.*')"
                        title="Configuración"/>
-        </nav>
+        </ul>
     </div>
 </div>

resources/views/components/navlink.blade.php

@@ -3,11 +3,10 @@
         $active = false;
     }
 @endphp
-<a class="{{ $active
+
-    ? 'bg-primary text-white hover:bg-primary-600 active:bg-primary-700'
+<li>
-    : 'text-secondary-600 hover:bg-secondary-50 active:bg-secondary-100' }}
+    <a href="{{ $route }}" wire:navigate class="{{$active ? 'active' : ''}}">
-    flex items-center gap-1 px-4 py-2 text-sm"
+        <x-dynamic-component :component="'icons.'.$icon" class="w-5 h-5"/>
-   href="{{ $route }}" wire:navigate>
+        {{$title}}
-    <i class="ti ti-{{$icon}} text-xl"></i>
+    </a>
-    <span>{{ $title }}</span>
+</li>
-</a>

resources/views/livewire/cajas/components/calculo-fondo-component.blade.php

@@ -18,10 +18,10 @@
 
         <button class="btn" type="submit">
             @if($this->currentCalculo)
-                <i class="ti ti-device-floppy text-lg"></i>
+                <x-icons.device-floppy/>
                 Guardar
             @else
-                <i class="ti ti-plus text-lg"></i>
+                <x-icons.plus/>
                 Agregar
             @endif
         </button>
@@ -51,10 +51,10 @@
                     <td>{{$row->descripcion}}</td>
                     <td class="w-0 whitespace-nowrap">
                         <button class="btn btn-circle btn-sm" wire:click="edit('{{$row->id}}')">
-                            <i class="ti ti-edit"></i>
+                            <x-icons.edit class="w-5 h-5"/>
                         </button>
                         <button class="btn btn-circle btn-error btn-sm" wire:click="confirmDelete('{{$row->id}}')">
-                            <i class="ti ti-trash"></i>
+                            <x-icons.trash class="w-5 h-5"/>
                         </button>
                     </td>
                 </tr>

resources/views/livewire/cajas/components/documentos-component.blade.php

@@ -27,10 +27,10 @@
 
         <button class="btn" type="submit">
             @if($this->currentDocumento)
-                <i class="ti ti-device-floppy text-lg"></i>
+                <x-icons.device-floppy/>
                 Guardar
             @else
-                <i class="ti ti-plus text-lg"></i>
+                <x-icons.plus/>
                 Agregar
             @endif
         </button>
@@ -65,10 +65,10 @@
                     <td>{{Number::currency($row->valor)}}</td>
                     <td class="w-0 whitespace-nowrap">
                         <button class="btn btn-circle btn-sm" wire:click="edit('{{$row->id}}')">
-                            <i class="ti ti-edit"></i>
+                            <x-icons.edit class="w-5 h-5"/>
                         </button>
                         <button class="btn btn-circle btn-error btn-sm" wire:click="confirmDelete('{{$row->id}}')">
-                            <i class="ti ti-trash"></i>
+                            <x-icons.trash class="w-5 h-5"/>
                         </button>
                     </td>
                 </tr>

resources/views/livewire/cajas/components/egresos-component.blade.php

@@ -32,10 +32,10 @@
 
         <button class="btn" type="submit">
             @if($this->currentEgreso)
-                <i class="ti ti-device-floppy text-lg"></i>
+                <x-icons.device-floppy/>
                 Guardar
             @else
-                <i class="ti ti-plus text-lg"></i>
+                <x-icons.plus/>
                 Agregar
             @endif
         </button>
@@ -75,10 +75,10 @@
                     <td>{{Number::currency($row->valor)}}</td>
                     <td class="w-0 whitespace-nowrap">
                         <button class="btn btn-circle btn-sm" wire:click="edit('{{$row->id}}')">
-                            <i class="ti ti-edit"></i>
+                            <x-icons.edit class="w-5 h-5"/>
                         </button>
                         <button class="btn btn-circle btn-error btn-sm" wire:click="confirmDelete('{{$row->id}}')">
-                            <i class="ti ti-trash"></i>
+                            <x-icons.trash class="w-5 h-5"/>
                         </button>
                     </td>
                 </tr>

resources/views/livewire/cajas/components/ingresos-component.blade.php

@@ -32,10 +32,10 @@
 
         <button class="btn " type="submit">
             @if($this->currentIngreso)
-                <i class="ti ti-device-floppy text-lg"></i>
+                <x-icons.device-floppy/>
                 Guardar
             @else
-                <i class="ti ti-plus text-lg"></i>
+                <x-icons.plus/>
                 Agregar
             @endif
         </button>
@@ -75,10 +75,10 @@
                     <td>{{Number::currency($row->total)}}</td>
                     <td class="w-0 whitespace-nowrap">
                         <button class="btn btn-circle btn-sm" wire:click="edit('{{$row->id}}')">
-                            <i class="ti ti-edit"></i>
+                            <x-icons.edit class="w-5 h-5"/>
                         </button>
                         <button class="btn btn-circle btn-error btn-sm" wire:click="confirmDelete('{{$row->id}}')">
-                            <i class="ti ti-trash"></i>
+                            <x-icons.trash class="w-5 h-5"/>
                         </button>
                     </td>
                 </tr>

resources/views/livewire/cajas/edit.blade.php

@@ -6,7 +6,7 @@
         </x-title>
 
         <button class="btn" wire:navigate href="{{route('cajas.index')}}">
-            <i class="ti ti-arrow-left"></i>
+            <x-icons.arrow-left/>
             Volver
         </button>
     </div>
@@ -31,31 +31,31 @@
                 <button role="tab" class="tab gap-2"
                         :class="tab === 'Ingresos' ? 'tab-active' : ''"
                         @click="tab = 'Ingresos'">
-                    <i class="ti ti-plus"></i>
+                    <x-icons.plus class="w-5 h-5"/>
                     Ingresos
                 </button>
                 <button role="tab" class="tab gap-2"
                         :class="tab === 'Egresos' ? 'tab-active' : ''"
                         @click="tab = 'Egresos'">
-                    <i class="ti ti-minus"></i>
+                    <x-icons.minus class="w-5 h-5"/>
                     Egresos
                 </button>
                 <button role="tab" class="tab gap-2"
                         :class="tab === 'Documentos' ? 'tab-active' : ''"
                         @click="tab = 'Documentos'">
-                    <i class="ti ti-credit-card"></i>
+                    <x-icons.credit-card class="w-5 h-5"/>
                     Documentos
                 </button>
                 <button role="tab" class="tab gap-2"
                         :class="tab === 'Calculo de Fondo' ? 'tab-active' : ''"
                         @click="tab = 'Calculo de Fondo'">
-                    <i class="ti ti-plus-minus"></i>
+                    <x-icons.plus-minus class="w-5 h-5"/>
                     Calculo de Fondo
                 </button>
                 <button role="tab" class="tab gap-2"
                         :class="tab === 'Efectivo' ? 'tab-active' : ''"
                         @click="tab = 'Efectivo'">
-                    <i class="ti ti-currency-dollar"></i>
+                    <x-icons.currency-dollar class="w-5 h-5"/>
                     Efectivo
                 </button>
             </div>

resources/views/livewire/cajas/index.blade.php

@@ -3,7 +3,10 @@
 
     <div class="flex flex-col sm:flex-row gap-2 justify-between items-baseline mb-4">
         <x-title>Cajas</x-title>
-        <button class="btn" wire:click="createTurno" icon="plus">Registrar Caja</button>
+        <button class="btn" wire:click="createTurno">
+            <x-icons.plus/>
+            Registrar Caja
+        </button>
     </div>
 
     <div class="flex mb-4">
@@ -34,10 +37,10 @@
                     <td class="{{$row->arqueo >= 0 ? 'text-green-500' : 'text-red-500'}}">{{Number::currency($row->arqueo)}}</td>
                     <td class="w-0 whitespace-nowrap">
                         <a class="btn btn-circle btn-sm" wire:navigate href="{{route('cajas.edit', $row->id)}}">
-                            <i class="ti ti-edit"></i>
+                            <x-icons.edit class="w-5 h-5"/>
                         </a>
                         <button class="btn btn-circle btn-error btn-sm" wire:click="confirmDelete('{{$row->id}}')">
-                            <i class="ti ti-trash"></i>
+                            <x-icons.trash class="w-5 h-5"/>
                         </button>
                     </td>
                 </tr>

resources/views/livewire/usuarios/edit.blade.php

@@ -8,29 +8,65 @@
     </div>
 
     <form wire:submit.prevent="save">
-        <x-card class="space-y-4">
+        <label class="form-control">
-            <x-input label="Nombre" wire:model="name"/>
+            <div class="label">
-            <x-input label="Correo Electrónico" wire:model="email"/>
+                <span class="label-text">Nombre</span>
-            <x-select.styled label="Roles" :options="$this->availableRoles" select="label:title|value:id" multiple
+            </div>
-                             wire:model="roles"/>
+            <input class="input input-bordered" wire:model="name"/>
+        </label>
 
-            @if($this->user)
+        <label class="form-control">
-                <x-checkbox label="Cambiar contraseña" wire:model.live="change_password"/>
+            <div class="label">
-            @endif
+                <span class="label-text">Correo Electrónico</span>
+            </div>
+            <input type="email" class="input input-bordered" wire:model="email"/>
+        </label>
 
-            @if(!$this->user || $change_password)
-                <x-password label="Contraseña" wire:model="password"/>
-                <x-password label="Confirmación de la contraseña" wire:model="password_confirmation"/>
-            @endif
 
-            <x-slot:footer>
+        <label class="form-control">
-                <x-button wire:navigate :href="route('usuarios.index')" icon="arrow-left" color="secondary">
+            <div class="label">
-                    Volver
+                <span class="label-text">Roles</span>
-                </x-button>
+            </div>
-                <x-button type="submit" icon="plus">
+            <select class="select select-bordered" required wire:model="roles" multiple>
-                    Guardar
+                @foreach($this->availableRoles as $role)
-                </x-button>
+                    <option value="{{$role->id}}">{{$role->title}}</option>
-            </x-slot:footer>
+                @endforeach
-        </x-card>
+            </select>
+        </label>
+
+        @if($this->user)
+            <div class="form-control">
+                <label class="label cursor-pointer w-0 whitespace-nowrap space-x-4">
+                    <span class="label-text">Cambiar contraseña</span>
+                    <input type="checkbox" class="toggle" wire:model.live="change_password"/>
+                </label>
+            </div>
+        @endif
+
+        @if(!$this->user || $change_password)
+            <label class="form-control">
+                <div class="label">
+                    <span class="label-text">Contraseña</span>
+                </div>
+                <input type="password" class="input input-bordered" wire:model="password"/>
+            </label>
+            <label class="form-control">
+                <div class="label">
+                    <span class="label-text">Confirmación de la contraseña</span>
+                </div>
+                <input type="password" class="input input-bordered" wire:model="password_confirmation"/>
+            </label>
+        @endif
+
+        <div class="flex justify-end gap-2 mt-4">
+            <a wire:navigate href="{{route('usuarios.index')}}" class="btn">
+                <x-icons.arrow-left/>
+                Volver
+            </a>
+            <button type="submit" class="btn btn-primary">
+                <x-icons.plus/>
+                Guardar
+            </button>
+        </div>
     </form>
 </div>

resources/views/livewire/usuarios/index.blade.php

@@ -6,7 +6,7 @@
 
         @can('create', User::class)
             <button class="btn" href="{{route('usuarios.create')}}" wire:navigate>
-                <i class="ti ti-plus text-lg"></i>
+                <x-icons.plus/>
                 Registrar Usuario
             </button>
         @endcan
@@ -29,10 +29,10 @@
                     <td>{{$row->email}}</td>
                     <td class="w-0 whitespace-nowrap">
                         <a class="btn btn-circle btn-sm" wire:navigate href="{{route('usuarios.edit', $row->id)}}">
-                            <i class="ti ti-edit"></i>
+                            <x-icons.edit class="w-5 h-5"/>
                         </a>
                         <button class="btn btn-circle btn-error btn-sm" wire:click="confirmDelete('{{$row->id}}')">
-                            <i class="ti ti-trash"></i>
+                            <x-icons.trash class="w-5 h-5"/>
                         </button>
                     </td>
                 </tr>

tailwind.config.js

@@ -58,7 +58,6 @@ export default {
         ],
     },
     plugins: [
-        require('@tailwindcss/forms'),
         require('@tailwindcss/typography'),
         require('daisyui'),
     ],