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

2025-05-07 00:21:14 +02:00
parent 655ea60d6b f97a7a8498
commit 19fa52ca65
11 changed files with 378 additions and 0 deletions
--- a/resources/views/livewire/user-table.blade.php
+++ b/resources/views/livewire/user-table.blade.php
@@ -75,7 +75,11 @@
                                    <!-- Foto del usuario -->
                                    @if($user->profile_photo_path)
                                        <div class="mr-3 flex-shrink-0">
+<<<<<<< HEAD
                                            <img src="{{ asset('storage/' . $user->profile_photo_path) }}" 
+=======
+                                            <img src="{{ asset($user->profile_photo_path) }}" 
+>>>>>>> f97a7a84985ea300216ba3ea2ab4c31306e1659a
                                                 alt="{{ $user->full_name }}"
                                                 class="w-8 h-8 rounded-full object-cover transition-transform group-hover:scale-110">
                                        </div>