Merge pull request #6 from MikeLG909/main

Actualización v5
MikeLG909 · Jul 31, 2024 · bf0fd6f · bf0fd6f
2 parents 624f84c + 5fd5f53
commit bf0fd6f
Show file tree

Hide file tree

Showing 21 changed files with 554 additions and 152 deletions.
diff --git a/app/Http/Controllers/AreaController.php b/app/Http/Controllers/AreaController.php
@@ -251,6 +251,9 @@ public function generarReporte(Request $request, $id)
     // Generar folio
     $uuid = Str::uuid()->toString();
 
+    $fecha_inicial = Carbon::parse($fecha_inicial)->translatedFormat('j \d\e F \d\e Y');
+    $fecha_final = Carbon::parse($fecha_final)->translatedFormat('j \d\e F \d\e Y');
+
     //$chartImage = $chart->render();
     $pdf = \PDF::loadView('pages-control.areas.pre-reporte', compact('data', 'uuid', 'conteo_final', 'conteo_permitidos', 'conteo_denegados', 'mesesOrdenados', 'fecha_inicial', 'fecha_final', 'nombre_area'));
 

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -43,6 +43,30 @@ public function generarQr(String $id)
         $qrCode = QrCode::size(200)->merge($pathToImage, 0.3, true)->generate($correo_encriptado);
         return view('qrcode', compact('qrCode', 'user'));
     }
