diff --git a/app/Actions/Fortify/UpdateUserProfileInformation.php b/app/Actions/Fortify/UpdateUserProfileInformation.php index 9738772d..7bd2ea36 100644 --- a/app/Actions/Fortify/UpdateUserProfileInformation.php +++ b/app/Actions/Fortify/UpdateUserProfileInformation.php @@ -19,6 +19,8 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation { Validator::make($input, [ 'name' => ['required', 'string', 'max:255'], + 'apellidoPaterno' => ['nullable', 'string', 'max:255'], + 'apellidoMaterno' => ['nullable', 'string', 'max:255'], 'email' => ['required', 'email', 'max:255', Rule::unique('users')->ignore($user->id)], 'photo' => ['nullable', 'mimes:jpg,jpeg,png', 'max:1024'], ])->validateWithBag('updateProfileInformation'); @@ -33,6 +35,8 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation } else { $user->forceFill([ 'name' => $input['name'], + 'apellidoPaterno' => $input['apellidoPaterno'], + 'apellidoMaterno' => $input['apellidoMaterno'], 'email' => $input['email'], ])->save(); } diff --git a/app/Models/User.php b/app/Models/User.php index 6ff10307..364f86e6 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -24,6 +24,7 @@ class User extends Authenticatable use Notifiable; use TwoFactorAuthenticatable; use HasRoles; + use HasProfilePhoto; protected $fillable = [ 'name', diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 4f2a1b73..4fb68fec 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -386,3 +386,4 @@ transform:translateY(0); } /* carrusel */ + diff --git a/resources/views/layouts/_partials/header.blade.php b/resources/views/layouts/_partials/header.blade.php index cfd9836d..78476a8c 100644 --- a/resources/views/layouts/_partials/header.blade.php +++ b/resources/views/layouts/_partials/header.blade.php @@ -146,7 +146,13 @@
diff --git a/resources/views/layouts/_partials/menu.blade.php b/resources/views/layouts/_partials/menu.blade.php index e6cf6b6f..feed5e4e 100644 --- a/resources/views/layouts/_partials/menu.blade.php +++ b/resources/views/layouts/_partials/menu.blade.php @@ -4,9 +4,8 @@
- SECUIEP Logo + SECUIEP Logo
-
SECUIEP
diff --git a/resources/views/profile/logout-other-browser-sessions-form.blade.php b/resources/views/profile/logout-other-browser-sessions-form.blade.php index d0efdf29..e286d892 100644 --- a/resources/views/profile/logout-other-browser-sessions-form.blade.php +++ b/resources/views/profile/logout-other-browser-sessions-form.blade.php @@ -1,98 +1,99 @@ - - - {{ __('Browser Sessions') }} - +
+ + + - - {{ __('Manage and log out your active sessions on other browsers and devices.') }} - + - -
- {{ __('If necessary, you may log out of all of your other browser sessions across all of your devices. Some of your recent sessions are listed below; however, this list may not be exhaustive. If you feel your account has been compromised, you should also update your password.') }} -
+

+ Si es necesario, puedes cerrar sesión en todos los demás dispositivos. Si crees que tu cuenta fue comprometida, también deberías actualizar tu contraseña. +

