Merge branch 'main' of https://homehud.duckdns.org/javier/Nexora

resources/views/users/create.blade.php

@@ -291,12 +291,21 @@
                             </td>
                             <td class="py-2">
                                 <div class="mb-6">
+<<<<<<< HEAD
                                     @livewire('image-uploader', [
                                         'fieldName' => 'image_path', // Nombre del campo en la BD
                                         'label' => 'Imagen principal' // Etiqueta personalizada
                                     ])
                                     <!-- Campo oculto para la ruta de la imagen -->
                                     <input type="hidden" name="profile_photo_path" id="profilePhotoPathInput" value="{{ old('profile_photo_path', $user->profile_photo_path) }}">
+=======
+
+                                    @livewire('image-uploader', [
+                                        'fieldName' => 'profile_photo_path',
+                                        'currentImage' => $user->profile_photo_path ?? null,
+                                        'placeholder' => asset('images/default-user.png')
+                                    ])
+>>>>>>> f97a7a84985ea300216ba3ea2ab4c31306e1659a
                                 </div>
                             </td>
                         </tr>php
@@ -317,6 +326,7 @@
 
         
     <script>
+<<<<<<< HEAD
         // Escuchar el evento de Livewire y actualizar el campo oculto
         document.addEventListener('imageUploaded', (event) => {
             document.getElementById('profilePhotoPathInput').value = event.detail.path;
@@ -326,6 +336,8 @@
             document.getElementById('profilePhotoPathInput').value = '';
         });
 
+=======
+>>>>>>> f97a7a84985ea300216ba3ea2ab4c31306e1659a
         function generatePassword() {
                 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()';
                 let password = '';