fernando/Sistema-Educativo-Laravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolver conflicto de merge en header y agregar CSRF token a axios

Browse Source 
- 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:
unknown
2026-04-28 16:52:30 -06:00
parent b469b884f5
commit e2ebbf38c5
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/build/assets/app-4EiGmH4n.js → public/build/assets/app-DAN06vjJ.js
+7 -7
View File
File diff suppressed because one or more lines are too long
public/build/manifest.json
+1 -1
View File
@@ -9,7 +9,7 @@
] ]
}, },
"resources/js/app.js": { "resources/js/app.js": {
"file": "assets/app-4EiGmH4n.js", "file": "assets/app-DAN06vjJ.js",
"name": "app", "name": "app",
"src": "resources/js/app.js", "src": "resources/js/app.js",
"isEntry": true "isEntry": true
resources/js/bootstrap.js
Vendored
+5
View File
@@ -4,4 +4,9 @@ window.axios = axios;
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
const csrfToken = document.querySelector('meta[name="csrf-token"]')?.getAttribute('content');
if (csrfToken) {
window.axios.defaults.headers.common['X-CSRF-TOKEN'] = csrfToken;
}
import './echo'; import './echo';
resources/views/layouts/_partials/header.blade.php
+4 -6
View File
@@ -146,13 +146,11 @@
<a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 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> <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 }}"> --}}
======= <img class="img-profile rounded-circle"
{{-- <img class="img-profile rounded-circle"
src="{{ Auth::user()->profile_photo_url }}" src="{{ Auth::user()->profile_photo_url }}"
alt="{{ Auth::user()->name }}"> --}} alt="{{ Auth::user()->name }}">
>>>>>>> Stashed changes
</a> </a>
<div class="dropdown-menu dropdown-menu-right shadow animated--grow-in" <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in"
aria-labelledby="userDropdown"> aria-labelledby="userDropdown">