- @if (count($this->sessions) > 0) -
- - @foreach ($this->sessions as $session) -
-
- @if ($session->agent->isDesktop()) - - - - @else - - - - @endif -
- -
-
- {{ $session->agent->platform() ? $session->agent->platform() : __('Unknown') }} - {{ $session->agent->browser() ? $session->agent->browser() : __('Unknown') }} + @if (count($this->sessions) > 0) +
+ @foreach ($this->sessions as $session) +
+
+ @if ($session->agent->isDesktop()) + + @else + + @endif
-
-
+
+ {{ $session->agent->platform() ?: 'Desconocido' }} + — + {{ $session->agent->browser() ?: 'Desconocido' }} +
+
{{ $session->ip_address }}, - @if ($session->is_current_device) - {{ __('This device') }} + Este dispositivo @else - {{ __('Last active') }} {{ $session->last_active }} + Última actividad: {{ $session->last_active }} @endif
-
- @endforeach -
- @endif + @endforeach +
+ @endif -
- - {{ __('Log Out Other Browser Sessions') }} - + - - {{ __('Done.') }} - -
- - - - - {{ __('Log Out Other Browser Sessions') }} - - - - {{ __('Please enter your password to confirm you would like to log out of your other browser sessions across all of your devices.') }} - -
- + + + + +
+ +
diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index 0fa19494..06eecb13 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -1,247 +1,213 @@ @extends('layouts.landing') -@section('title',"Editar") +@section('title', 'Mi perfil') @section('content') + + + @hasrole('Alumno')
- {{-- Card editar grupo --}}
+
-
Editar grupo
- - Regresar - -
-
+
Expediente
-
- @if (session('info')) -
- {{session('info')}} -
- @endif -
- @method('PUT') - @csrf -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- - -
-
-
- - {{-- Card Materias y Docentes --}} -
-
-
-
Materias
- @can('grupo.create') - - @endcan + @endrole
- @if (session('infogrupo')) -
- {{session('infogrupo')}} -
- @endif -
- - - - - - - - - - - - @forelse ($grupo->plan->carreraRel->carreraMaterial as $material) - @php - $docenteAsignado = $grupo->docentes->firstWhere('pivot.materia_id', $material->id); - $usr = $docenteAsignado?->docentes->first(); - @endphp - - - - - - - - @empty - - @endforelse - -
IdCicloNombre de la materiaDocenteDocente asignado
{{ $material->id }}{{ $material->ciclo }}{{ $material->name }}{{ $usr?->name }} {{ $usr?->apellidoPaterno ?? 'Sin docente' }} - @if($docenteAsignado) - @can('grupo.destroy') -
- @csrf - @method('DELETE') - - -
- @endcan - @endif -
Sin materias en este plan.
-
- + + +
- {{-- Card Alumnos --}} +
+ + @endrole + + +
+
-
Alumnos
- @can('grupo.create') - - @endcan +
Mis Datos
-
- - - - - - - - - - @forelse ($grupo->alumnos as $alumno) - - - - - - @empty - - @endforelse - -
IdNombreOpciones
{{$alumno->id}} - {{$alumno->usuario->first()?->name}} - {{$alumno->usuario->first()?->apellidoPaterno}} - {{$alumno->usuario->first()?->apellidoMaterno}} - - @can('grupo.destroy') -
- @csrf - @method('DELETE') - - -
- @endcan -
Sin alumnos.
-
- + + @livewire('profile.update-profile-information-form') +
+ +
+ + +
+
+ +
+
+
Contraseña
+
+
+ +
+ @livewire('profile.update-password-form') + +
+
+ +
+ +
+
+ +
+
+
Sesiones activas
+
+
+ +
+ @livewire('profile.logout-other-browser-sessions-form') + +
+
+ +
+ + @endsection @section('scripts') - @include('layouts._partials.tablaScript') - @include('layouts._partials.delete') + + + + + diff --git a/resources/views/profile/update-password-form.blade.php b/resources/views/profile/update-password-form.blade.php index fc1ebf7f..10d3a032 100644 --- a/resources/views/profile/update-password-form.blade.php +++ b/resources/views/profile/update-password-form.blade.php @@ -1,39 +1,37 @@ - - {{ __('Update Password') }} - - - - {{ __('Ensure your account is using a long, random password to stay secure.') }} - + + -
- - - +
+ + +
-
- - - +
+ + +
-
- - - +
+ + +
- - {{ __('Saved.') }} - - - - {{ __('Save') }} - + diff --git a/resources/views/profile/update-profile-information-form.blade.php b/resources/views/profile/update-profile-information-form.blade.php index bb668854..37950cf8 100644 --- a/resources/views/profile/update-profile-information-form.blade.php +++ b/resources/views/profile/update-profile-information-form.blade.php @@ -1,95 +1,137 @@ - {{ __('Profile Information') }} + {{ __('Información de perfil') }} - {{ __('Update your account\'s profile information and email address.') }} + {{ __('Actualice la información de su cuenta y dirección de correo electrónico.') }} - - @if (Laravel\Jetstream\Jetstream::managesProfilePhotos()) -
- - +
+
- - -
- {{ $this->user->name }} + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + + + @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::emailVerification()) && ! $this->user->hasVerifiedEmail()) +

+ Tu dirección de correo no está verificada. + +

+ + @if ($this->verificationLinkSent) +

+ + Se envió un nuevo enlace de verificación a tu correo. +

+ @endif + @endif +
+
- - - @endif - - -
- - - -
- - -
- - - - - @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::emailVerification()) && ! $this->user->hasVerifiedEmail()) -

- {{ __('Your email address is unverified.') }} - - -

- - @if ($this->verificationLinkSent) -

- {{ __('A new verification link has been sent to your email address.') }} -

- @endif - @endif
- - {{ __('Saved.') }} - - - {{ __('Save') }} - + + + + + + + diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php index dd23ba54..bd62ee12 100644 --- a/resources/views/user/index.blade.php +++ b/resources/views/user/index.blade.php @@ -37,7 +37,7 @@ @forelse ($users as $user) {{$user->id}} - {{$user->name}} + {{$user->name}} {{$user->apellidoPaterno}} {{$user->apellidoMaterno}} @forelse($user->plantelUsuarios as $plantel)