Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actualización v5 #6

Merged
merged 1 commit into from
Jul 31, 2024
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
3 changes: 3 additions & 0 deletions app/Http/Controllers/AreaController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand Down
24 changes: 24 additions & 0 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
29 changes: 0 additions & 29 deletions database/migrations/2024_06_09_071840_ejemplo_table.php

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions database/migrations/2024_06_19_000820_crear_indice_aut.php

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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');
}
};
31 changes: 31 additions & 0 deletions database/migrations/2024_07_25_181820_create_usuarios_acceso.php
Original file line number Diff line number Diff line change
@@ -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');
}
};
69 changes: 34 additions & 35 deletions resources/css/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file added resources/images/user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 13 additions & 23 deletions resources/views/auth/signin.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/menu/vertical-menu.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading
Loading