Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Http/Controllers/SashaAuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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('/');
}
}
3 changes: 3 additions & 0 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ class User extends Authenticatable
'rol'
];

public $incrementing = false;
protected $keyType = 'string';

/**
* The attributes that should be hidden for serialization.
*
Expand Down
4 changes: 2 additions & 2 deletions resources/views/landig-page.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@extends('templates.general')

@section('content')

@dd(Auth::check(), Auth::user());
<div class="bg-white min-h-screen flex items-center justify-center">

<main class="flex items-center justify-between w-11/12 max-w-7xl">
Expand Down Expand Up @@ -41,4 +41,4 @@ class="w-full object-contain">

</div>

@endsection
@endsection
2 changes: 1 addition & 1 deletion resources/views/page-contact.blade.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@extends('templates.students')
@extends('templates.general')

@section('content')

Expand Down
54 changes: 26 additions & 28 deletions resources/views/templates/headers/student.blade.php
Original file line number Diff line number Diff line change
@@ -1,35 +1,33 @@
<header class="bg-[#114D58] flex items-center justify-between px-6 py-0 shadow-md">

<!-- Logo + Menú -->
<div class="flex items-center gap-4">
<!-- Botón Menú Hamburguesa -->
<button class="flex flex-col gap-1.5 group cursor-pointer">
<span class="block w-8 h-1.5 bg-white rounded group-hover:bg-gray-200 transition-colors"></span>
<span class="block w-8 h-1.5 bg-white rounded group-hover:bg-gray-200 transition-colors"></span>
<span class="block w-8 h-1.5 bg-white rounded group-hover:bg-gray-200 transition-colors"></span>
</button>
<!-- Logo + Menú -->
<div class="flex items-center gap-4">
<!-- Botón Menú Hamburguesa -->
<button class="flex flex-col gap-1.5 group cursor-pointer">
<span class="block w-8 h-1.5 bg-white rounded group-hover:bg-gray-200 transition-colors"></span>
<span class="block w-8 h-1.5 bg-white rounded group-hover:bg-gray-200 transition-colors"></span>
<span class="block w-8 h-1.5 bg-white rounded group-hover:bg-gray-200 transition-colors"></span>
</button>

<!-- Logo -->
<div class="flex items-center gap-2 font-bold">
<img src="{{ asset('img/logo-sara-blanco.png') }}"
alt="Logo S.A.R.A"
class="h-20 w-auto">
<!-- Logo -->
<div class="flex items-center gap-2 font-bold">
<img src="{{ asset('img/logo-sara-blanco.png') }}" alt="Logo S.A.R.A" class="h-20 w-auto">
</div>
</div>
</div>

<!-- Info Usuario -->
<div class="flex items-center gap-3 text-right hover:bg-[#0d3c45] rounded-xl px-3 py-2 transition-colors cursor-pointer">
<div class="leading-tight">
<p class="font-bold text-white text-lg">Pepito Perez</p>
<p class="text-sm text-white">Grado: 1104</p>
<p class="text-xs text-white">
Último inicio de sesión: <span class="font-light">DD/MM/AAAA</span>
</p>
<!-- Info Usuario -->
<div
class="flex items-center gap-3 text-right hover:bg-[#0d3c45] rounded-xl px-3 py-2 transition-colors cursor-pointer">
<div class="leading-tight">
<p class="font-bold text-white text-lg">{{Auth::user()->name}}</p>
<p class="text-sm text-white">Grado: 1104</p>
<p class="text-xs text-white">
Último inicio de sesión: <span class="font-light">DD/MM/AAAA</span>
</p>
</div>
<!-- Avatar -->
<img src="https://i.pravatar.cc/100" alt="Usuario"
class="w-12 h-12 rounded-full border-2 border-white shadow-md hover:scale-105 transition-transform">
</div>
<!-- Avatar -->
<img src="https://i.pravatar.cc/100"
alt="Usuario"
class="w-12 h-12 rounded-full border-2 border-white shadow-md hover:scale-105 transition-transform">
</div>

</header>
</header>
28 changes: 21 additions & 7 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -37,7 +37,7 @@

// Consejos prácticos
Route::get('/help/consejos', function () {
return view('advice_page');
return view('advice_page');
})->name('consejos');


Expand All @@ -47,7 +47,7 @@
})->name('quienesomos');

// Contacto general
Route::get('/contact', function () {
Route::get('/contact', function () {
return view('page-contact');
})->name('contact');

Expand Down Expand Up @@ -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']);





Expand All @@ -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 () {
Expand Down
Loading