+
+    public function generarQrUser()
+    {
+        $user = User::userIn();
+
+        $user_email = $user->email;
+        //encriptacion usando la funcioon oppenssl_encrypt para aes 256
+        $key = env('ENCRYPTION_KEY');
+
+        //vector de inicialización
+
+        $iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length('aes-256-cbc'));
+
+        //encriptar el email
+        $encriptacion = openssl_encrypt($user_email, 'aes-256-cbc', $key, 0, $iv);
+
+        //concatenar el vector de inicializacion y el email cifrado
+        $correo_encriptado = base64_encode($iv . $encriptacion);
+
+        $pathToImage = public_path('images/uqroo.png');
+
+        $qrCode = QrCode::size(200)->merge($pathToImage, 0.3, true)->generate($correo_encriptado);
+        return view('qrcode', compact('qrCode', 'user'));
+    }
 
     public function enviarMailsQr()
     {

diff --git a/database/migrations/2024_06_09_071840_ejemplo_table.php b/database/migrations/2024_06_09_071840_ejemplo_table.php
diff --git a/database/migrations/2024_06_13_162851_add_foreign_key_to_persona_table.php b/database/migrations/2024_06_13_162851_add_foreign_key_to_persona_table.php
diff --git a/database/migrations/2024_06_19_000820_crear_indice_aut.php b/database/migrations/2024_06_19_000820_crear_indice_aut.php
diff --git a/database/migrations/2024_07_25_181054_create_solicitudes_acceso.php b/database/migrations/2024_07_25_181054_create_solicitudes_acceso.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('solicitudes_acceso', function (Blueprint $table) {
+            $table->increments('solicitud_acceso_id');
+            $table->integer('solicitante_id')->unsigned(); // Asegúrate de que sea del mismo tipo que usuario_id
+            $table->foreign('solicitante_id')->references('usuario_id')->on('usuarios')->onDelete('cascade');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('solicitudes_acceso');
+    }
+};
diff --git a/database/migrations/2024_07_25_181820_create_usuarios_acceso.php b/database/migrations/2024_07_25_181820_create_usuarios_acceso.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('usuarios_acceso', function (Blueprint $table) {
+            $table->increments('usuarios_acceso_id');
+            $table->integer('solicitud_acceso_id')->unsigned();
+            $table->integer('usuario_id')->unsigned();
+            $table->foreign('solicitud_acceso_id')->references('solicitud_acceso_id')->on('solicitudes_acceso')->onDelete('cascade');
+            $table->foreign('usuario_id')->references('usuario_id')->on('usuarios')->onDelete('cascade');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('usuarios_acceso');
+    }
+};
diff --git a/resources/css/login.css b/resources/css/login.css
@@ -81,45 +81,44 @@ form.sign-up-form{
     color: #444;
     margin-top: 10px;
 }
-/*Estilos para los elementos del formulario*/
-.input-field{
-    max-width: 380px;
-    width: 100%;
-    height: 55px;
-    background-color: #f0f0f0;
-    margin: 10px 0;
-    border-radius: 55px;
-    display: grid;
-    grid-template-columns: 15% 85%;
-    padding: 0 .4rem;
-}
 
-.input-field i{
-    text-align: center;
-    line-height: 55px;
-    color: #acacac;
-    font-size: 1.1rem;
-}
-
-.input-field input, select{
-    background: none;
-    outline: none;
-    border: none;
-    line-height: 1;
-    font-weight: 600;
-    font-size: 1.1rem;
-    color: #333;
+/*Estilos para los elementos del formulario*/
+.input-field {
+  max-width: 380px; /* Reducido a la mitad */
+  width: 100%;
+  height: 40px; /* Ajustado para que sea proporcionalmente más pequeño */
+  background-color: #f0f0f0;
+  margin: 10px 0;
+  border-radius: 20px; /* Ajustado para que se vea bien con el nuevo tamaño */
+  display: grid;
+  grid-template-columns: 15% 85%;
+  padding: 0 .2rem; /* Ajustado para el nuevo tamaño */
+}
+
+.input-field i {
+  text-align: center;
+  line-height: 40px; /* Ajustado para que coincida con la altura de .input-field */
+  color: #acacac;
+  font-size: 1.1rem;
+}
+
+.input-field input, .input-field select {
+  background: none;
+  outline: none;
+  border: none;
+  line-height: 1;
+  font-weight: 600;
+  font-size: 0.9rem; /* Ajustado para el nuevo tamaño */
+  color: #333;
+  padding: 0 0.5rem; /* Añadido para un mejor ajuste visual */
+}
+
+.input-field input::placeholder, .input-field select::placeholder {
+  color: #aaa;
+  font-weight: 500;
 }
 
-.input-field input::placeholder{
-    color:#aaa;
-    font-weight: 500;
-}
 
-.input-field select::placeholder{
-  color:#aaa;
-  font-weight: 500;
-}
 
 .btn{
     width: 150px;

diff --git a/resources/images/user.png b/resources/images/user.png
diff --git a/resources/views/auth/signin.blade.php b/resources/views/auth/signin.blade.php
@@ -38,18 +38,23 @@
                     <h2 class="title">Registro</h2>
                     <div class="input-field">
                       <i class="fas fa-user"></i>
-                      <input type="text" placeholder="Username" />
+                      <input type="text" placeholder="Nombre" />
                     </div>
+                    <div class="input-field">
+                      <i class="fas fa-user"></i>
+                      <input type="text" placeholder="Apellido materno" />
+                    </div>
+                    <div class="input-field">
+                      <i class="fas fa-user"></i>
+                      <input type="text" placeholder="Apellido paterno" />
+                    </div>                   
                     <div class="input-field">
                     <i class="fa-solid fa-book"></i>
                     <select name="pets" id="pet-select">
-  <option value="">--Porfavor selecciona una opción--</option>
-  <option value="dog">Dog</option>
-  <option value="cat">Cat</option>
-  <option value="hamster">Hamster</option>
-  <option value="parrot">Parrot</option>
-  <option value="spider">Spider</option>
-  <option value="goldfish">Goldfish</option>
+  <option value="">--Género--</option>
+  <option value="M">Hombre</option>
+  <option value="F">Mujer</option>
+  <option value="OTRO">Prefiero no contestar</option>
 </select>                    
 </div>
                     <div class="input-field">
@@ -61,21 +66,6 @@
                       <input type="password" placeholder="Contraseña" />
                     </div>
                     <input type="submit" class="btn" value="Registrar" />
-<!--                    <p class="social-text">O registrate con las plataformas sociales</p>
-                    <div class="social-media">
-                      <a href="#" class="social-icon">
-                        <i class="fab fa-facebook-f"></i>
-                      </a>
-                      <a href="#" class="social-icon">
-                        <i class="fab fa-twitter"></i>
-                      </a>
-                      <a href="#" class="social-icon">
-                        <i class="fab fa-google"></i>
-                      </a>
-                      <a href="#" class="social-icon">
-                        <i class="fab fa-linkedin-in"></i>
-                      </a>
-                    </div> -->
                   </form>
             </div>
         </div>

diff --git a/resources/views/components/menu/vertical-menu.blade.php b/resources/views/components/menu/vertical-menu.blade.php
@@ -25,7 +25,7 @@
       <div class="profile-info">
          <div class="user-info">
             <div class="profile-img">
-               <img src="{{Vite::asset('resources/images/profile-30.png')}}" alt="avatar">
+               <img src="{{Vite::asset('resources/images/user.png')}}" alt="avatar">
             </div>
             <div class="profile-content">
                <h6 class="">{{ Auth::user()->nombre_usuario }}</h6>

diff --git a/resources/views/components/navbar/style-vertical-menu.blade.php b/resources/views/components/navbar/style-vertical-menu.blade.php
@@ -154,7 +154,7 @@
                     <a href="javascript:void(0);" class="nav-link dropdown-toggle user" id="userProfileDropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <div class="avatar-container">
                             <div class="avatar avatar-sm avatar-indicators avatar-online">
-                                <img alt="avatar" src="{{Vite::asset('resources/images/profile-30.png')}}" class="rounded-circle">
+                                <img alt="avatar" src="{{Vite::asset('resources/images/user.png')}}" class="rounded-circle">
                             </div>
                         </div>
                     </a>