Merge pull request #18 from MikeLG909/main

Actualiz. 11

app/Http/Controllers/Auth/RegisteredUserController.php

@@ -26,6 +26,11 @@ public function create(): View
         return view('auth.register');
     }
 
+    public function createP(): View
+    {
+        return view('pages-control.profesor-login');
+    }
+
     /**
      * Handle an incoming registration request.
      *
@@ -87,4 +92,61 @@ public function store(Request $request): RedirectResponse
         return redirect()->back()->withErrors(['error' => 'Hubo un error al registrar el usuario']);
     }
     }
+
+    public function storeProfesor(Request $request): RedirectResponse
+    {
+        $faker = Faker::create();
+
+        $request->validate([
+            'name' => ['required', 'string', 'max:255'],
+            'ape_materno' => ['required', 'string', 'max:255'],
+            'ape_paterno' => ['required', 'string', 'max:255'],
+            'genero' => ['required', 'string', 'max:8'],
+            'email' => ['required', 'email', 'max:255'],
+            'password' => ['required', 'confirmed', Rules\Password::defaults()],
+        ]);
+
+
+        $username = $faker->unique()->userName;
+        $rol_id = 3;
+
+        DB::beginTransaction();
+
+        try {
+
+        $user = User::create([
+            'nombre_usuario' => $username,
+            'email' => $request->email,
+            'rol_id' => $rol_id,
+            'password' => Hash::make($request->password),
+        ]);
+
+        $userId = $user->usuario_id;
+
+        $persona = new Persona;
+        $persona->usuario_id = $userId;
+        $persona->nombre = $request->name;
+        $persona->ape_materno = $request->ape_materno;
+        $persona->ape_paterno = $request->ape_paterno;
+        $persona->sexo = $request->genero;
+        $persona->save();
+
+        $user->persona_id = $persona->persona_id;
+        $user->save();
+
+        $personaId = $persona->persona_id;
+        $user->persona_id = $personaId;
+
+        event(new Registered($user));
+
+        Auth::login($user);
+
+        DB::commit();
+
+        return redirect(RouteServiceProvider::HOME);
+    } catch (\Exception $e) {
+        DB::rollBack();
+        return redirect()->back()->withErrors(['error' => 'Hubo un error al registrar el usuario']);
+    }
+    }
 }

app/Http/Controllers/SolicitudController.php

@@ -165,4 +165,50 @@ public function concederPermisos(Request $request)
    return redirect()->back()->with('success', 'Los usuarios ahora tienen acceso a esta área');
 
     }
+
+    public function miBuzon()
+    {
+        setlocale(LC_TIME, 'es_ES.UTF-8');
+        Carbon::setLocale('es');
+
+        $solicitudes = DB::table('solicitudes as a')
+                        ->join('usuarios as b', 'a.usuario_id', '=', 'b.usuario_id')
+                        ->join('persona as c', 'b.usuario_id', '=', 'c.usuario_id')
+                        ->join('areas as e', 'a.area_id', '=', 'e.area_id')
+                        ->select('c.nombre', 'c.ape_materno', 'c.ape_paterno', 'a.created_at', 'a.solicitud_id', 'a.estado')
+                        ->where('a.usuario_id', Auth::user()->usuario_id)
+                        ->get();
+
+      /*  foreach($solicitudes as $solicitud) {
+
+        $solicitudes_usuario = DB::table('solicitud_usuarios as s')
+                        ->join('solicitudes as b', 's.solicitud_id', '=', 'b.solicitud_id')
+                        ->join('usuarios as u', 's.usuario_id', '=', 'u.usuario_id')
+                        ->join('persona as p', 'u.usuario_id', '=', 'p.usuario_id')
+                        ->select('b.area_id', 's.usuario_id')
+                        ->where('s.solicitud_id', $solicitud->solicitud_id)
+                        ->get(); 
+
+        } */
+
+        $solicitudes_format = collect($solicitudes)->map(function($solicitud){
+            return [
+                'nombre' => $solicitud->nombre . ' ' . $solicitud->ape_materno . ' '. $solicitud->ape_paterno,
+                'id' => $solicitud->solicitud_id,
+                'estado' => $solicitud->estado,
+                'fecha' => $solicitud->created_at
+                    ? Carbon::parse($solicitud->created_at)->diffForHumans()
+                    : 'No se ha registrado fecha',
+            ];
+        });
+
+        $solicitudes_array = $solicitudes_format->toArray();
+
+
+
+
+        return view('pages-control.solicitudes.buzon', compact('solicitudes_array'));
+
+    }
+
 }

