diff --git a/app/Http/Controllers/SashaAuthController.php b/app/Http/Controllers/SashaAuthController.php index c0120e3..e7e359e 100644 --- a/app/Http/Controllers/SashaAuthController.php +++ b/app/Http/Controllers/SashaAuthController.php @@ -97,10 +97,10 @@ public function handleCallback(Request $request) ]); Log::info("Se creo o actualizo un usuario"); - Activity::all(); - Auth::login($user); + Log::info(Auth::user()); + return redirect('/'); } } diff --git a/app/Models/User.php b/app/Models/User.php index 4cd6070..f535545 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -38,6 +38,9 @@ class User extends Authenticatable 'rol' ]; + public $incrementing = false; + protected $keyType = 'string'; + /** * The attributes that should be hidden for serialization. * diff --git a/resources/views/landig-page.blade.php b/resources/views/landig-page.blade.php index ce80b52..7edda40 100644 --- a/resources/views/landig-page.blade.php +++ b/resources/views/landig-page.blade.php @@ -1,7 +1,7 @@ @extends('templates.general') @section('content') - +@dd(Auth::check(), Auth::user());
@@ -41,4 +41,4 @@ class="w-full object-contain">
-@endsection +@endsection \ No newline at end of file diff --git a/resources/views/page-contact.blade.php b/resources/views/page-contact.blade.php index 125ee3f..f02b73f 100644 --- a/resources/views/page-contact.blade.php +++ b/resources/views/page-contact.blade.php @@ -1,4 +1,4 @@ -@extends('templates.students') +@extends('templates.general') @section('content') diff --git a/resources/views/templates/headers/student.blade.php b/resources/views/templates/headers/student.blade.php index 87361a9..fd2cf4a 100644 --- a/resources/views/templates/headers/student.blade.php +++ b/resources/views/templates/headers/student.blade.php @@ -1,35 +1,33 @@
- -
- - + +
+ + - -
- Logo S.A.R.A + +
+ Logo S.A.R.A +
-
- -
-
-

Pepito Perez

-

Grado: 1104

-

- Último inicio de sesión: DD/MM/AAAA -

+ +
+
+

{{Auth::user()->name}}

+

Grado: 1104

+

+ Último inicio de sesión: DD/MM/AAAA +

+
+ + Usuario
- - Usuario -
-
+ \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 7f6f3f8..5fe1d22 100644 --- a/routes/web.php +++ b/routes/web.php @@ -18,14 +18,14 @@ // Historial Route::get('/history/cordinadores', function () { return view('record-history'); -})->name('history');// coordinadores +})->name('history'); // coordinadores // Profesores login Route::get('/profesores', function () { return view('profesores'); })->name('profesores'); -// FAQ +// FAQ Route::get('/faq', function () { return view('faq'); })->name('faq'); @@ -37,7 +37,7 @@ // Consejos prácticos Route::get('/help/consejos', function () { - return view('advice_page'); + return view('advice_page'); })->name('consejos'); @@ -47,7 +47,7 @@ })->name('quienesomos'); // Contacto general -Route::get('/contact', function () { +Route::get('/contact', function () { return view('page-contact'); })->name('contact'); @@ -88,9 +88,17 @@ // Rutas para estudiantes -Route::get('/mockup', function () { - return view('students.mainstudent'); -})->name('mockup'); +Route::prefix('/estudiante')->group(function () { + Route::get('/', function () { + return view('students.mainstudent'); + })->name('student.home'); // estudiante/ + + Route::get('/chat', function () { + return view('students.mainstudent'); + })->name('student.chat'); +})->middleware(['auth', 'auth.session', 'web']); + + @@ -102,9 +110,15 @@ return view('developers.chat.interno_chat'); })->name('chat-sara'); + Route::get('/chatsara', function () { return view('developers.chat.externo_chat'); })->name('chat.sara'); + +// Historial +Route::get('/history/cordinadores', function () { + return view('record-history'); +})->name('history'); // coordinadores ///////////////////////////////////////////////////////////////////////////////////////////////////// Route::middleware(['auth'])->group(function () {