fix: resolver conflicto de merge en header y agregar CSRF token a axios
- Resuelve marcadores de conflicto dejados en header.blade.php - Agrega X-CSRF-TOKEN a los headers por defecto de axios (evita 419 en endpoints de notificaciones) - Rebuild de assets de Vite Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -146,13 +146,11 @@
|
||||
<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"
|
||||
|
||||
{{-- <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
|
||||
alt="{{ Auth::user()->name }}">
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-right shadow animated--grow-in"
|
||||
aria-labelledby="userDropdown">
|
||||
|
||||
Reference in New Issue
Block a user