app/Http/Controllers/UserController.php

@@ -9,6 +9,10 @@
 use App\Mail\UsersQr;
 use RealRashid\SweetAlert\Facades\Alert;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
+use App\Models\Persona;
+use Faker\Factory as Faker;
 
 
 class UserController extends Controller
@@ -107,6 +111,8 @@ public function userInfo()
 
         //concatenar el vector de inicializacion y el email cifrado
         $correo_encriptado = base64_encode($iv . $encriptacion);
+        $correo_encriptado = str_replace('/', '_', $correo_encriptado);
+
 
         $pathToImage = public_path('images/uqroo.png');
 
@@ -134,11 +140,81 @@ public function downloadQr()
 
         //concatenar el vector de inicializacion y el email cifrado
         $correo_encriptado = base64_encode($iv . $encriptacion);
+        $correo_encriptado = str_replace('/', '_', $correo_encriptado);
 
         $pathToImage = public_path('images/uqroo.png');
 
         $qrCode = QrCode::format('png')->generate($correo_encriptado);
 
         return response($qrCode)->header('Content-type', 'image/png');
     }
+
+    public function crearAdmin()
+    {
+        return view('pages-control.user.admin_form');
+    }
+
+    public function nuevoAdmin(Request $request)
+    {
+        $faker = Faker::create();
+
+        $user = new User;
+
+        $username = $faker->unique()->userName;
+
+        $user->nombre_usuario = $username;
+        $user->email = $request->correo;
+        $user->password = Hash::make($request->contrasena);
+        $user->rol_id = 2;
+        $user->save();
+
+        $userId = $user->usuario_id;
+
+        $persona = new Persona;
+        $persona->usuario_id = $userId;
+        $persona->nombre = $request->nombre;
+        $persona->ape_materno = $request->apeMaterno;
+        $persona->ape_paterno = $request->apePaterno;
+        $persona->sexo = $request->genero;
+        $persona->save();
+
+        $personaId = $persona->persona_id;
+        $user->persona_id = $personaId;
+
+        $user->save();
+
+        return redirect()->back()->with('success', 'Nuevo administrador registrado');
+
+    }
+
+    public function nuevoProfe(Request $request)
+    {
+        $faker = Faker::create();
+
+        $user = new User;
+
+        $username = $faker->unique()->userName;
+
+        $user->nombre_usuario = $username;
+        $user->email = $request->correo;
+        $user->password = Hash::make($request->contrasena);
+        $user->rol_id = 3;
+        $user->save();
+
+        $userId = $user->usuario_id;
+
+        $persona = new Persona;
+        $persona->usuario_id = $userId;
+        $persona->nombre = $request->nombre;
+        $persona->ape_materno = $request->apeMaterno;
+        $persona->ape_paterno = $request->apePaterno;
+        $persona->sexo = $request->genero;
+        $persona->save();
+
+        $personaId = $persona->persona_id;
+        $user->persona_id = $personaId;
+
+        $user->save();
+
+    }
 }

composer.json

@@ -9,7 +9,7 @@
         "arielmejiadev/larapex-charts": "^8.1",
         "barryvdh/laravel-dompdf": "^2.2",
         "fruitcake/laravel-cors": "dev-develop",
-        "guzzlehttp/guzzle": "^7.2",
+        "guzzlehttp/guzzle": "^7.8",
         "laravel/fortify": "^1.13",
         "laravel/framework": "^10.0",
         "laravel/passport": "^11.8",

resources/css/form.css

@@ -0,0 +1,38 @@
+.input-group {
+    position: relative;
+    margin: 20px 0;
+}
+
+.input-group label {
+    position: absolute;
+    top: 50%;
+    left: 5px;
+    transform: translateY(-50%);
+    font-size: 16px;
+    color: #fff;
+    padding: 0 5px;
+    pointer-events: none;
+    transition: .5s;
+}
+
+.input-group input {
+    width: 320px;
+    height: 40px;
+    font-size: 16px;
+    color: #fff;
+    padding: 0 10px;
+    background: transparent;
+    border: 1.2px solid #fff;
+    outline: none;
+    border-radius: 5px;
+}
+
+
+
+.input-group input:focus~label,
+.input-group input:valid~label {
+    top: 0;
+    font-size: 12px;
+    background: currentColor;
+}
+

