Merge: integrar cambios del trabajo con chat en tiempo real

resources/views/layouts/_partials/header.blade.php

@@ -146,7 +146,13 @@
                 <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button"
                     data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="mr-2 d-none d-lg-inline text-gray-600 small">{{ Auth::user()->name }}</span>
+<<<<<<< Updated upstream
                     <img class="img-profile rounded-circle" src="{{ Auth::user()->profile_photo_url }}">
+=======
+                        {{-- <img class="img-profile rounded-circle"
+                            src="{{ Auth::user()->profile_photo_url }}"
+                            alt="{{ Auth::user()->name }}"> --}}
+>>>>>>> Stashed changes
                 </a>
                 <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in"
                     aria-labelledby="userDropdown">

resources/views/layouts/_partials/menu.blade.php

@@ -4,9 +4,8 @@
         <!-- Sidebar - Brand -->
         <a class="sidebar-brand d-flex align-items-center justify-content-center" href="">
             <div class="sidebar-brand-icon">
-        <img src="https://1000marcas.net/wp-content/uploads/2020/03/logo-Xbox.png" alt="SECUIEP Logo" style="width: 40px; height: auto;">
+        <img src="https://alumnos.sistemasecuiep.com/logo.png" alt="SECUIEP Logo" style="width: 100px; height: auto;">
     </div>
-            <div class="sidebar-brand-text mx-3">SECUIEP</div>
         </a>
         <!-- Divider -->
         <hr class="sidebar-divider my-0">