resources/views/components/menu/vertical-menu.blade.php

@@ -81,7 +81,20 @@
 <path d="M9 11C10.1046 11 11 10.1046 11 9C11 7.89543 10.1046 7 9 7C7.89543 7 7 7.89543 7 9C7 10.1046 7.89543 11 9 11Z" fill="currentColor"/>
 <path d="M9 17C13 17 13 16.1046 13 15C13 13.8954 11.2091 13 9 13C6.79086 13 5 13.8954 5 15C5 16.1046 5 17 9 17Z" fill="currentColor"/>
 </svg>
-                  <span>Historial de accesos</span>
+                  <span>Mi historial de accesos</span>
+               </div>
+            </a>
+         </li>
+
+
+         <li class="menu ">
+            <a href="/mi-buzon" aria-expanded="false" class="dropdown-toggle">
+               <div class="">
+               <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.71947 10.5997L8.15874 11.7991C9.99537 13.3296 10.9137 14.0949 11.9998 14.0949C13.086 14.0949 14.0043 13.3296 15.8409 11.7991L17.2802 10.5997C17.6341 10.3048 17.811 10.1574 17.9054 9.95578C17.9998 9.75421 17.9998 9.52389 17.9998 9.06325V7C17.9998 6.67937 17.9998 6.38054 17.998 6.10169C17.9863 4.3306 17.9002 3.36486 17.2676 2.73223C16.5354 2 15.3569 2 12.9998 2H10.9998C8.64282 2 7.46431 2 6.73207 2.73223C6.09945 3.36486 6.01155 4.3306 5.99984 6.10169C5.998 6.38054 5.99984 6.67937 5.99984 7V9.06325C5.99984 9.52389 5.99984 9.75421 6.09425 9.95578C6.18866 10.1574 6.3656 10.3048 6.71947 10.5997ZM9.24976 6C9.24976 5.58579 9.58554 5.25 9.99976 5.25H13.9998C14.414 5.25 14.7498 5.58579 14.7498 6C14.7498 6.41421 14.414 6.75 13.9998 6.75H9.99976C9.58554 6.75 9.24976 6.41421 9.24976 6ZM10.2498 9C10.2498 8.58579 10.5855 8.25 10.9998 8.25H12.9998C13.414 8.25 13.7498 8.58579 13.7498 9C13.7498 9.41421 13.414 9.75 12.9998 9.75H10.9998C10.5855 9.75 10.2498 9.41421 10.2498 9Z" fill="currentColor"/>
+<path opacity="0.5" d="M8.15874 11.7993L6.71947 10.6C6.3656 10.3051 6.18866 10.1576 6.09425 9.95605C5.99984 9.75448 5.99984 9.52416 5.99984 9.06352V7.00027C5.99984 6.89095 5.99963 6.78417 5.99942 6.67986C5.99901 6.4782 5.99863 6.28574 5.99984 6.10195C4.69982 6.22984 3.82473 6.51868 3.17157 7.17184C2 8.34341 2 10.2299 2 14.0011C2 17.7723 2 19.658 3.17157 20.8295C4.34314 22.0011 6.22876 22.0011 9.99998 22.0011H14C17.7712 22.0011 19.6569 22.0011 20.8284 20.8295C22 19.658 22 17.7723 22 14.0011C22 10.2299 22 8.34341 20.8284 7.17184C20.1749 6.51832 19.2992 6.22934 17.998 6.10156C17.9998 6.38042 17.9998 6.67963 17.9998 7.00027V9.06352C17.9998 9.52416 17.9998 9.75448 17.9054 9.95605C17.811 10.1576 17.6341 10.3051 17.2802 10.6L15.8409 11.7993C14.0043 13.3299 13.086 14.0951 11.9998 14.0951C10.9137 14.0951 9.99537 13.3299 8.15874 11.7993Z" fill="currentColor"/>
+</svg>
+                  <span>Mis Solicitudes</span>
                </div>
             </a>
          </li>