From cf79fd54e745d17a19d54272c315d3f199bc8508 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Mon, 16 Sep 2024 19:42:01 -0300 Subject: [PATCH 001/203] maquetado finalizado --- .../welcome-page/welcome-page.component.html | 17 ++++++++---- .../welcome-page/welcome-page.component.scss | 27 ++++++++++++++++--- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 1eb5a54..85477fa 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -3,23 +3,30 @@

Bienvenido "User"

-
+
- +
- +
- +
+ logo
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index 1b44f59..ebf9b4f 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -8,7 +8,6 @@ } .column-tasks { - background-color: red; width: 60px; height: 551px; border-radius: 12px; @@ -43,8 +42,8 @@ .column-btn .span-linear::after { content: ''; position: absolute; - left:0; - bottom: -3px; + left: 0; + bottom: -3px; width: 100%; height: 3px; border: 0px 0px 3px 0px solid; @@ -61,3 +60,25 @@ background: linear-gradient(to right, #6a5fff80, #ff5ea680); border: none; } + +.circle { + border: 2px solid white; + border-radius: 50%; + width: 25px; + height: 25px; + display: inline-block; +} + +.bi-plus { + display: flex; + justify-content: center; + align-items: center; + font-size: 22px; +} + +.ti-img{ + width: 414px; + position: relative; + left: 170px; +} + From 5aea66736d2ccb87fbc68aff0195ee284f0b1549 Mon Sep 17 00:00:00 2001 From: matia Date: Mon, 16 Sep 2024 21:45:22 -0300 Subject: [PATCH 002/203] actualizando components --- .../pages/new-pages/new-pages.component.html | 56 +++++++- .../pages/new-pages/new-pages.component.scss | 132 +++++++++++++++++- .../pages/new-pages/new-pages.component.ts | 7 +- .../welcome-page/welcome-page.component.html | 33 +++-- .../welcome-page/welcome-page.component.ts | 27 ++-- 5 files changed, 216 insertions(+), 39 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 941565c..b16b5eb 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1 +1,55 @@ -

Soy el new pages

\ No newline at end of file + +
+

Nombre del Quizz

+
+ +
+
+
+
+

Modulo

+ +
+
+

Célula

+ +
+
+

Seniority / Nivel

+ +
+
+ +
+
+ +
+
+ +
+ logo +
+
+ +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 53a29d8..4cebbe3 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -1,7 +1,125 @@ -.new { - border: 1px solid rgb(119, 0, 255); - padding: .5rem; - padding-top: 2rem; - height: 88vh; - border-radius: 15px; - } \ No newline at end of file +// Variables SCSS para colores y otros valores reutilizables +$background-color: #2a2a2a; +$shadow-color: rgba(0, 217, 255, 0.4); +$input-bg-color: #333; +$text-color: #fff; +$border-radius: 12px; +$transition-time: 0.3s; +$spacing: 20px; // Espaciado general para márgenes y padding + +.new-title { + margin-top: 20px; + } + +// Contenedor regular +.normal-container { + width: 85vw; + height: 80vh; + margin: 20px auto; // Centra el contenedor horizontalmente + background-color: #212121; + padding: $spacing; + border-radius: $border-radius; + box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); + background-image: url('/src/assets/layout/images/logo.svg'); // Ruta de la imagen + background-size: cover; // Ajusta la imagen para cubrir todo el contenedor + background-position: center; // Posiciona la imagen en el centro + background-repeat: no-repeat; // Evita que la imagen se repita + + + + select { + width: 150px; // Ancho fijo para cada select + padding: 8px; + font-size: 16px; + border-radius: 8px; + border: 1px solid #ccc; + background-color: #fff; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + } + + + + + // Contenido interno del contenedor + .content { + display: flex; + flex-direction: column; + gap: $spacing; + + .content-1{ + background-color: red; + display: flex; + justify-content: space-between; + gap: 20px; + width: 80vw; + height: 20vh; + justify-content: space-around; + } + + .content-2{ + background-color: blue; + width: 80vw; + height: 20vh; + } + + .content-img { + display: flex; + justify-content: center; + align-items: center; + height: 20vh; + padding: 20px; + } + .new-img { + max-width: 15%; + height: auto; + } + + h2 { + color: $text-color; + text-align: center; + } + + p { + color: $text-color; + text-align: center; + } + + .form-group { + display: flex; + flex-direction: column; + label { + color: $text-color; + margin-bottom: 5px; + } + + input { + padding: 10px; + background-color: $input-bg-color; + color: $text-color; + border: none; + border-radius: $border-radius; + outline: none; + transition: background-color $transition-time; + + &:focus { + background-color: darken($input-bg-color, 10%); + } + } + } + + // Botón de envío + .submit-btn { + padding: 10px; + background-color: $shadow-color; + color: $text-color; + border: none; + border-radius: $border-radius; + cursor: pointer; + transition: background-color $transition-time; + + &:hover { + background-color: lighten($shadow-color, 20%); + } + } + } +} diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 33047d5..fa45163 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,10 +1,11 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-new-pages', - templateUrl: './new-pages.component.html', - styleUrl: './new-pages.component.scss' + selector: 'app-new-pages', + templateUrl: './new-pages.component.html', + styleUrl: './new-pages.component.scss' }) export class NewPagesComponent { + } diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 1eb5a54..a86294a 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -1,25 +1,28 @@
-

Bienvenido "User"

-
- -
+

Bienvenido "User"

+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index 0c6b064..0fb53c5 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -2,20 +2,21 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; @Component({ - selector: 'app-welcome-page', - templateUrl: './welcome-page.component.html', - styleUrl: './welcome-page.component.scss', + selector: 'app-welcome-page', + templateUrl: './welcome-page.component.html', + styleUrl: './welcome-page.component.scss', }) export class WelcomePageComponent { - constructor(private router: Router) {} + constructor(private router: Router) { } + + goToAll() { + this.router.navigate(['/all']); + } + goToCreate() { + this.router.navigate(['/create']); + } + goToEdit() { + this.router.navigate(['/edit']); + } - goToAll() { - this.router.navigate(['/all']); - } - goToCreate() { - this.router.navigate(['/create']); - } - goToEdit() { - this.router.navigate(['/edit']); - } } From c5d62a196a8cdc92e865428a58116dfd422cc79b Mon Sep 17 00:00:00 2001 From: matia Date: Tue, 17 Sep 2024 15:00:15 -0300 Subject: [PATCH 003/203] Component new-page --- .../pages/new-pages/new-pages.component.html | 56 +++++++- .../pages/new-pages/new-pages.component.scss | 132 +++++++++++++++++- .../pages/new-pages/new-pages.component.ts | 7 +- 3 files changed, 184 insertions(+), 11 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 941565c..b16b5eb 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1 +1,55 @@ -

Soy el new pages

\ No newline at end of file + +
+

Nombre del Quizz

+
+ +
+
+
+
+

Modulo

+ +
+
+

Célula

+ +
+
+

Seniority / Nivel

+ +
+
+ +
+
+ +
+
+ +
+ logo +
+
+ +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 53a29d8..4cebbe3 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -1,7 +1,125 @@ -.new { - border: 1px solid rgb(119, 0, 255); - padding: .5rem; - padding-top: 2rem; - height: 88vh; - border-radius: 15px; - } \ No newline at end of file +// Variables SCSS para colores y otros valores reutilizables +$background-color: #2a2a2a; +$shadow-color: rgba(0, 217, 255, 0.4); +$input-bg-color: #333; +$text-color: #fff; +$border-radius: 12px; +$transition-time: 0.3s; +$spacing: 20px; // Espaciado general para márgenes y padding + +.new-title { + margin-top: 20px; + } + +// Contenedor regular +.normal-container { + width: 85vw; + height: 80vh; + margin: 20px auto; // Centra el contenedor horizontalmente + background-color: #212121; + padding: $spacing; + border-radius: $border-radius; + box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); + background-image: url('/src/assets/layout/images/logo.svg'); // Ruta de la imagen + background-size: cover; // Ajusta la imagen para cubrir todo el contenedor + background-position: center; // Posiciona la imagen en el centro + background-repeat: no-repeat; // Evita que la imagen se repita + + + + select { + width: 150px; // Ancho fijo para cada select + padding: 8px; + font-size: 16px; + border-radius: 8px; + border: 1px solid #ccc; + background-color: #fff; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + } + + + + + // Contenido interno del contenedor + .content { + display: flex; + flex-direction: column; + gap: $spacing; + + .content-1{ + background-color: red; + display: flex; + justify-content: space-between; + gap: 20px; + width: 80vw; + height: 20vh; + justify-content: space-around; + } + + .content-2{ + background-color: blue; + width: 80vw; + height: 20vh; + } + + .content-img { + display: flex; + justify-content: center; + align-items: center; + height: 20vh; + padding: 20px; + } + .new-img { + max-width: 15%; + height: auto; + } + + h2 { + color: $text-color; + text-align: center; + } + + p { + color: $text-color; + text-align: center; + } + + .form-group { + display: flex; + flex-direction: column; + label { + color: $text-color; + margin-bottom: 5px; + } + + input { + padding: 10px; + background-color: $input-bg-color; + color: $text-color; + border: none; + border-radius: $border-radius; + outline: none; + transition: background-color $transition-time; + + &:focus { + background-color: darken($input-bg-color, 10%); + } + } + } + + // Botón de envío + .submit-btn { + padding: 10px; + background-color: $shadow-color; + color: $text-color; + border: none; + border-radius: $border-radius; + cursor: pointer; + transition: background-color $transition-time; + + &:hover { + background-color: lighten($shadow-color, 20%); + } + } + } +} diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 33047d5..fa45163 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,10 +1,11 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-new-pages', - templateUrl: './new-pages.component.html', - styleUrl: './new-pages.component.scss' + selector: 'app-new-pages', + templateUrl: './new-pages.component.html', + styleUrl: './new-pages.component.scss' }) export class NewPagesComponent { + } From 0b30ec60b179dc79630f507a23ebbdb83b501793 Mon Sep 17 00:00:00 2001 From: matia Date: Tue, 17 Sep 2024 16:30:36 -0300 Subject: [PATCH 004/203] Component new-page-modified --- .../pages/new-pages/new-pages.component.html | 50 ++++------ .../pages/new-pages/new-pages.component.scss | 97 ++++--------------- 2 files changed, 42 insertions(+), 105 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index b16b5eb..80a1438 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -8,48 +8,40 @@

Nombre del Quizz

Modulo

- + + + +

Célula

- + + + +

Seniority / Nivel

- + + + +
-
-
- -
-
+ -
- logo -
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 4cebbe3..402e2d0 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -26,100 +26,45 @@ $spacing: 20px; // Espaciado general para márgenes y padding background-repeat: no-repeat; // Evita que la imagen se repita - - select { - width: 150px; // Ancho fijo para cada select - padding: 8px; - font-size: 16px; - border-radius: 8px; - border: 1px solid #ccc; - background-color: #fff; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); - } - - - - // Contenido interno del contenedor .content { display: flex; flex-direction: column; + justify-content: center; + align-items: center; gap: $spacing; + .content-1{ - background-color: red; + background-color: #353434; display: flex; justify-content: space-between; gap: 20px; width: 80vw; height: 20vh; - justify-content: space-around; - } - - .content-2{ - background-color: blue; - width: 80vw; - height: 20vh; - } + border-radius: 12px; - .content-img { - display: flex; - justify-content: center; - align-items: center; - height: 20vh; - padding: 20px; - } - .new-img { - max-width: 15%; - height: auto; - } + h4 { + padding: 5px; + } - h2 { - color: $text-color; - text-align: center; - } + .option-select { + border: 2px solid #fff; + color: #C2BBBB; + background-color: #202020; - p { - color: $text-color; - text-align: center; - } + } - .form-group { - display: flex; - flex-direction: column; - label { - color: $text-color; - margin-bottom: 5px; - } - - input { - padding: 10px; - background-color: $input-bg-color; - color: $text-color; - border: none; - border-radius: $border-radius; - outline: none; - transition: background-color $transition-time; - - &:focus { - background-color: darken($input-bg-color, 10%); + .option { + background-color: #353434; + border-radius: 12px; } - } - } - // Botón de envío - .submit-btn { - padding: 10px; - background-color: $shadow-color; - color: $text-color; - border: none; - border-radius: $border-radius; - cursor: pointer; - transition: background-color $transition-time; - - &:hover { - background-color: lighten($shadow-color, 20%); - } + + } + + + } } From a999171c3819b9af2c76352a20425b1b48dbf575 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Tue, 17 Sep 2024 16:37:08 -0300 Subject: [PATCH 005/203] empezando animacion --- package-lock.json | 10 ++++----- package.json | 2 +- src/app/app.module.ts | 21 ++++++++++--------- .../edit-pages/edit-pages.component.html | 9 +++++++- .../pages/edit-pages/edit-pages.component.ts | 13 ++++++++++++ 5 files changed, 38 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 127bb1e..7e4fbc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "17.0.0", "license": "MIT", "dependencies": { - "@angular/animations": "^17.0.5", + "@angular/animations": "^17.3.12", "@angular/cdk": "^17.0.2", "@angular/common": "^17.0.5", "@angular/compiler": "^17.0.5", @@ -394,9 +394,9 @@ } }, "node_modules/@angular/animations": { - "version": "17.3.11", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.11.tgz", - "integrity": "sha512-1y1Egag5jbdUSUWVK+KA39N9VFDrzq9ObjbAhrXFlXKa0npBRw5bprEEeLFQMETMP9Mpjbmj2PoASfl4vqj/Iw==", + "version": "17.3.12", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.12.tgz", + "integrity": "sha512-9hsdWF4gRRcVJtPcCcYLaX1CIyM9wUu6r+xRl6zU5hq8qhl35hig6ounz7CXFAzLf0WDBdM16bPHouVGaG76lg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -405,7 +405,7 @@ "node": "^18.13.0 || >=20.9.0" }, "peerDependencies": { - "@angular/core": "17.3.11" + "@angular/core": "17.3.12" } }, "node_modules/@angular/cdk": { diff --git a/package.json b/package.json index 7ae5467..05ebfb3 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "private": true, "dependencies": { - "@angular/animations": "^17.0.5", + "@angular/animations": "^17.3.12", "@angular/cdk": "^17.0.2", "@angular/common": "^17.0.5", "@angular/compiler": "^17.0.5", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 42fb172..facdace 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,7 +4,7 @@ import { AppComponent } from './app.component'; import { AppRoutingModule } from './app-routing.module'; import { AppLayoutModule } from './layout/app.layout.module'; import { AuthService } from '@auth0/auth0-angular'; - +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { AuthModule } from '@auth0/auth0-angular'; import { environment } from 'src/environments/environment'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; @@ -15,20 +15,21 @@ import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; AppRoutingModule, AppLayoutModule, HttpClientModule, + BrowserAnimationsModule, AuthModule.forRoot({ - domain: environment.auth.domain, - clientId: environment.auth.clientId, - authorizationParams: { - audience: environment.auth.authorizationParams.audience, - redirect_uri: environment.auth.authorizationParams.redirect_uri, - }}) -], + domain: environment.auth.domain, + clientId: environment.auth.clientId, + authorizationParams: { + audience: environment.auth.authorizationParams.audience, + redirect_uri: environment.auth.authorizationParams.redirect_uri, + }, + }), + ], providers: [ { provide: LocationStrategy, useClass: PathLocationStrategy, - - } + }, ], bootstrap: [AppComponent], }) diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index 20ca6d2..eaac0fe 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -1 +1,8 @@ -

Soy el edit page

\ No newline at end of file +

Soy el edit page

+
+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione tempore + aliquam, ut veniam labore expedita officia sunt illum sit molestias + quisquam, unde molestiae nam ab recusandae iure, voluptatum quia odio. +

+
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts index acfcf42..69e0121 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts @@ -1,8 +1,21 @@ import { Component } from '@angular/core'; +import { trigger, style, transition, animate, state } from '@angular/animations'; @Component({ selector: 'app-edit-pages', templateUrl: './edit-pages.component.html', styleUrl: './edit-pages.component.scss', + animations: [ + trigger('enterState', [ + state('void', style({ + transform: 'translateX(-50%)', + })), + transition(':enter', [ + animate(300, style({ + transform: 'translateX(0)' + })) + ]) + ]) + ] }) export class EditPagesComponent {} From 16403550996a174bc6661820bd81a22ee0aa1495 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 17 Sep 2024 18:37:54 -0300 Subject: [PATCH 006/203] animacion --- .../welcome-page/welcome-page.component.html | 29 ++++++-- .../welcome-page/welcome-page.component.scss | 1 - .../welcome-page/welcome-page.component.ts | 71 +++++++++++++++++++ 3 files changed, 94 insertions(+), 7 deletions(-) diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 85477fa..6683493 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -11,22 +11,39 @@

Bienvenido "User"

-
-
+
+ +
-
-
+
+ +
-
-
+
+ +
+ logo
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index ebf9b4f..5bf0f12 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -81,4 +81,3 @@ position: relative; left: 170px; } - diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index 0c6b064..4b7d6d9 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -1,14 +1,85 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; +import { + trigger, + style, + transition, + animate, + state, +} from '@angular/animations'; @Component({ selector: 'app-welcome-page', templateUrl: './welcome-page.component.html', styleUrl: './welcome-page.component.scss', + animations: [ + trigger('expandState1', [ + state( + 'collapsed', + style({ + display: 'none', + }) + ), + state( + 'expanded', + style({ + width: '900px', + }) + ), + transition('collapsed => expanded', [animate('300ms ease-out')]), + transition('expanded => collapsed', [animate('300ms ease-in')]), + ]), + trigger('expandState2', [ + state( + 'collapsed', + style({ + display: 'none', + }) + ), + state( + 'expanded', + style({ + width: '900px', + }) + ), + transition('collapsed => expanded', [animate('300ms ease-out')]), + transition('expanded => collapsed', [animate('300ms ease-in')]), + ]), + trigger('expandState3', [ + state( + 'collapsed', + style({ + display: 'none', + }) + ), + state( + 'expanded', + style({ + width: '900px', + }) + ), + transition('collapsed => expanded', [animate('300ms ease-out')]), + transition('expanded => collapsed', [animate('300ms ease-in')]), + ]), + ], }) export class WelcomePageComponent { constructor(private router: Router) {} + isExpanded1 = false; + isExpanded2 = false; + isExpanded3 = false; + toggleExpand1() { + this.isExpanded1 = !this.isExpanded1; + } + + toggleExpand2() { + this.isExpanded2 = !this.isExpanded2; + } + + toggleExpand3() { + this.isExpanded3 = !this.isExpanded3; + } goToAll() { this.router.navigate(['/all']); } From 127dacafea59e4f8cd7fee07c4373d7840cc6204 Mon Sep 17 00:00:00 2001 From: Agustindardanelli-stack Date: Wed, 18 Sep 2024 00:43:24 -0300 Subject: [PATCH 007/203] Component form --- src/app/modules/new/new.module.ts | 4 +- .../pages/new-pages/new-pages.component.html | 100 +++++++++++++---- .../pages/new-pages/new-pages.component.scss | 101 ++++++++++++++++++ .../pages/new-pages/new-pages.component.ts | 19 ++++ 4 files changed, 205 insertions(+), 19 deletions(-) diff --git a/src/app/modules/new/new.module.ts b/src/app/modules/new/new.module.ts index 097aea3..90744fd 100644 --- a/src/app/modules/new/new.module.ts +++ b/src/app/modules/new/new.module.ts @@ -2,10 +2,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { NewPagesComponent } from './pages/new-pages/new-pages.component'; import { NewRoutingModule } from './new-routing.module'; +import { FormsModule } from '@angular/forms'; + @NgModule({ declarations: [NewPagesComponent], - imports: [CommonModule, NewRoutingModule], + imports: [CommonModule, NewRoutingModule,FormsModule], exports: [NewPagesComponent], }) export class NewModule {} diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 80a1438..c070b6b 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -8,40 +8,104 @@

Nombre del Quizz

Modulo

- + + + +

Célula

- + + - +

Seniority / Nivel

- - +
+
+

Define la pregunta

+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+ + +
+
+
+ + - - + + + diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 402e2d0..6abe40a 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -59,12 +59,113 @@ $spacing: 20px; // Espaciado general para márgenes y padding background-color: #353434; border-radius: 12px; } + + } + .content-2{ + width: Fixed (804px)px; + height: Hug (278px)px; + padding: 16px 0px 0px 0px; + gap: 17px; + font-family: Poppins; + border-radius: 8px 0px 0px 0px; + opacity: 0px; + box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); + background: rgba(79, 77, 77, 0.45); + + + .custom-label { + font-family: Poppins; + margin-bottom: 8px; + color: rgba(255, 255, 255, 1); + } + + .custom-select{ + width: Fill (377.5px)px; + height: Fixed (28px)px; + gap: 0px; + border-radius: 8px 0px 0px 0px; + opacity: 0px; + color: rgba(48, 48, 48, 1); + color : rgba(194, 187, 187, 0.6); + + } + .custom-input{ + width: 377.5px; + height: 28px; + gap: 0px; + border-radius: 8px 0px 0px 0px; + border: 1px 0px 0px 0px; + opacity: 0px; + background: rgba(32, 32, 32, 1); + + + + } + + .custom-option-group { + margin-bottom: 10px; + } + + .custom-radio { + margin-right: 8px; + } + + .custom-add-option-btn { + width: 350px; + height: 28px; + gap: 5px; + border-radius: 8px ; + padding: 8px; + color: rgba(194,187,187,0.6) + + } + + .custom-btn-submit { + width: 91px; + height: 42px; + padding: 8px 0px 0px 0px; + gap: 8px; + border-radius: 8px 0px 0px 0px; + border: 1.4px 0px 0px 0px; + opacity: 0px; + color: rgba(106, 95, 255, 1); + background: rgba(32, 32, 32, 1); + + } + .i{ + width: 7.89px; + height: 10px; + top: 2.5px; + left: 1.97px; + gap: 0px; + opacity: 0px; + + + } + + .custom-btn-new-question { + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); + width: 91px; + height: 42px; + padding: 8px 0px 0px 0px; + gap: 8px; + border-radius: 8px 0px 0px 0px; + border: 1.4px 0px 0px 0px; + opacity: 0px; + background: rgba(95, 95, 95, 1); + color:rgba(126, 126, 126, 1); + + } + + + } } + } diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index fa45163..b5670e9 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -7,5 +7,24 @@ import { Component } from '@angular/core'; }) export class NewPagesComponent { + questionTypes: string[] = ['Selección mutiple', 'Casilla', 'Verdadero o falso']; + options: string[] = ['Opción 1']; + selectedOption: string = ''; + // Agregar una nueva opción + addOption() { + this.options.push(`Opción ${this.options.length + 1}`); + } + + // Acción al enviar el formulario + onSubmit(form: any) { + console.log('Formulario enviado', form.value); + } + + // Crear una nueva pregunta + addNewQuestion(form:any) { + console.log('Nueva pregunta agregada'); + form.resetForm(); + this.options = ['Opción 1']; // Reiniciar las opciones + } } From 3c2825e52ce3b2f5077d445be471138a11d6a59c Mon Sep 17 00:00:00 2001 From: Ignacio Date: Wed, 18 Sep 2024 14:50:26 -0300 Subject: [PATCH 008/203] uniendo contenedores --- .../pages/new-pages/new-pages.component.html | 228 ++++++++------- .../pages/new-pages/new-pages.component.scss | 262 +++++++++--------- .../welcome-page/welcome-page.component.html | 4 +- .../welcome-page/welcome-page.component.ts | 6 +- 4 files changed, 264 insertions(+), 236 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index c070b6b..a8cf461 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,111 +1,135 @@ -
+
-
-
-
-

Modulo

- -
-
-

Célula

- -
-
-

Seniority / Nivel

- -
+
+
+
+

Modulo

+ +
+
+

Célula

+ +
+
+

Seniority / Nivel

+ +
+
+
+
+

Define la pregunta

+ + +
+
+
+
+ + +
-
-

Define la pregunta

- - - -
-
-
- - -
-
-
-
- - -
-
-
- -
- -
- - -
-
- -
- -
- -
- - -
- +
+
+ + +
- - +
- - -
+
+ +
+ + +
+
+ +
+ +
- +
+ + +
+ +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 6abe40a..e6d9227 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -8,14 +8,19 @@ $transition-time: 0.3s; $spacing: 20px; // Espaciado general para márgenes y padding .new-title { - margin-top: 20px; - } + margin-top: 20px; +} // Contenedor regular .normal-container { - width: 85vw; - height: 80vh; - margin: 20px auto; // Centra el contenedor horizontalmente + display: flex; + flex-direction: column; + align-items: center; + /* width: 85vw; + height: 80vh; */ + width: 869px; + height: 551px; + /* margin: 20px auto; */ // Centra el contenedor horizontalmente background-color: #212121; padding: $spacing; border-radius: $border-radius; @@ -25,147 +30,146 @@ $spacing: 20px; // Espaciado general para márgenes y padding background-position: center; // Posiciona la imagen en el centro background-repeat: no-repeat; // Evita que la imagen se repita - // Contenido interno del contenedor .content { display: flex; flex-direction: column; justify-content: center; align-items: center; - gap: $spacing; + /* gap: $spacing; */ + /* agregado */ + margin-bottom: 100px; - .content-1{ + .input-container { + width: 251.33px; + height: 52px; + display: flex; + flex-direction: column; + justify-content: space-between; + } + + .content-1 { + background-color: #353434; + + display: flex; + justify-content: space-between; + /* gap: 20px; */ + /* width: 80vw; + height: 20vh; */ + width: 804px; + height: 68px; + border-radius: 12px; + padding: 8px; + + h4 { + /* padding: 5px; */ + margin: 0; + font-size: 16px; + } + + .option-select { + border: 2px solid #fff; + border: none; + color: #c2bbbb99; + background-color: #202020; + + width: 251.33px; + height: 28px; + } + + .option { background-color: #353434; - display: flex; - justify-content: space-between; - gap: 20px; - width: 80vw; - height: 20vh; border-radius: 12px; + } + } + } + .content-2 { + /* width: Fixed (804px) px; + height: Hug (278px) px; */ + width: 804px; + height: 278px; + padding: 16px 0px 0px 0px; + gap: 17px; + font-family: Poppins; + border-radius: 8px 0px 0px 0px; + opacity: 0px; + box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); + background: rgba(79, 77, 77, 0.45); + + .custom-label { + font-family: Poppins; + margin-bottom: 8px; + color: rgba(255, 255, 255, 1); + } - h4 { - padding: 5px; - } - - .option-select { - border: 2px solid #fff; - color: #C2BBBB; - background-color: #202020; - - } - - .option { - background-color: #353434; - border-radius: 12px; - } - + .custom-select { + width: Fill (377.5px) px; + height: Fixed (28px) px; + gap: 0px; + border-radius: 8px 0px 0px 0px; + opacity: 0px; + color: rgba(48, 48, 48, 1); + color: rgba(194, 187, 187, 0.6); + } + .custom-input { + width: 377.5px; + height: 28px; + gap: 0px; + border-radius: 8px 0px 0px 0px; + border: 1px 0px 0px 0px; + opacity: 0px; + background: rgba(32, 32, 32, 1); + } + .custom-option-group { + margin-bottom: 10px; + } + .custom-radio { + margin-right: 8px; + } + .custom-add-option-btn { + width: 350px; + height: 28px; + gap: 5px; + border-radius: 8px; + padding: 8px; + color: rgba(194, 187, 187, 0.6); } - .content-2{ - width: Fixed (804px)px; - height: Hug (278px)px; - padding: 16px 0px 0px 0px; - gap: 17px; - font-family: Poppins; + + .custom-btn-submit { + width: 91px; + height: 42px; + padding: 8px 0px 0px 0px; + gap: 8px; border-radius: 8px 0px 0px 0px; - opacity: 0px; - box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); - background: rgba(79, 77, 77, 0.45); - - - .custom-label { - font-family: Poppins; - margin-bottom: 8px; - color: rgba(255, 255, 255, 1); - } - - .custom-select{ - width: Fill (377.5px)px; - height: Fixed (28px)px; - gap: 0px; - border-radius: 8px 0px 0px 0px; - opacity: 0px; - color: rgba(48, 48, 48, 1); - color : rgba(194, 187, 187, 0.6); - - } - .custom-input{ - width: 377.5px; - height: 28px; - gap: 0px; - border-radius: 8px 0px 0px 0px; - border: 1px 0px 0px 0px; - opacity: 0px; - background: rgba(32, 32, 32, 1); - - - - } - - .custom-option-group { - margin-bottom: 10px; - } - - .custom-radio { - margin-right: 8px; - } - - .custom-add-option-btn { - width: 350px; - height: 28px; - gap: 5px; - border-radius: 8px ; - padding: 8px; - color: rgba(194,187,187,0.6) - - } - - .custom-btn-submit { - width: 91px; - height: 42px; - padding: 8px 0px 0px 0px; - gap: 8px; - border-radius: 8px 0px 0px 0px; - border: 1.4px 0px 0px 0px; - opacity: 0px; - color: rgba(106, 95, 255, 1); - background: rgba(32, 32, 32, 1); - - } - .i{ - width: 7.89px; - height: 10px; - top: 2.5px; - left: 1.97px; - gap: 0px; - opacity: 0px; - - - } - - .custom-btn-new-question { - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); - width: 91px; - height: 42px; - padding: 8px 0px 0px 0px; - gap: 8px; - border-radius: 8px 0px 0px 0px; - border: 1.4px 0px 0px 0px; - opacity: 0px; - background: rgba(95, 95, 95, 1); - color:rgba(126, 126, 126, 1); - - } - - - + border: 1.4px 0px 0px 0px; + opacity: 0px; + color: rgba(106, 95, 255, 1); + background: rgba(32, 32, 32, 1); + } + .i { + width: 7.89px; + height: 10px; + top: 2.5px; + left: 1.97px; + gap: 0px; + opacity: 0px; } - - + .custom-btn-new-question { + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); + width: 91px; + height: 42px; + padding: 8px 0px 0px 0px; + gap: 8px; + border-radius: 8px 0px 0px 0px; + border: 1.4px 0px 0px 0px; + opacity: 0px; + background: rgba(95, 95, 95, 1); + color: rgba(126, 126, 126, 1); + } } - } diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 6683493..a3ece83 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -29,9 +29,9 @@

Bienvenido "User"

- +
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index 4b7d6d9..b08f390 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -23,7 +23,7 @@ import { state( 'expanded', style({ - width: '900px', + maxWidth: '900px', }) ), transition('collapsed => expanded', [animate('300ms ease-out')]), @@ -39,7 +39,7 @@ import { state( 'expanded', style({ - width: '900px', + maxWidth: '900px', }) ), transition('collapsed => expanded', [animate('300ms ease-out')]), @@ -55,7 +55,7 @@ import { state( 'expanded', style({ - width: '900px', + maxWidth: '900px', }) ), transition('collapsed => expanded', [animate('300ms ease-out')]), From 6f9b078640455e522afffbb70842c10e25df407f Mon Sep 17 00:00:00 2001 From: Ignacio Date: Wed, 18 Sep 2024 16:45:02 -0300 Subject: [PATCH 009/203] cambio de pc --- .../modules/new/pages/new-pages/new-pages.component.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index e6d9227..7813b1e 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -88,14 +88,15 @@ $spacing: 20px; // Espaciado general para márgenes y padding /* width: Fixed (804px) px; height: Hug (278px) px; */ width: 804px; - height: 278px; + height: 274px; padding: 16px 0px 0px 0px; gap: 17px; font-family: Poppins; - border-radius: 8px 0px 0px 0px; + border-radius: 8px; + padding: 16px; opacity: 0px; box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); - background: rgba(79, 77, 77, 0.45); + background-color: #4f4d4d73; .custom-label { font-family: Poppins; From 009174ad01425d9dafa5951ac986ced7549f7b70 Mon Sep 17 00:00:00 2001 From: Agustindardanelli-stack Date: Wed, 18 Sep 2024 17:32:19 -0300 Subject: [PATCH 010/203] logic in true o false --- .../pages/new-pages/new-pages.component.html | 10 +++++++--- .../pages/new-pages/new-pages.component.scss | 16 ++++++++-------- .../new/pages/new-pages/new-pages.component.ts | 18 ++++++++++++++++-- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index a8cf461..4c3b3bc 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -58,7 +58,9 @@

Define la pregunta

class="custom-select" id="questionType" name="questionType" - ngModel + [(ngModel)]="selectedOption" + (ngModelChange)="onQuestionTypeChange($event)" + > required>
-
+
+ + +
-

Define la pregunta

+

Define la pregunta

-
-
-
- - + - -
+ [value]="type"> + {{ type }} + +
-
-
- - -
+
+ +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 7813b1e..0e1ed0f 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -84,6 +84,9 @@ $spacing: 20px; // Espaciado general para márgenes y padding } } } + + /* componente agus */ + .content-2 { /* width: Fixed (804px) px; height: Hug (278px) px; */ @@ -98,29 +101,40 @@ $spacing: 20px; // Espaciado general para márgenes y padding box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); background-color: #4f4d4d73; + .question-container { + background-color: pink; + width: 772px; + height: 52px; + display: flex; + align-items: center; + justify-content: space-between; + } + .custom-label { font-family: Poppins; - margin-bottom: 8px; + color: rgba(255, 255, 255, 1); } .custom-select { - width: Fill (377.5px) px; - height: Fixed (28px) px; - gap: 0px; - border-radius: 8px 0px 0px 0px; + width: 377.5px; + height: 28px; + border: none; opacity: 0px; + padding: 0 0 0 8px; color: rgba(48, 48, 48, 1); + background: rgba(32, 32, 32, 1); color: rgba(194, 187, 187, 0.6); } .custom-input { width: 377.5px; height: 28px; + border: none; gap: 0px; - border-radius: 8px 0px 0px 0px; - border: 1px 0px 0px 0px; + padding: 0px 0px 0px 8px; opacity: 0px; background: rgba(32, 32, 32, 1); + border-radius: 8px; } .custom-option-group { From eb8e40399d29fb50108e130cdefee0f35356c5f1 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Wed, 18 Sep 2024 17:55:05 -0300 Subject: [PATCH 012/203] resolucion de conflicto --- .../modules/new/pages/new-pages/new-pages.component.html | 5 +++-- .../modules/new/pages/new-pages/new-pages.component.scss | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 88ceffc..476f110 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -59,8 +59,9 @@

Define la pregunta

- - - - -
-
-

Célula

- -
-
-

Seniority / Nivel

- -
-
- +
+
+
+

Modulo

+ +
- +
+

Célula

+ - - -
-
- - -
-
+ -
- -
- - + + + + + + + + + + +
+ +
+

Seniority / Nivel

+ +
-
+ -
- -
+ -
- - -
- - +
+

Define la pregunta

+ + +
+
+
+ + +
+
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+ + +
+
+
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 78beceb..1e9cdc4 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -39,7 +39,7 @@ $spacing: 20px; // Espaciado general para márgenes y padding /* gap: $spacing; */ /* agregado */ - margin-bottom: 100px; + margin-bottom: 30px; .input-container { width: 251.33px; @@ -82,6 +82,58 @@ $spacing: 20px; // Espaciado general para márgenes y padding background-color: #353434; border-radius: 12px; } + + .diseño-ux-ui { + background-color: #ffcc00; + color: #795f3a; + } + + .qa-tester{ + border-radius: 20px; + background-color: #ff9500; + color: #795f3a; + } + .frontend{ + border-radius: 20px; + background-color: #34c759; + color: #795f3a; + } + .backend{ + border-radius: 20px; + background-color: #00c7be; + color: #795f3a; + } + .pm{ + border-radius: 20px; + background-color: #30b0c7; + color: #795f3a; + } + .scrum-master{ + border-radius: 20px; + background-color: #32ade6; + color: #795f3a; + } + .trainee{ + border-radius: 20px; + background-color: #007aff; + color: #795f3a; + } + .junior{ + border-radius: 20px; + background-color: #5856d6; + color: #795f3a; + } + .semi-sr{ + border-radius: 20px; + background-color: #af52de; + color: #795f3a; + } + .senior{ + border-radius: 20px; + background-color: #ff2d55; + color: #795f3a; + } + } } @@ -102,7 +154,7 @@ $spacing: 20px; // Espaciado general para márgenes y padding background-color: #4f4d4d73; .question-container { - + width: 772px; height: 52px; display: flex; @@ -148,10 +200,10 @@ $spacing: 20px; // Espaciado general para márgenes y padding .custom-add-option-btn { width: 350px; - height: 28px; + /* height: 28px; */ gap: 5px; border-radius: 8px; - padding: 8px; + padding: 5px; color: rgba(194, 187, 187, 0.6); } @@ -180,7 +232,7 @@ $spacing: 20px; // Espaciado general para márgenes y padding width: 91px; height: 42px; padding: 8px; - + border-radius: 8px; border: 1.4px solid #5F5F5F; font-size: 12px; diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 838e7b8..f0a7eb3 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -8,37 +8,38 @@ import { Component } from '@angular/core'; export class NewPagesComponent { questionTypes: string[] = ['Selección mutiple', 'Casilla', 'Verdadero o falso']; - options: string[] = ['Opción 1']; - selectedOption: string = ''; - - isTrueFalseQuestion: boolean = false; - - // DETECTA EL CAMBIO DE PREGUNTA - onQuestionTypeChange(selectedType: string) { - if (selectedType === 'Verdadero o falso') { - this.isTrueFalseQuestion = true; - // Si es verdadero o falso muestra estas opciones nada mas - this.options = ['Verdadero', 'Falso']; - } else { - this.isTrueFalseQuestion = false; - // Volver a permitir opciones personalizadas - this.options = ['Opción 1']; + options: string[] = ['Opción 1']; + selectedOption: string = ''; + + isTrueFalseQuestion: boolean = false; + + // DETECTA EL CAMBIO DE PREGUNTA + onQuestionTypeChange(selectedType: string) { + if (selectedType === 'Verdadero o falso') { + this.isTrueFalseQuestion = true; + // Si es verdadero o falso muestra estas opciones nada mas + this.options = ['Verdadero', 'Falso']; + } else { + this.isTrueFalseQuestion = false; + // Volver a permitir opciones personalizadas + this.options = ['Opción 1']; + } } - } - - addOption() { - this.options.push(`Opción ${this.options.length + 1}`); - } - - // enviar el formulario - onSubmit(form: any) { - console.log('Formulario enviado', form.value); - } - - // Crear una nueva pregunta - addNewQuestion(form:any) { - console.log('Nueva pregunta agregada'); - form.resetForm(); - this.options = ['Opción 1']; // Reiniciar las opciones - } + + addOption() { + this.options.push(`Opción ${this.options.length + 1}`); + } + + // enviar el formulario + onSubmit(form: any) { + console.log('Formulario enviado', form.value); + } + + // Crear una nueva pregunta + addNewQuestion(form: any) { + console.log('Nueva pregunta agregada'); + form.resetForm(); + this.options = ['Opción 1']; // Reiniciar las opciones + } + } From ed90096900d061693bc18bd47dafadfa568e6863 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Fri, 20 Sep 2024 15:53:41 -0300 Subject: [PATCH 015/203] detalles de maquetado corregidos --- .../pages/new-pages/new-pages.component.html | 264 +++++++++--------- .../pages/new-pages/new-pages.component.scss | 2 +- .../welcome-page/welcome-page.component.html | 2 +- .../sideBar/side-bar/side-bar.component.html | 2 +- 4 files changed, 132 insertions(+), 138 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index f496d91..4c56e70 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -4,150 +4,144 @@

Nombre del Quizz

-->
-
-
-
-

Modulo

- -
+
+
+
+

Módulo

+ +
-
-

Célula

- + - + - + + + + + + + + + + +
- - - - - - - - - - -
- -
-

Seniority / Nivel

- -
-
+
+

Seniority / Nivel

+ +
+
- + -
-

Define la pregunta

+
+

Define la pregunta

- -
-
-
- - -
-
- - -
-
+ + +
+
+ + +
+
+ + +
+
-
- -
- - -
-
+
+ +
+ + +
+
-
- -
+
+ +
-
- - -
-
-
+
+ + +
+ +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 1e9cdc4..5dc48a3 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -175,7 +175,7 @@ $spacing: 20px; // Espaciado general para márgenes y padding border: none; opacity: 0px; padding: 0 0 0 8px; - color: rgba(48, 48, 48, 1); + background: rgba(32, 32, 32, 1); color: rgba(194, 187, 187, 0.6); } diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 3ac8426..c8f8a75 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -1,7 +1,7 @@

Bienvenido "User"

-
+
diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index d20c771..e63333d 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -8,7 +8,7 @@
From 475b40a1d4cbea24b6e98d70cb70ba5e6838aaa1 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Fri, 20 Sep 2024 16:11:41 -0300 Subject: [PATCH 016/203] img --- .../components/sideBar/side-bar/side-bar.component.html | 4 ++-- .../components/sideBar/side-bar/side-bar.component.scss | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index e63333d..aca4228 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -1,6 +1,6 @@ -
- logo +
+ logo
diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss index 59d448a..bf1f348 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss @@ -45,8 +45,11 @@ background-color: #1b1b1bb2; } -.side-img img { - height: 41px; +.side-img { + height: 88px; + display: flex ; + justify-content: center; + } .sidebar-btns i { From 55ae009db99546b3acdb8a52455823a6bc97b84b Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Fri, 20 Sep 2024 16:17:54 -0300 Subject: [PATCH 017/203] correccion apertura de componentes --- .../welcome/pages/welcome-page/welcome-page.component.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index f00660c..798ab49 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -72,14 +72,20 @@ export class WelcomePageComponent { toggleExpand1() { this.isExpanded1 = !this.isExpanded1; + this.isExpanded2 = false; + this.isExpanded3 = false; } toggleExpand2() { this.isExpanded2 = !this.isExpanded2; + this.isExpanded1 = false; + this.isExpanded3 = false; } toggleExpand3() { - this.isExpanded3 = !this.isExpanded3; + this.isExpanded1 = !this.isExpanded3; + this.isExpanded2 = false; + this.isExpanded3 = false; } goToAll() { this.router.navigate(['/all']); From 9209ff1a2ef32716b08bbbf8b4720bf025547e59 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Fri, 20 Sep 2024 18:10:20 -0300 Subject: [PATCH 018/203] correccion imagen de wall --- .../welcome-page/welcome-page.component.html | 81 ++++++++++--------- .../welcome-page/welcome-page.component.scss | 21 ++++- 2 files changed, 59 insertions(+), 43 deletions(-) diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index c8f8a75..a4d26f7 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -1,47 +1,48 @@ - -
-

Bienvenido "User"

-
- +
+ +
+

Bienvenido "User"

+
+ +
-
- + -
-
- - -
-
- -
+
+
+ + +
+
+ +
-
- -
-
- -
+
+ +
+
+ +
-
- -
-
- -
+
+ +
+
+ +
- logo +
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index 59d5393..42afa94 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -20,6 +20,9 @@ box-shadow: 0px 4px 4px 0px #718ee3, 0px 4px 4px 0px #00000040; + position: relative; + z-index: 1; + /* top: 90px; */ } .column-btn { @@ -76,9 +79,21 @@ font-size: 22px; } -.ti-img{ +.ti-img { width: 414px; - position: relative; - left: 170px; + position: absolute; + z-index: 0; } + +.wall { + height: 623px; + width: 1034px; + display: flex; + flex-direction: column; + justify-content: space-between; + background-image: url('../../../../../assets/layout/images/logo.svg'); + background-repeat: no-repeat; + background-position: center; + background-size: 414px 404px; +} From 17b93435c9ccde4111d03017c79810c2027bd0c9 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 21 Sep 2024 09:15:36 -0300 Subject: [PATCH 019/203] correcciones --- .../pages/new-pages/new-pages.component.html | 22 +++++-- .../pages/new-pages/new-pages.component.scss | 58 ++++++++++++++----- 2 files changed, 59 insertions(+), 21 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 4c56e70..d63e769 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -59,8 +59,8 @@

Define la pregunta

-
-
+
+
@@ -80,7 +80,7 @@

Define la pregunta

-
+
- + +
- + id="option{{ i }}" /> --> + + Date: Sat, 21 Sep 2024 10:40:21 -0300 Subject: [PATCH 020/203] correcion de label --- src/app/modules/new/pages/new-pages/new-pages.component.html | 3 ++- src/app/modules/new/pages/new-pages/new-pages.component.scss | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index d63e769..6ecc21a 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -81,11 +81,12 @@

Define la pregunta

+
+ >
Date: Sat, 21 Sep 2024 11:16:59 -0300 Subject: [PATCH 021/203] formulario --- .../pages/new-pages/new-pages.component.html | 83 +++++++++---------- .../pages/new-pages/new-pages.component.ts | 4 +- .../sideBar/side-bar/side-bar.component.scss | 4 +- 3 files changed, 45 insertions(+), 46 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 6ecc21a..5589a1e 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -59,34 +59,35 @@

Define la pregunta

-
+
+ id="questionType" + name="questionType" + [(ngModel)]="selectedOption" + (ngModelChange)="onQuestionTypeChange($event)" + required> + + +
-
+ +
Define la pregunta
- -
- + +
+
+ +
+
+
- + name="agregate" + placeholder="Añadir una nueva opción" /> + name="agregate" + placeholder="Añadir una nueva opción" />
- + -->
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index f0a7eb3..47fe890 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -8,7 +8,7 @@ import { Component } from '@angular/core'; export class NewPagesComponent { questionTypes: string[] = ['Selección mutiple', 'Casilla', 'Verdadero o falso']; - options: string[] = ['Opción 1']; + options: string[] = ['Opción 1', 'Opción 2']; selectedOption: string = ''; isTrueFalseQuestion: boolean = false; @@ -22,7 +22,7 @@ export class NewPagesComponent { } else { this.isTrueFalseQuestion = false; // Volver a permitir opciones personalizadas - this.options = ['Opción 1']; + this.options = ['Opción 1',]; } } diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss index bf1f348..1caa69a 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss @@ -10,7 +10,7 @@ } .gestion-btns { - width: 167px; + width: 172px; height: 133px; display: flex; flex-direction: column; @@ -19,7 +19,7 @@ .sidebar-btns { background-color: #5f5f5f; - width: 166px; + width: 172px; height: 31px; border-radius: 10px; padding: 0px 16px 0px 16px; From 6cb665f22be1a69f7e8f07bbb5d0f0184a48af4a Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Mon, 23 Sep 2024 15:35:22 -0300 Subject: [PATCH 022/203] active color --- .../welcome-page/welcome-page.component.html | 10 +++++----- .../welcome-page/welcome-page.component.scss | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index a4d26f7..fab997c 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -12,7 +12,7 @@

Bienvenido "User"

-
+
-
+
@@ -33,16 +33,16 @@

Bienvenido "User"

-
+
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index 42afa94..a0fa762 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -25,6 +25,23 @@ /* top: 90px; */ } +.active-column { + width: 60px; + height: 551px; + border-radius: 12px; + padding: 24px 8px 8px 8px; + background-color: #212121; + display: flex; + align-items: start; + justify-content: center; + gap: 3px; + box-shadow: + 0px 4px 4px 0px #FF5EA6, + 0px 4px 4px 0px #00000040; + position: relative; + z-index: 1; +} + .column-btn { border: none; background-color: #212121; From 04a4d03dc5b1b137d52dfc8a3db20ea624a9b8f8 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Mon, 23 Sep 2024 20:19:51 -0300 Subject: [PATCH 023/203] valores de formulario --- src/app/modules/new/new.module.ts | 4 +- .../pages/new-pages/new-pages.component.html | 26 +++--- .../pages/new-pages/new-pages.component.ts | 87 ++++++++++++------- .../welcome-page/welcome-page.component.html | 1 - 4 files changed, 72 insertions(+), 46 deletions(-) diff --git a/src/app/modules/new/new.module.ts b/src/app/modules/new/new.module.ts index 90744fd..d75ca7d 100644 --- a/src/app/modules/new/new.module.ts +++ b/src/app/modules/new/new.module.ts @@ -2,12 +2,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { NewPagesComponent } from './pages/new-pages/new-pages.component'; import { NewRoutingModule } from './new-routing.module'; -import { FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @NgModule({ declarations: [NewPagesComponent], - imports: [CommonModule, NewRoutingModule,FormsModule], + imports: [CommonModule, NewRoutingModule,FormsModule, ReactiveFormsModule], exports: [NewPagesComponent], }) export class NewModule {} diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 5589a1e..edbe345 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -4,11 +4,13 @@

Nombre del Quizz

-->
-
+ +

Módulo

@@ -37,20 +40,23 @@

Célula

- +

Seniority / Nivel

-
+ class="form-select option-select" + formControlName="level" + aria-label="Default select example"> + + + + +
+ + diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 47fe890..786bb28 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,45 +1,66 @@ import { Component } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; + @Component({ - selector: 'app-new-pages', - templateUrl: './new-pages.component.html', - styleUrl: './new-pages.component.scss' + selector: 'app-new-pages', + templateUrl: './new-pages.component.html', + styleUrls: ['./new-pages.component.scss'], }) export class NewPagesComponent { + public createHeaderForm : FormGroup; + - questionTypes: string[] = ['Selección mutiple', 'Casilla', 'Verdadero o falso']; - options: string[] = ['Opción 1', 'Opción 2']; - selectedOption: string = ''; - - isTrueFalseQuestion: boolean = false; - - // DETECTA EL CAMBIO DE PREGUNTA - onQuestionTypeChange(selectedType: string) { - if (selectedType === 'Verdadero o falso') { - this.isTrueFalseQuestion = true; - // Si es verdadero o falso muestra estas opciones nada mas - this.options = ['Verdadero', 'Falso']; - } else { - this.isTrueFalseQuestion = false; - // Volver a permitir opciones personalizadas - this.options = ['Opción 1',]; - } - } + constructor(private formsBuilder: FormBuilder) {} - addOption() { - this.options.push(`Opción ${this.options.length + 1}`); - } + ngOnInit(): void { + this.createHeaderForm = this.formsBuilder.group({ + modulo: [Validators.required], + celula: [Validators.required], + level: [Validators.required], + }); + } - // enviar el formulario - onSubmit(form: any) { - console.log('Formulario enviado', form.value); - } + send(): any { + console.log(this.createHeaderForm.value); + } - // Crear una nueva pregunta - addNewQuestion(form: any) { - console.log('Nueva pregunta agregada'); - form.resetForm(); - this.options = ['Opción 1']; // Reiniciar las opciones + questionTypes: string[] = [ + 'Selección mutiple', + 'Casilla', + 'Verdadero o falso', + ]; + options: string[] = ['Opción 1', 'Opción 2']; + selectedOption: string = ''; + + isTrueFalseQuestion: boolean = false; + + // DETECTA EL CAMBIO DE PREGUNTA + onQuestionTypeChange(selectedType: string) { + if (selectedType === 'Verdadero o falso') { + this.isTrueFalseQuestion = true; + // Si es verdadero o falso muestra estas opciones nada mas + this.options = ['Verdadero', 'Falso']; + } else { + this.isTrueFalseQuestion = false; + // Volver a permitir opciones personalizadas + this.options = ['Opción 1']; } + } + + addOption() { + this.options.push(`Opción ${this.options.length + 1}`); + } + + // enviar el formulario + onSubmit(form: any) { + console.log('Formulario enviado', form.value); + } + // Crear una nueva pregunta + addNewQuestion(form: any) { + console.log('Nueva pregunta agregada'); + form.resetForm(); + this.options = ['Opción 1']; // Reiniciar las opciones + } } diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index fab997c..05bf4aa 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -13,7 +13,6 @@

Bienvenido "User"

- From 8459bf5804d2050a1cbc0fdf72b2eb627da4c87b Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 24 Sep 2024 12:15:44 -0300 Subject: [PATCH 024/203] form --- .../new/pages/new-pages/new-pages.component.html | 10 ++++------ .../new/pages/new-pages/new-pages.component.scss | 4 +++- .../new/pages/new-pages/new-pages.component.ts | 14 ++++---------- .../pages/welcome-page/welcome-page.component.html | 6 ++++-- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index edbe345..67b8ac8 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -26,9 +26,7 @@

Célula

class="form-select option-select" aria-label="Default select example"> - - @@ -54,13 +52,14 @@

Seniority / Nivel

- + +
+

Define la pregunta

@@ -106,7 +105,6 @@

Define la pregunta

-
@@ -122,7 +120,7 @@

Define la pregunta

diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 989e133..b0f68a7 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -80,12 +80,14 @@ $spacing: 20px; // Espaciado general para márgenes y padding .option { background-color: #353434; - border-radius: 12px; + white-space: nowrap; } .diseño-ux-ui { background-color: #ffcc00; color: #795f3a; + border-radius: 10px; + white-space: nowrap; } .qa-tester { diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 786bb28..b87873e 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,23 +1,20 @@ import { Component } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; - @Component({ selector: 'app-new-pages', templateUrl: './new-pages.component.html', styleUrls: ['./new-pages.component.scss'], }) export class NewPagesComponent { - public createHeaderForm : FormGroup; - - + public createHeaderForm: FormGroup; constructor(private formsBuilder: FormBuilder) {} ngOnInit(): void { this.createHeaderForm = this.formsBuilder.group({ - modulo: [Validators.required], - celula: [Validators.required], - level: [Validators.required], + modulo: ['', Validators.required], + celula: ['', Validators.required], + level: ['', Validators.required], }); } @@ -47,16 +44,13 @@ export class NewPagesComponent { this.options = ['Opción 1']; } } - addOption() { this.options.push(`Opción ${this.options.length + 1}`); } - // enviar el formulario onSubmit(form: any) { console.log('Formulario enviado', form.value); } - // Crear una nueva pregunta addNewQuestion(form: any) { console.log('Nueva pregunta agregada'); diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 05bf4aa..4f21452 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -28,8 +28,10 @@

Bienvenido "User"

Nuevo
-
- +
+ +
- -
+

Módulo

@@ -38,28 +37,26 @@

Célula

- +

Seniority / Nivel

+ class="form-select option-select" + formControlName="level" + aria-label="Default select example"> + + + + + +
-
- - - +
- +

Define la pregunta

@@ -69,6 +66,9 @@

Define la pregunta

+ + + Define la pregunta
-
+ +
-
+
+ +
+ +
+ Define la pregunta required />
+ +
- - +
+
+ +
+ + +
-
- -
+ +
-->
-->
-
+

Módulo

@@ -56,7 +56,7 @@

Seniority / Nivel

- +

Define la pregunta

@@ -115,7 +115,7 @@

Define la pregunta

@@ -130,39 +130,30 @@

Define la pregunta

[readonly]="isTrueFalseQuestion" required />
-
- -
-
+ + +
- +
-
- - -
+
+ diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index b58f454..3339ca3 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -8,11 +8,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; }) export class NewPagesComponent { public selectHeaderForm: FormGroup; - public selectQuestionForm: FormGroup; - constructor( - private formsBuilder: FormBuilder, - private formsBuilder2: FormBuilder - ) {} + constructor(private formsBuilder: FormBuilder) {} ngOnInit(): void { this.selectHeaderForm = this.formsBuilder.group({ @@ -20,14 +16,10 @@ export class NewPagesComponent { celula: ['', Validators.required], level: ['', Validators.required], }); - this.selectQuestionForm = this.formsBuilder2.group({ - tipo: ['', Validators.required], - pregunta: ['', Validators.required], - }); } send(): any { - console.log(this.selectHeaderForm.value, this.selectQuestionForm); + console.log(this.selectHeaderForm.value); } questionTypes: string[] = [ @@ -41,7 +33,7 @@ export class NewPagesComponent { isTrueFalseQuestion: boolean = false; showPlus: boolean = false; showSubmits: boolean = false; - inputType: string = '' + inputType: string = ''; // DETECTA EL CAMBIO DE PREGUNTA onQuestionTypeChange(selectedType: string) { @@ -51,20 +43,20 @@ export class NewPagesComponent { this.options = ['Verdadero', 'Falso']; this.showPlus = false; this.showSubmits = true; - this.inputType = 'radio' + this.inputType = 'radio'; } else if (selectedType === 'Selección mutiple') { this.isTrueFalseQuestion = false; // Volver a permitir opciones personalizadas this.options = ['Opción 1', 'Opción 2', 'Opción 3']; this.showPlus = true; this.showSubmits = true; - this.inputType = 'checkbox' + this.inputType = 'checkbox'; } else if (selectedType == 'Casilla') { this.isTrueFalseQuestion = false; this.showPlus = false; this.options = ['Opción 1', 'Opción 2']; this.showSubmits = true; - this.inputType = 'radio' + this.inputType = 'radio'; } } addOption() { diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 4f21452..0f9321e 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -28,11 +28,11 @@

Bienvenido "User"

Nuevo
-
+ -
+
--> +
+
@@ -55,8 +55,8 @@

Seniority / Nivel

- -
+
+

Define la pregunta

@@ -118,8 +118,10 @@

Define la pregunta

+ name="solution" + [value]="option" + (click)="choose(i, inputType)" + [(ngModel)]="selection"/>
Define la pregunta
-
+ +
- -
+
+ el != this.options[i]); - this.selection = this.coso; - console.log(this.coso); + this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ + this.selection = []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ + this.array.push(this.options[i]); + this.selection = this.array; + console.log(this.selection); + + } else if (this.array.includes(this.options[i])) { + this.array = this.array.filter(el => el != this.options[i]); + this.selection = this.array; + console.log(this.array); + } else { - this.coso = this.coso.filter(el => el != 'Verdadero'); - this.coso = this.coso.filter(el => el != 'Falso'); - this.coso.push(this.options[i]); - this.selection = this.coso; + this.array = this.array.filter(el => el != 'Verdadero'); + this.array = this.array.filter(el => el != 'Falso'); + this.array.push(this.options[i]); + this.selection = this.array; } } + send(): any { + console.log(this.selectHeaderForm.value); + } + addOption() { this.options.push(`Opción ${this.options.length + 1}`); } From 9922cdb93186cdd3d771b285a366dcba0fb6cf42 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Thu, 26 Sep 2024 19:06:42 -0300 Subject: [PATCH 032/203] maquetado e inputs --- .../pages/new-pages/new-pages.component.html | 292 +++++++++--------- .../pages/new-pages/new-pages.component.scss | 187 ++++++++--- .../welcome-page/welcome-page.component.html | 47 ++- .../welcome-page/welcome-page.component.scss | 18 +- 4 files changed, 330 insertions(+), 214 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 6c5c90c..26f0fb1 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -4,174 +4,174 @@

Nombre del Quiz

-->
- -
-
-

Módulo

- +
+
+
+
- -
-

Célula

- -
- -
-

Seniority / Nivel

- +
+
- - - - -
- -

Define la pregunta

- - -
-
-
- - - - + +
+
+

Módulo

-
-
- -
- +
+

Célula

+ +
- +
+

Seniority / Nivel

+
+ - + -
-
-
- -
- +
+ +

Define la pregunta

+ + +
+
+
+ + + + + +
+
+
+
- + + +
+
- + + +
+
+
+ +
+ +
+ + +
-
-
- + + +
+
+ +
+
-
-
- -
- - - -
- + +
+ + + +
+ +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 2fc3c6e..3fedf14 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -4,10 +4,50 @@ $input-bg-color: #333; $text-color: #fff; $border-radius: 12px; $transition-time: 0.3s; -$spacing: 20px; +$spacing: 20px; .new-title { - margin-top: $spacing; + margin-top: 20px; + height: 40; +} + +.input-name { + width: 384px; + height: 40px; +} + +.text-description { + width: 804px; + height: 76px; + margin: 0; + padding-top: 8px; +} +.input-name, .text-description { + border-radius: 8px; + border: 1px solid #333232; + background-color: #1B1B1B; + padding-left: 16px; + font-size: 14px; +} + +.header-inputs-container { + width: 820px; + height: 140px; + + padding: 8px; + display: flex; + flex-direction: column; + justify-content: space-between; + margin-bottom: 16px; +} + +.transparent { + background-color: #2121217a; + width: 869px; + height: 623px; + display: flex; + flex-direction: column; + align-items: center; } .normal-container { @@ -15,16 +55,22 @@ $spacing: 20px; flex-direction: column; align-items: center; width: 869px; - height: 551px; - padding: $spacing; + height: 623px; + background-color: #212121; + padding: $spacing; border-radius: $border-radius; box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); - background: url('/src/assets/layout/images/logo.svg') center/cover no-repeat; + background-color: #212121; + background-image: url('../../../../../assets/layout/images/logo.svg'); + background-repeat: no-repeat; + background-position: center; + background-size: 180px; .content { display: flex; flex-direction: column; + justify-content: center; align-items: center; margin-bottom: 30px; @@ -38,12 +84,13 @@ $spacing: 20px; .content-1 { background-color: #353434; + display: flex; justify-content: space-between; width: 804px; height: 68px; + border-radius: 12px; padding: 8px; - border-radius: $border-radius; h4 { margin: 0; @@ -51,11 +98,12 @@ $spacing: 20px; } .option-select { + border: 2px solid #fff; + border: none; + color: #c2bbbb99; + background-color: #202020; width: 251.33px; height: 28px; - background-color: #202020; - color: #c2bbbb99; - border: none; } .option { @@ -63,13 +111,57 @@ $spacing: 20px; white-space: nowrap; } - // Reutilización de estilos para roles - @each $role, $color in (diseño-ux-ui: #ffcc00, qa-tester: #ff9500, frontend: #34c759, backend: #00c7be, pm: #30b0c7, scrum-master: #32ade6, trainee: #007aff, junior: #5856d6, semi-sr: #af52de, senior: #ff2d55) { - .#{$role} { - border-radius: 20px; - background-color: $color; - color: #795f3a; - } + .diseño-ux-ui { + background-color: #ffcc00; + color: #795f3a; + border-radius: 10px; + white-space: nowrap; + } + + .qa-tester { + border-radius: 20px; + background-color: #ff9500; + color: #795f3a; + } + .frontend { + border-radius: 20px; + background-color: #34c759; + color: #795f3a; + } + .backend { + border-radius: 20px; + background-color: #00c7be; + color: #795f3a; + } + .pm { + border-radius: 20px; + background-color: #30b0c7; + color: #795f3a; + } + .scrum-master { + border-radius: 20px; + background-color: #32ade6; + color: #795f3a; + } + .trainee { + border-radius: 20px; + background-color: #007aff; + color: #795f3a; + } + .junior { + border-radius: 20px; + background-color: #5856d6; + color: #795f3a; + } + .semi-sr { + border-radius: 20px; + background-color: #af52de; + color: #795f3a; + } + .senior { + border-radius: 20px; + background-color: #ff2d55; + color: #795f3a; } } } @@ -83,13 +175,14 @@ $spacing: 20px; .content-2 { width: 804px; - padding: 16px; + padding: 16px 0px 0px 0px; gap: 17px; font-family: Poppins; border-radius: 8px; + padding: 16px; opacity: 0px; - box-shadow: 0px -3px 12.8px rgba(241, 121, 197, 1); - background: rgba(79, 77, 77, 0.45) url('../../../../../assets/layout/images/logo.svg') center/180px no-repeat; + background-color: #4f4d4d73; + box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); .question-container { width: 772px; @@ -103,16 +196,27 @@ $spacing: 20px; font-family: Poppins; font-weight: 500; font-size: 14px; - color: #fff; + color: rgba(255, 255, 255, 1); } - .custom-select, .custom-input { + .custom-select { width: 377.5px; height: 28px; border: none; - padding-left: 8px; - background: #202020; + opacity: 0px; + padding: 0 0 0 8px; + + background: rgba(32, 32, 32, 1); color: rgba(194, 187, 187, 0.6); + } + .custom-input { + width: 377.5px; + height: 28px; + border: none; + gap: 0px; + padding: 0px 0px 0px 8px; + opacity: 0px; + background: rgba(32, 32, 32, 1); border-radius: 8px; } @@ -130,10 +234,11 @@ $spacing: 20px; .custom-option-input { width: 350px; height: 28px; + border-radius: 8px; background-color: #202020; border: none; color: gray; - border-radius: 0 8px 8px 0; + border-radius: 0 8px 8px 0px; } .checkbox-container { @@ -151,44 +256,52 @@ $spacing: 20px; background-color: red; border: none; } - .custom-radio { + padding: 0 0 0 8px; width: 378px; - padding-left: 8px; } .custom-add-option-btn { width: 350px; - padding: 5px; gap: 5px; border-radius: 8px; + padding: 5px; color: rgba(194, 187, 187, 0.6); } - + .custom-btn-submit:hover { + background-color: rgba(106, 95, 255, 1); + color: #fff; + } .custom-btn-submit { width: 91px; height: 42px; padding: 3px; + + cursor: pointer; border-radius: 8px; border: 1.4px solid #706fe5; - background: rgba(0, 0, 0, 0.15); - color: rgba(106, 95, 255, 1); font-size: 12px; - cursor: pointer; - transition: background-color $transition-time; - - &:hover { - background-color: rgba(106, 95, 255, 1); - color: #fff; - } + color: rgba(106, 95, 255, 1); + background: #00000026; + } + .i { + width: 7.89px; + height: 10px; + top: 2.5px; + left: 1.97px; + gap: 0px; + opacity: 0px; } .custom-btn-new-question { + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); width: 91px; height: 42px; padding: 8px; + border-radius: 8px; border: 1.4px solid #5f5f5f; + font-size: 12px; background: rgba(95, 95, 95, 1); color: rgba(126, 126, 126, 1); display: flex; diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 69d102b..f643bd5 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -1,49 +1,40 @@
-
+ + +
+
- +
+
-
-
+
+
- + [@expandState1]="isExpanded1 ? 'expanded order-2' : 'collapsed'"> +
-
+
-
- -
- - +
+ +
+ +
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index a0fa762..77430ad 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -9,7 +9,7 @@ .column-tasks { width: 60px; - height: 551px; + height: 623px; border-radius: 12px; padding: 24px 8px 8px 8px; background-color: #212121; @@ -27,7 +27,7 @@ .active-column { width: 60px; - height: 551px; + height: 623px; border-radius: 12px; padding: 24px 8px 8px 8px; background-color: #212121; @@ -107,10 +107,22 @@ height: 623px; width: 1034px; display: flex; - flex-direction: column; + flex-direction: row-reverse; justify-content: space-between; background-image: url('../../../../../assets/layout/images/logo.svg'); background-repeat: no-repeat; background-position: center; background-size: 414px 404px; + +} + +.order-item{ + + display: flex; + flex-direction: row-reverse; + justify-content: start; +} + +.negro { + background-color: gray; } From 00f200b6891c38dc37f7f88f612645a4ce5df028 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Thu, 26 Sep 2024 19:24:52 -0300 Subject: [PATCH 033/203] validaciones --- .../pages/new-pages/new-pages.component.html | 16 ++++----- .../pages/new-pages/new-pages.component.ts | 34 +++++++++++++------ 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 26f0fb1..72f260a 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -5,14 +5,14 @@

Nombre del Quiz

-
+
- +
- +
-
+
@@ -64,8 +64,8 @@

Seniority / Nivel

-
- + +

Define la pregunta

@@ -157,8 +157,8 @@

Define la pregunta

- -
+
+ diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 39aaf54..45ccb28 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -8,6 +8,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; }) export class NewPagesComponent { public selectHeaderForm: FormGroup; + public titleForm: FormGroup; constructor(private formsBuilder: FormBuilder) {} ngOnInit(): void { @@ -16,6 +17,10 @@ export class NewPagesComponent { celula: ['', Validators.required], level: ['', Validators.required], }); + this.titleForm = this.formsBuilder.group({ + nombreQuiz :[''], + descripcion: [''], + }) } questionTypes: string[] = [ @@ -24,6 +29,8 @@ export class NewPagesComponent { 'Verdadero o falso', ]; + + options: string[] = []; selection: string[] = ['']; array: string[] = ['']; @@ -34,10 +41,11 @@ export class NewPagesComponent { showSubmits: boolean = false; inputType: string = ''; - // DETECTA EL CAMBIO DE PREGUNTA onQuestionTypeChange(selectedType: string) { - this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ - this.selection = []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ + this.array = + []; /* <--- este array se crea porque no permite hacer push a selection directamente */ + this.selection = + []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ if (selectedType === 'Verdadero o falso') { this.isTrueFalseQuestion = true; this.options = ['Verdadero', 'Falso']; @@ -53,25 +61,28 @@ export class NewPagesComponent { } else if (selectedType == 'Casilla') { this.isTrueFalseQuestion = false; this.showPlus = false; - this.options = ['Opción 1.', 'Opción 2.']; /* haciendo distinto el valor funciona */ + this.options = [ + 'Opción 1.', + 'Opción 2.', + ]; /* haciendo distinto el valor funciona */ this.showSubmits = true; this.inputType = 'radio'; } } - answerChoice(i: number, type: string, form: any) { + answerChoice(i: number, type: string, form: any) { if (type === 'radio') { - this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ - this.selection = []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ + this.array = + []; /* <--- este array se crea porque no permite hacer push a selection directamente */ + this.selection = + []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ this.array.push(this.options[i]); this.selection = this.array; console.log(this.selection); - } else if (this.array.includes(this.options[i])) { this.array = this.array.filter(el => el != this.options[i]); this.selection = this.array; console.log(this.array); - } else { this.array = this.array.filter(el => el != 'Verdadero'); this.array = this.array.filter(el => el != 'Falso'); @@ -90,9 +101,12 @@ export class NewPagesComponent { // enviar el formulario onSubmit(form: any) { - const formHeader = this.selectHeaderForm.valid; + const formHeader = this.selectHeaderForm.value; const formSection = form.value; console.log(formSection); + console.log(formHeader); + console.log(this.titleForm.value); + } // Crear una nueva pregunta addNewQuestion(form: any) { From 0bb7a6e44afa126aebf912832386e06a607007b1 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Thu, 26 Sep 2024 20:09:39 -0300 Subject: [PATCH 034/203] addplus --- src/app/modules/new/pages/new-pages/new-pages.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 45ccb28..7a54e8a 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -60,7 +60,7 @@ export class NewPagesComponent { this.inputType = 'checkbox'; } else if (selectedType == 'Casilla') { this.isTrueFalseQuestion = false; - this.showPlus = false; + this.showPlus = true; this.options = [ 'Opción 1.', 'Opción 2.', From 9909fb3a756125c4a6c7a90bd00e00b024e16fd5 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Fri, 27 Sep 2024 12:21:10 -0300 Subject: [PATCH 035/203] detalles --- .../pages/new-pages/new-pages.component.html | 123 ++++++++++-------- .../pages/new-pages/new-pages.component.scss | 21 +-- .../pages/new-pages/new-pages.component.ts | 13 +- 3 files changed, 88 insertions(+), 69 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 72f260a..b0d6231 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -5,59 +5,73 @@

Nombre del Quiz

- -
- -
-
- -
- -
-
-
-

Módulo

- + +
+
+
- -
-

Célula

- +
+
+
+ +
+
+
+

Módulo

+ +
-
-

Seniority / Nivel

- +
+

Célula

+ +
+ +
+

Seniority / Nivel

+ +
@@ -65,8 +79,8 @@

Seniority / Nivel

-
-

Define la pregunta

+
+

Define la pregunta 1/5

@@ -130,6 +144,7 @@

Define la pregunta

[value]="option" [ngModel]="selection" (ngModelChange)="answerChoice(i, inputType)" /> +
Define la pregunta
-
- +
+ diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 3fedf14..9722dc5 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -11,6 +11,12 @@ $spacing: 20px; height: 40; } +.question-title { + font-style: Poppins; + font-weight: 400; + font-size: 22px; +} + .input-name { width: 384px; height: 40px; @@ -256,6 +262,7 @@ $spacing: 20px; background-color: red; border: none; } + .custom-radio { padding: 0 0 0 8px; width: 378px; @@ -266,23 +273,21 @@ $spacing: 20px; gap: 5px; border-radius: 8px; padding: 5px; - color: rgba(194, 187, 187, 0.6); - } - .custom-btn-submit:hover { - background-color: rgba(106, 95, 255, 1); - color: #fff; + color: #D8D6D6; } + .custom-btn-submit { width: 91px; height: 42px; padding: 3px; - + background-color: rgba(106, 95, 255, 1); + box-shadow: 0px 4px 4px 0px #00000026; cursor: pointer; border-radius: 8px; border: 1.4px solid #706fe5; font-size: 12px; - color: rgba(106, 95, 255, 1); - background: #00000026; + color: #ffff; + } .i { width: 7.89px; diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 7a54e8a..6e60d52 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -13,14 +13,13 @@ export class NewPagesComponent { ngOnInit(): void { this.selectHeaderForm = this.formsBuilder.group({ + nombreQuiz :['', Validators.required], + descripcion: ['', Validators.required], modulo: ['', Validators.required], celula: ['', Validators.required], level: ['', Validators.required], }); - this.titleForm = this.formsBuilder.group({ - nombreQuiz :[''], - descripcion: [''], - }) + } questionTypes: string[] = [ @@ -61,12 +60,13 @@ export class NewPagesComponent { } else if (selectedType == 'Casilla') { this.isTrueFalseQuestion = false; this.showPlus = true; + this.showSubmits = true; + this.inputType = 'radio'; this.options = [ 'Opción 1.', 'Opción 2.', ]; /* haciendo distinto el valor funciona */ - this.showSubmits = true; - this.inputType = 'radio'; + /* Pero al agregar un campo el problema vuelve a surgir */ } } @@ -105,7 +105,6 @@ export class NewPagesComponent { const formSection = form.value; console.log(formSection); console.log(formHeader); - console.log(this.titleForm.value); } // Crear una nueva pregunta From 4e5f337a66636dd7a49f19c74770d5f480bbf5f2 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Fri, 27 Sep 2024 15:16:19 -0300 Subject: [PATCH 036/203] punto --- .../pages/new-pages/new-pages.component.html | 135 +++++++++--------- .../pages/new-pages/new-pages.component.ts | 23 +-- .../welcome-page/welcome-page.component.html | 1 + 3 files changed, 82 insertions(+), 77 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index b0d6231..1a800a4 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -5,73 +5,59 @@

Nombre del Quiz

- -
-
- -
-
- -
+ +
+
+
+ +
+ +
+
+
+

Módulo

+ +
-
-
-
-

Módulo

- -
- -
-

Célula

- -
+
+

Célula

+ +
-
-

Seniority / Nivel

- -
+
+

Seniority / Nivel

+
@@ -79,8 +65,8 @@

Seniority / Nivel

-
-

Define la pregunta 1/5

+
+

Define la pregunta

@@ -144,7 +130,6 @@

Define la pregunta 1/5

[value]="option" [ngModel]="selection" (ngModelChange)="answerChoice(i, inputType)" /> -
Define la pregunta 1/5 name="agregate" placeholder="Añadir una nueva opción" />
+ + +
+
+ +
+ +
-
- + +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 6e60d52..454d2c9 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -13,11 +13,11 @@ export class NewPagesComponent { ngOnInit(): void { this.selectHeaderForm = this.formsBuilder.group({ - nombreQuiz :['', Validators.required], - descripcion: ['', Validators.required], - modulo: ['', Validators.required], - celula: ['', Validators.required], - level: ['', Validators.required], + nombreQuiz :[''], /* Validators.required */ + descripcion: [''], /* Validators.required */ + modulo: [''], /* Validators.required */ + celula: [''], /* Validators.required */ + level: [''], /* Validators.required */ }); } @@ -37,6 +37,7 @@ export class NewPagesComponent { isTrueFalseQuestion: boolean = false; showPlus: boolean = false; + showPlus2: boolean = false; showSubmits: boolean = false; inputType: string = ''; @@ -49,17 +50,20 @@ export class NewPagesComponent { this.isTrueFalseQuestion = true; this.options = ['Verdadero', 'Falso']; this.showPlus = false; + this.showPlus2 = false; this.showSubmits = true; this.inputType = 'radio'; } else if (selectedType === 'Selección mutiple') { this.isTrueFalseQuestion = false; this.options = ['Opción 1', 'Opción 2', 'Opción 3']; this.showPlus = true; + this.showPlus2 = false; this.showSubmits = true; this.inputType = 'checkbox'; } else if (selectedType == 'Casilla') { this.isTrueFalseQuestion = false; - this.showPlus = true; + this.showPlus = false; + this.showPlus2 = true; this.showSubmits = true; this.inputType = 'radio'; this.options = [ @@ -78,11 +82,11 @@ export class NewPagesComponent { []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ this.array.push(this.options[i]); this.selection = this.array; - console.log(this.selection); + } else if (this.array.includes(this.options[i])) { this.array = this.array.filter(el => el != this.options[i]); this.selection = this.array; - console.log(this.array); + } else { this.array = this.array.filter(el => el != 'Verdadero'); this.array = this.array.filter(el => el != 'Falso'); @@ -98,6 +102,9 @@ export class NewPagesComponent { addOption() { this.options.push(`Opción ${this.options.length + 1}`); } + addOption2() { + this.options.push(`Opción ${this.options.length + 1+'.'}`); + } // enviar el formulario onSubmit(form: any) { diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index f643bd5..d4e698e 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -32,6 +32,7 @@

Bienvenido "User"

+
From 2aa8d591dd659243be6cb741acc051a0db91c82c Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Fri, 27 Sep 2024 16:21:31 -0300 Subject: [PATCH 037/203] colors --- .../pages/all-page/all-page.component.html | 2 +- .../pages/new-pages/new-pages.component.html | 15 +++++++- .../pages/new-pages/new-pages.component.scss | 35 +++++++++++++++++++ .../pages/new-pages/new-pages.component.ts | 2 +- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 595fa6d..3c756d9 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1 +1 @@ -

Soy el all page

\ No newline at end of file +

App

\ No newline at end of file diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 1a800a4..808d20d 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -31,7 +31,7 @@

Módulo

Célula

+ +
+ + + + + + + + + + +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 9722dc5..92da78e 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -6,6 +6,40 @@ $border-radius: 12px; $transition-time: 0.3s; $spacing: 20px; + + +.celula-select { + position: relative; +} + +.sp { + position: relative; +} +.option-floating { + position: absolute; + top: 322px; + width: 251.33px; + background-color: #303030; + display: flex; + flex-wrap: wrap; + justify-content: center; + gap: 9px; + align-items: center; + padding: 8px; + border-radius: 8px; + +} + +.floating { + border: none; + padding-left: 8px; + padding-right: 8px; + font-size: 12px; +} + + +/* */ + .new-title { margin-top: 20px; height: 40; @@ -320,3 +354,4 @@ $spacing: 20px; } } } + diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 454d2c9..fc6b64b 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -29,7 +29,7 @@ export class NewPagesComponent { ]; - + showCelula: boolean = false options: string[] = []; selection: string[] = ['']; array: string[] = ['']; From e7ab2fda3cc0d5d7e89b607e39f1ec1e8bf31a77 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Fri, 27 Sep 2024 19:45:16 -0300 Subject: [PATCH 038/203] correcciones --- .../pages/new-pages/new-pages.component.html | 148 ++++++++++-------- .../pages/new-pages/new-pages.component.ts | 11 +- 2 files changed, 88 insertions(+), 71 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 808d20d..e4f6ccf 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -5,72 +5,90 @@

Nombre del Quiz

- -
- -
-
- -
- -
-
-
-

Módulo

- + +
+
+
+
+ +
+
-
-

Célula

- - -
- - - - - - - - - - +
+
+
+

Módulo

+
-
-
-

Seniority / Nivel

- +
+

Célula

+ + +
+ + + + + + + + + + +
+
+ +
+

Seniority / Nivel

+ +
@@ -78,7 +96,7 @@

Seniority / Nivel

-
+

Define la pregunta

@@ -182,8 +200,8 @@

Define la pregunta

- -
+
+ diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index fc6b64b..617f1f5 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -8,16 +8,15 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; }) export class NewPagesComponent { public selectHeaderForm: FormGroup; - public titleForm: FormGroup; constructor(private formsBuilder: FormBuilder) {} ngOnInit(): void { this.selectHeaderForm = this.formsBuilder.group({ - nombreQuiz :[''], /* Validators.required */ - descripcion: [''], /* Validators.required */ - modulo: [''], /* Validators.required */ - celula: [''], /* Validators.required */ - level: [''], /* Validators.required */ + nombreQuiz :['' , Validators.required], /* Validators.required */ + descripcion: ['', Validators.required], /* Validators.required */ + modulo: ['', Validators.required], /* Validators.required */ + celula: ['', Validators.required], /* Validators.required */ + level: ['', Validators.required], /* Validators.required */ }); } From db5fad832dc381d941ff24aa206b80dd3fc2268b Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 28 Sep 2024 12:58:41 -0300 Subject: [PATCH 039/203] buttons --- .../pages/all-page/all-page.component.html | 71 ++- .../pages/all-page/all-page.component.scss | 24 + .../pages/new-pages/new-pages.component.html | 379 ++++++------ .../pages/new-pages/new-pages.component.scss | 549 +++++++++--------- .../pages/new-pages/new-pages.component.ts | 38 +- 5 files changed, 578 insertions(+), 483 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 3c756d9..4174b27 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1 +1,70 @@ -

App

\ No newline at end of file +
+
+
+

Módulo

+ +
+ +
+

Célula

+ + + +
+ + + + + + + + + + +
+
+ +
+

Seniority / Nivel

+ +
+
+
\ No newline at end of file diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index e69de29..afb224b 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -0,0 +1,24 @@ +.content { + background-color: blueviolet; +} + +.option-floating { + position: absolute; + + width: 251.33px; + background-color: #303030; + display: flex; + flex-wrap: wrap; + justify-content: center; + gap: 9px; + align-items: center; + padding: 8px; + border-radius: 8px; + } + + .floating { + border: none; + padding-left: 8px; + padding-right: 8px; + font-size: 12px; + } diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index e4f6ccf..8cb2cab 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -3,218 +3,225 @@

Nombre del Quiz

--> -
-
-
-
-
- -
-
- -
+
+ +
+
+
+
+ +
+
-
-
-
-

Módulo

- -
+
+
+
+

Módulo

+ +
-
-

Célula

- - -
- - - - - - - - - - -
+
+

Célula

+
+ + + + + + + + + + + +
+ +
-
-

Seniority / Nivel

- -
+ +
+ +
+

Seniority / Nivel

+
- +
+ - + - -
-

Define la pregunta

+ +
+

Define la pregunta 1/5

- -
-
-
- + +
+
+ + + + + +
+
+
+ +
- + - -
-
-
- -
+ +
+
- + +
+
+
+ +
+ +
+
-
- - - -
-
-
- -
- -
- - -
- + -
-
- -
- +
+
+
+ +
- -
-
- -
- + +
+
+
+
+
-
- - - - -
- -
+
+ + + +
+
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 92da78e..5bdf8cf 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -6,40 +6,6 @@ $border-radius: 12px; $transition-time: 0.3s; $spacing: 20px; - - -.celula-select { - position: relative; -} - -.sp { - position: relative; -} -.option-floating { - position: absolute; - top: 322px; - width: 251.33px; - background-color: #303030; - display: flex; - flex-wrap: wrap; - justify-content: center; - gap: 9px; - align-items: center; - padding: 8px; - border-radius: 8px; - -} - -.floating { - border: none; - padding-left: 8px; - padding-right: 8px; - font-size: 12px; -} - - -/* */ - .new-title { margin-top: 20px; height: 40; @@ -62,10 +28,11 @@ $spacing: 20px; margin: 0; padding-top: 8px; } -.input-name, .text-description { +.input-name, +.text-description { border-radius: 8px; border: 1px solid #333232; - background-color: #1B1B1B; + background-color: #1b1b1b; padding-left: 16px; font-size: 14px; } @@ -73,7 +40,7 @@ $spacing: 20px; .header-inputs-container { width: 820px; height: 140px; - + padding: 8px; display: flex; flex-direction: column; @@ -106,252 +73,268 @@ $spacing: 20px; background-repeat: no-repeat; background-position: center; background-size: 180px; +} +.content { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin-bottom: 30px; +} +.input-container { + width: 251.33px; + height: 52px; + display: flex; + flex-direction: column; + justify-content: space-between; +} + +.option-floating { + position: absolute; + bottom: 280px; + width: 251.33px; + background-color: #303030; + display: flex; + flex-wrap: wrap; + justify-content: center; + gap: 9px; + align-items: center; + padding: 8px; + border-radius: 8px; +} + +.floating { + border: none; + padding-left: 8px; + padding-right: 8px; + font-size: 12px; +} + +.content-1 { + background-color: #353434; - .content { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - margin-bottom: 30px; - - .input-container { - width: 251.33px; - height: 52px; - display: flex; - flex-direction: column; - justify-content: space-between; - } - - .content-1 { - background-color: #353434; - - display: flex; - justify-content: space-between; - width: 804px; - height: 68px; - border-radius: 12px; - padding: 8px; - - h4 { - margin: 0; - font-size: 16px; - } - - .option-select { - border: 2px solid #fff; - border: none; - color: #c2bbbb99; - background-color: #202020; - width: 251.33px; - height: 28px; - } - - .option { - background-color: #353434; - white-space: nowrap; - } - - .diseño-ux-ui { - background-color: #ffcc00; - color: #795f3a; - border-radius: 10px; - white-space: nowrap; - } - - .qa-tester { - border-radius: 20px; - background-color: #ff9500; - color: #795f3a; - } - .frontend { - border-radius: 20px; - background-color: #34c759; - color: #795f3a; - } - .backend { - border-radius: 20px; - background-color: #00c7be; - color: #795f3a; - } - .pm { - border-radius: 20px; - background-color: #30b0c7; - color: #795f3a; - } - .scrum-master { - border-radius: 20px; - background-color: #32ade6; - color: #795f3a; - } - .trainee { - border-radius: 20px; - background-color: #007aff; - color: #795f3a; - } - .junior { - border-radius: 20px; - background-color: #5856d6; - color: #795f3a; - } - .semi-sr { - border-radius: 20px; - background-color: #af52de; - color: #795f3a; - } - .senior { - border-radius: 20px; - background-color: #ff2d55; - color: #795f3a; - } - } - } - - .form-group { - display: flex; - justify-content: space-between; - flex-wrap: wrap; - width: 772px; - } - - .content-2 { - width: 804px; - padding: 16px 0px 0px 0px; - gap: 17px; - font-family: Poppins; - border-radius: 8px; - padding: 16px; - opacity: 0px; - background-color: #4f4d4d73; - box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); - - .question-container { - width: 772px; - height: 52px; - display: flex; - align-items: center; - justify-content: space-between; - } - - .custom-label { - font-family: Poppins; - font-weight: 500; - font-size: 14px; - color: rgba(255, 255, 255, 1); - } - - .custom-select { - width: 377.5px; - height: 28px; - border: none; - opacity: 0px; - padding: 0 0 0 8px; - - background: rgba(32, 32, 32, 1); - color: rgba(194, 187, 187, 0.6); - } - .custom-input { - width: 377.5px; - height: 28px; - border: none; - gap: 0px; - padding: 0px 0px 0px 8px; - opacity: 0px; - background: rgba(32, 32, 32, 1); - border-radius: 8px; - } - - .custom-option-group { - margin-bottom: 10px; - } - - .option-row { - width: 804px; - display: flex; - justify-content: space-between; - flex-wrap: wrap; - } - - .custom-option-input { - width: 350px; - height: 28px; - border-radius: 8px; - background-color: #202020; - border: none; - color: gray; - border-radius: 0 8px 8px 0px; - } - - .checkbox-container { - width: 28px; - height: 28px; - background-color: #303030; - border-radius: 8px 0 0 8px; - display: flex; - justify-content: center; - align-items: center; - } - - .checkbox-input { - height: 29px; - background-color: red; - border: none; - } - - .custom-radio { - padding: 0 0 0 8px; - width: 378px; - } - - .custom-add-option-btn { - width: 350px; - gap: 5px; - border-radius: 8px; - padding: 5px; - color: #D8D6D6; - } - - .custom-btn-submit { - width: 91px; - height: 42px; - padding: 3px; - background-color: rgba(106, 95, 255, 1); - box-shadow: 0px 4px 4px 0px #00000026; - cursor: pointer; - border-radius: 8px; - border: 1.4px solid #706fe5; - font-size: 12px; - color: #ffff; - - } - .i { - width: 7.89px; - height: 10px; - top: 2.5px; - left: 1.97px; - gap: 0px; - opacity: 0px; - } - - .custom-btn-new-question { - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); - width: 91px; - height: 42px; - padding: 8px; - - border-radius: 8px; - border: 1.4px solid #5f5f5f; - font-size: 12px; - background: rgba(95, 95, 95, 1); - color: rgba(126, 126, 126, 1); - display: flex; - justify-content: center; - align-items: center; - } - - .label-input { - display: flex; - justify-content: flex-start; - } - } + display: flex; + justify-content: space-between; + width: 804px; + height: 68px; + border-radius: 12px; + padding: 8px; +} +h4 { + margin: 0; + font-size: 16px; } +.option-select { + position: relative; + border: 2px solid #fff; + border: none; + color: #c2bbbb99; + background-color: #202020; + width: 251.33px; + height: 28px; +} + +.option { + background-color: #353434; + white-space: nowrap; +} + +.diseño-ux-ui { + background-color: #ffcc00; + color: #795f3a; + border-radius: 10px; + white-space: nowrap; +} + +.qa-tester { + border-radius: 20px; + background-color: #ff9500; + color: #795f3a; +} +.frontend { + border-radius: 20px; + background-color: #34c759; + color: #795f3a; +} +.backend { + border-radius: 20px; + background-color: #00c7be; + color: #795f3a; +} +.pm { + border-radius: 20px; + background-color: #30b0c7; + color: #795f3a; +} +.scrum-master { + border-radius: 20px; + background-color: #32ade6; + color: #795f3a; +} +.trainee { + border-radius: 20px; + background-color: #007aff; + color: #795f3a; +} +.junior { + border-radius: 20px; + background-color: #5856d6; + color: #795f3a; +} +.semi-sr { + border-radius: 20px; + background-color: #af52de; + color: #795f3a; +} +.senior { + border-radius: 20px; + background-color: #ff2d55; + color: #795f3a; +} + +.form-group { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + width: 772px; +} + +.content-2 { + width: 804px; + padding: 16px 0px 0px 0px; + gap: 17px; + font-family: Poppins; + border-radius: 8px; + padding: 16px; + opacity: 0px; + background-color: #4f4d4d73; + box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); +} +.question-container { + width: 772px; + height: 52px; + display: flex; + align-items: center; + justify-content: space-between; +} + +.custom-label { + font-family: Poppins; + font-weight: 500; + font-size: 14px; + color: rgba(255, 255, 255, 1); +} + +.custom-select { + width: 377.5px; + height: 28px; + border: none; + opacity: 0px; + padding: 0 0 0 8px; + + background: rgba(32, 32, 32, 1); + color: rgba(194, 187, 187, 0.6); +} +.custom-input { + width: 377.5px; + height: 28px; + border: none; + gap: 0px; + padding: 0px 0px 0px 8px; + opacity: 0px; + background: rgba(32, 32, 32, 1); + border-radius: 8px; +} + +.custom-option-group { + margin-bottom: 10px; +} + +.option-row { + width: 804px; + display: flex; + justify-content: space-between; + flex-wrap: wrap; +} + +.custom-option-input { + width: 350px; + height: 28px; + border-radius: 8px; + background-color: #202020; + border: none; + color: gray; + border-radius: 0 8px 8px 0px; +} + +.checkbox-container { + width: 28px; + height: 28px; + background-color: #303030; + border-radius: 8px 0 0 8px; + display: flex; + justify-content: center; + align-items: center; +} + +.checkbox-input { + height: 29px; + background-color: red; + border: none; +} + +.custom-radio { + padding: 0 0 0 8px; + width: 378px; +} + +.custom-add-option-btn { + width: 350px; + gap: 5px; + border-radius: 8px; + padding: 5px; + color: #d8d6d6; +} + +.custom-btn-submit { + width: 91px; + height: 42px; + padding: 3px; + background-color: rgba(106, 95, 255, 1); + box-shadow: 0px 4px 4px 0px #00000026; + cursor: pointer; + border-radius: 8px; + border: 1.4px solid #706fe5; + font-size: 12px; + color: #ffff; +} +.i { + width: 7.89px; + height: 10px; + top: 2.5px; + left: 1.97px; + gap: 0px; + opacity: 0px; +} + +.custom-btn-new-question { + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); + width: 91px; + height: 42px; + padding: 8px; + + border-radius: 8px; + border: 1.4px solid #5f5f5f; + font-size: 12px; + background: rgba(95, 95, 95, 1); + color: rgba(126, 126, 126, 1); + display: flex; + justify-content: center; + align-items: center; +} + +.label-input { + display: flex; + justify-content: flex-start; +} diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 617f1f5..c17bfaa 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -12,13 +12,17 @@ export class NewPagesComponent { ngOnInit(): void { this.selectHeaderForm = this.formsBuilder.group({ - nombreQuiz :['' , Validators.required], /* Validators.required */ - descripcion: ['', Validators.required], /* Validators.required */ - modulo: ['', Validators.required], /* Validators.required */ - celula: ['', Validators.required], /* Validators.required */ - level: ['', Validators.required], /* Validators.required */ + /* nombreQuiz :['' , Validators.required], */ + /* descripcion: ['', Validators.required], */ + /* modulo: ['', Validators.required], */ + /* celula: ['', Validators.required], */ + /* level: ['', Validators.required], */ + nombreQuiz: [''], + descripcion: [''], + modulo: [''], + celula: [''], + level: [''], }); - } questionTypes: string[] = [ @@ -27,20 +31,31 @@ export class NewPagesComponent { 'Verdadero o falso', ]; - - showCelula: boolean = false + + questionCategory : any ={modulo: ''} + showCelula: boolean = false; options: string[] = []; selection: string[] = ['']; array: string[] = ['']; selectedOption: string | null = null; - + isTrueFalseQuestion: boolean = false; showPlus: boolean = false; showPlus2: boolean = false; showSubmits: boolean = false; inputType: string = ''; + pushQuestionCategory(m:any,s:any){ +this.questionCategory[m]=s +console.log(this.questionCategory); + + } + + isShowCelula(){ + this.showCelula = !this.showCelula + } onQuestionTypeChange(selectedType: string) { + this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ this.selection = @@ -81,11 +96,9 @@ export class NewPagesComponent { []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ this.array.push(this.options[i]); this.selection = this.array; - } else if (this.array.includes(this.options[i])) { this.array = this.array.filter(el => el != this.options[i]); this.selection = this.array; - } else { this.array = this.array.filter(el => el != 'Verdadero'); this.array = this.array.filter(el => el != 'Falso'); @@ -102,7 +115,7 @@ export class NewPagesComponent { this.options.push(`Opción ${this.options.length + 1}`); } addOption2() { - this.options.push(`Opción ${this.options.length + 1+'.'}`); + this.options.push(`Opción ${this.options.length + 1 + '.'}`); } // enviar el formulario @@ -111,7 +124,6 @@ export class NewPagesComponent { const formSection = form.value; console.log(formSection); console.log(formHeader); - } // Crear una nueva pregunta addNewQuestion(form: any) { From cc2af9e34427560754ffd8b796305c51b29baba8 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Sun, 29 Sep 2024 20:27:29 -0300 Subject: [PATCH 040/203] colors --- .../pages/new-pages/new-pages.component.html | 57 ++++++++++++------- .../pages/new-pages/new-pages.component.ts | 12 ++-- .../welcome-page/welcome-page.component.html | 2 +- 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 8cb2cab..17ac4f5 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,8 +1,3 @@ - - -
@@ -37,51 +32,75 @@

Módulo

Célula

+
+ (click)="isShowCelula()"> - - - - - - + + + +
+ aria-label="Default select example"> + {{ element?.modulo }} +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index c17bfaa..76c46cb 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -31,8 +31,9 @@ export class NewPagesComponent { 'Verdadero o falso', ]; - - questionCategory : any ={modulo: ''} +questionClass: string = '' + + questionCategory : any = [{modulo: ''}] showCelula: boolean = false; options: string[] = []; selection: string[] = ['']; @@ -45,9 +46,10 @@ export class NewPagesComponent { showSubmits: boolean = false; inputType: string = ''; - pushQuestionCategory(m:any,s:any){ -this.questionCategory[m]=s -console.log(this.questionCategory); + pushQuestionCategory(prop:string,val:string){ +this.questionCategory[0][prop]=val +this.questionClass = this.questionCategory[0][prop] +console.log(this.questionClass); } diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index d4e698e..794e336 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -32,7 +32,7 @@

Bienvenido "User"

- +
From 6a265b97881bfd513111149e8e22d7a2439d508e Mon Sep 17 00:00:00 2001 From: Ignacio Date: Mon, 30 Sep 2024 10:28:31 -0300 Subject: [PATCH 041/203] inputs --- .../pages/all-page/all-page.component.html | 71 +------------------ .../pages/all-page/all-page.component.scss | 24 ------- .../pages/new-pages/new-pages.component.html | 58 ++++++++------- .../pages/new-pages/new-pages.component.scss | 25 +++++-- .../pages/new-pages/new-pages.component.ts | 37 +++++----- .../welcome-page/welcome-page.component.html | 1 - 6 files changed, 66 insertions(+), 150 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 4174b27..2e42a5f 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1,70 +1 @@ -
-
-
-

Módulo

- -
- -
-

Célula

- - - -
- - - - - - - - - - -
-
- -
-

Seniority / Nivel

- -
-
-
\ No newline at end of file +

All Pages

\ No newline at end of file diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index afb224b..e69de29 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -1,24 +0,0 @@ -.content { - background-color: blueviolet; -} - -.option-floating { - position: absolute; - - width: 251.33px; - background-color: #303030; - display: flex; - flex-wrap: wrap; - justify-content: center; - gap: 9px; - align-items: center; - padding: 8px; - border-radius: 8px; - } - - .floating { - border: none; - padding-left: 8px; - padding-right: 8px; - font-size: 12px; - } diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 17ac4f5..147684a 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -35,9 +35,8 @@

Célula

- +
+ +
+ {{ + questionCategory?.modulo + }} +
+ + +
+ +
+

Seniority / Nivel

+
-
- {{ element?.modulo }} -
- - -
- -
-

Seniority / Nivel

- + {{ + questionCategory?.seniority + }}
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 5bdf8cf..2b78c11 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -89,9 +89,24 @@ $spacing: 20px; justify-content: space-between; } +.seniority-container { + position: absolute; + top: 245px; + width: 224px; + height: 58px; + background-color: #303030; + display: flex; + flex-wrap: wrap; + /* justify-content: center; */ + gap: 9px; + align-items: center; + padding: 8px; + border-radius: 8px; +} + .option-floating { position: absolute; - bottom: 280px; + top: 245px; width: 251.33px; background-color: #303030; display: flex; @@ -133,6 +148,8 @@ h4 { background-color: #202020; width: 251.33px; height: 28px; + display: flex; + align-items: center; } .option { @@ -180,17 +197,17 @@ h4 { .junior { border-radius: 20px; background-color: #5856d6; - color: #795f3a; + color: #57462e; } .semi-sr { border-radius: 20px; background-color: #af52de; - color: #795f3a; + color: #5e4b30; } .senior { border-radius: 20px; background-color: #ff2d55; - color: #795f3a; + color: #423420; } .form-group { diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 76c46cb..de5e813 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -12,16 +12,9 @@ export class NewPagesComponent { ngOnInit(): void { this.selectHeaderForm = this.formsBuilder.group({ - /* nombreQuiz :['' , Validators.required], */ - /* descripcion: ['', Validators.required], */ - /* modulo: ['', Validators.required], */ - /* celula: ['', Validators.required], */ - /* level: ['', Validators.required], */ - nombreQuiz: [''], - descripcion: [''], + nombreQuiz: ['', Validators.required], + descripcion: ['', Validators.required], modulo: [''], - celula: [''], - level: [''], }); } @@ -31,33 +24,35 @@ export class NewPagesComponent { 'Verdadero o falso', ]; -questionClass: string = '' - - questionCategory : any = [{modulo: ''}] + questionClass: string = ''; + + questionCategory: any = { modulo: '', seniority: '' }; showCelula: boolean = false; + showSeniority: boolean = false; options: string[] = []; selection: string[] = ['']; array: string[] = ['']; selectedOption: string | null = null; - + isTrueFalseQuestion: boolean = false; showPlus: boolean = false; showPlus2: boolean = false; showSubmits: boolean = false; inputType: string = ''; - pushQuestionCategory(prop:string,val:string){ -this.questionCategory[0][prop]=val -this.questionClass = this.questionCategory[0][prop] -console.log(this.questionClass); - + pushQuestionCategory(prop: string, val: string) { + this.questionCategory[prop] = val; + console.log(this.questionCategory); + } - isShowCelula(){ - this.showCelula = !this.showCelula + isShowCelula() { + this.showCelula = !this.showCelula; + } + isShowSeniority() { + this.showSeniority = !this.showSeniority; } onQuestionTypeChange(selectedType: string) { - this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ this.selection = diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 794e336..f643bd5 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -32,7 +32,6 @@

Bienvenido "User"

-
From 4565896f1b21bc21acee075fdf260aa768bbde81 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Mon, 30 Sep 2024 14:14:30 -0300 Subject: [PATCH 042/203] espacio --- angular.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular.json b/angular.json index c3bf57f..5866532 100644 --- a/angular.json +++ b/angular.json @@ -45,7 +45,7 @@ { "type": "anyComponentStyle", "maximumWarning": "2kb", - "maximumError": "4kb" + "maximumError": "10kb" } ], "outputHashing": "all" From a5ed28633444b9f287322e8e1c928c4613b9a460 Mon Sep 17 00:00:00 2001 From: Agustindardanelli-stack Date: Mon, 30 Sep 2024 18:48:44 -0300 Subject: [PATCH 043/203] =?UTF-8?q?=20Pantalla=20=C2=B4Todos=C2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/all-page/all-page.component.html | 40 +++++- .../pages/all-page/all-page.component.scss | 120 ++++++++++++++++++ .../all/pages/all-page/all-page.component.ts | 45 ++++++- .../welcome-page/welcome-page.component.html | 7 +- 4 files changed, 207 insertions(+), 5 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 2e42a5f..f073c33 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1 +1,39 @@ -

All Pages

\ No newline at end of file +
+

Todos los Quiz

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Nombre Q.SeniorityFec. CreaciónCreadorMóduloCélulaEstadoAcciones
{{ quiz.name }}{{ quiz.seniority }}{{ quiz.creationDate }}{{ quiz.creator }}{{ quiz.module }}{{ quiz.cell }}{{ quiz.status }} + + + +
+
+
diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index e69de29..1238ff0 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -0,0 +1,120 @@ +$background-color: #2a2a2a; +$shadow-color: rgba(0, 217, 255, 0.4); +$input-bg-color: #333; +$text-color: #fff; +$border-radius: 12px; +$transition-time: 0.3s; +$spacing: 20px; + + +.quiz-dashboard { + padding: 20px; + background-color: #1e1e1e; + color: #fff; +} + +h2 { + color: #fff; + font-size: 1.5rem; + margin-bottom: 20px; +} + +.filters { + display: flex; + justify-content: space-between; + margin-bottom: 20px; +} + +.filters select { + background-color: #333; + border: 1px solid #444; + padding: 10px; + color: #fff; + border-radius: 5px; + width: 30%; +} + +.search-container { + display: flex; + justify-content: flex-end; + margin-bottom: 10px; +} + +.search-container input { + background-color: #333; + border: 1px solid #444; + padding: 8px; + color: #fff; + border-radius: 5px; + width: 200px; +} + +.table-and-button { + display: flex; + justify-content: space-between; +} + +.table-container { + width: 85%; +} + +.new-button { + display: flex; + justify-content: center; + align-items: center; + width: 15%; +} + +.new-button button { + background-color: #6200ea; + border: none; + padding: 10px 20px; + color: white; + font-size: 1rem; + border-radius: 5px; + cursor: pointer; +} + +.new-button button:hover { + background-color: #4500b5; +} + +.quiz-table { + width: 100%; + border-collapse: collapse; + margin-top: 10px; +} + +.quiz-table th, .quiz-table td { + padding: 10px; + text-align: left; + border-bottom: 1px solid #444; +} + +.quiz-table th { + background-color: #333; +} + +.quiz-table td { + background-color: #222; +} + +.actions button { + background: none; + border: none; + cursor: pointer; + color: #aaa; + margin-right: 5px; +} + +.status { + font-weight: bold; +} + +.status.Activo { + color: #00ff00; +} + +.status.Inactivo { + color: #ff0000; +} diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 8b3fbc6..61ff001 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -1,10 +1,53 @@ import { Component } from '@angular/core'; +interface Quiz { + name: string; + seniority: string; + creationDate: string; + creator: string; + module: string; + cell: string; + status: string; +} + @Component({ selector: 'app-all-page', templateUrl: './all-page.component.html', styleUrl: './all-page.component.scss', }) export class AllPageComponent { - + searchText: string = ''; + + quizzes: Quiz[] = [ + { name: 'UI Jr Quiz', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Oscar A.', module: 'Desarrollo', cell: 'Diseño UX/UI', status: 'Activo' }, + { name: 'QA Sr Quiz', seniority: 'Senior', creationDate: '30/08/2024', creator: 'Thamy G.', module: 'Desarrollo', cell: 'QA', status: 'Activo' }, + { name: 'FS Trainee Quiz', seniority: 'Trainee', creationDate: '30/08/2024', creator: 'Javier B.', module: 'Desarrollo', cell: 'Back End', status: 'Activo' }, + { name: 'FS Jr Quiz', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Brayan C.', module: 'Desarrollo', cell: 'Back End', status: 'Activo' }, + { name: 'Diseñador Jr.', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Rafael B.', module: 'Marketing', cell: 'Diseño', status: 'Activo' }, + { name: 'BE Trainee Quiz', seniority: 'Trainee', creationDate: '30/08/2024', creator: 'Brayan C.', module: 'Sistemas', cell: 'Python', status: 'Activo' }, + { name: 'BE Jr Quiz', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Brayan C.', module: 'Sistemas', cell: 'Python', status: 'Activo' }, + { name: 'UI Jr Quiz 1', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Oscar A.', module: 'Desarrollo', cell: 'Diseño UX/UI', status: 'Activo' } + ]; + + filteredQuizzes() { + return this.quizzes.filter(quiz => + quiz.name.toLowerCase().includes(this.searchText.toLowerCase()) || + quiz.creator.toLowerCase().includes(this.searchText.toLowerCase()) + ); + } + + viewQuiz(quiz: Quiz) { + alert(`Viendo el quiz: ${quiz.name}`); + } + + editQuiz(quiz: Quiz) { + alert(`Editando el quiz: ${quiz.name}`); + } + + deleteQuiz(quiz: Quiz) { + if (confirm(`¿Estás seguro de eliminar el quiz: ${quiz.name}?`)) { + this.quizzes = this.quizzes.filter(q => q !== quiz); + } + } + } diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index f643bd5..949c87f 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -13,7 +13,7 @@

Bienvenido "User"

-
+
@@ -21,8 +21,8 @@

Bienvenido "User"

- + [@expandState1]="isExpanded1 ? 'expanded' : 'collapsed'"> +
@@ -32,6 +32,7 @@

Bienvenido "User"

+
From e7c12263af08c64f78a6d015a4c1454d3b41daca Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Mon, 30 Sep 2024 20:21:56 -0300 Subject: [PATCH 044/203] relativas --- .../pages/home-page/home-page.component.scss | 4 ++-- .../pages/new-pages/new-pages.component.scss | 8 ++++---- .../welcome-page/welcome-page.component.scss | 18 +++++++++--------- .../welcome-page/welcome-page.component.ts | 6 +++--- .../sideBar/side-bar/side-bar.component.html | 2 +- .../sideBar/side-bar/side-bar.component.scss | 13 ++++++++----- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/app/modules/home/pages/home-page/home-page.component.scss b/src/app/modules/home/pages/home-page/home-page.component.scss index aa2028a..7900f70 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.scss +++ b/src/app/modules/home/pages/home-page/home-page.component.scss @@ -7,8 +7,8 @@ background: #212121; box-shadow: 0px 4px 4px 0px #00000040; - height: 623px; - width: 196px; + height: 95vh; + width: 28vh; border-radius: 0px 12px 12px 0px; padding: 24px 8px 8px 8px; gap: 47px; diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 2b78c11..033420b 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -50,8 +50,8 @@ $spacing: 20px; .transparent { background-color: #2121217a; - width: 869px; - height: 623px; + /* width: 170vh; */ + height: 95vh; display: flex; flex-direction: column; align-items: center; @@ -61,8 +61,8 @@ $spacing: 20px; display: flex; flex-direction: column; align-items: center; - width: 869px; - height: 623px; + width: 148vh; + height: 95vh; background-color: #212121; padding: $spacing; diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index 77430ad..ed118bf 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -1,5 +1,5 @@ .welcome-container { - /* background-color: pink; */ + background-color: pink; width: 1034px; display: flex; justify-content: space-between; @@ -8,8 +8,8 @@ } .column-tasks { - width: 60px; - height: 623px; + width: 8vh; + height: 95vh; border-radius: 12px; padding: 24px 8px 8px 8px; background-color: #212121; @@ -26,8 +26,8 @@ } .active-column { - width: 60px; - height: 623px; + width: 8vh; + height: 95vh; border-radius: 12px; padding: 24px 8px 8px 8px; background-color: #212121; @@ -72,8 +72,8 @@ } .btn-plus { - width: 40px; - height: 40px; + width: 3rem; + height: 3rem; border-radius: 8px; padding: 8px; gap: 8px; @@ -104,8 +104,8 @@ } .wall { - height: 623px; - width: 1034px; + height: 95vh; + width: 170vh; display: flex; flex-direction: row-reverse; justify-content: space-between; diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index 798ab49..8dc8cda 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -23,7 +23,7 @@ import { state( 'expanded', style({ - maxWidth: '900px', + maxWidth: '150vh', }) ), transition('collapsed => expanded', [animate('300ms ease-out')]), @@ -40,7 +40,7 @@ import { state( 'expanded', style({ - maxWidth: '900px', + maxWidth: '150vh', }) ), transition('collapsed => expanded', [animate('300ms ease-out')]), @@ -56,7 +56,7 @@ import { state( 'expanded', style({ - maxWidth: '900px', + maxWidth: '150vh', }) ), transition('collapsed => expanded', [animate('300ms ease-out')]), diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index aca4228..a6975a4 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -27,7 +27,7 @@
-
+
- - - - - -
Célula {{ questionCategory?.modulo }} + +
+ + + + + + +
- +

Seniority / Nivel

-
- - - - -
{{ questionCategory?.seniority - }}
+ }} + + +
+ + + + +
+
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 54c3789..5cf92c3 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -55,12 +55,6 @@ $spacing: 20px; } .normal-container { - display: flex; - flex-direction: column; - align-items: center; - /* width: 148vh; */ - height: 95vh; - background-color: #212121; padding: 1.5rem; border-radius: $border-radius; @@ -78,75 +72,59 @@ $spacing: 20px; align-items: center; margin-bottom: 30px; } -.input-container { - width: 251.33px; - height: 52px; + +.content-1 { + background-color: #353434; display: flex; - flex-direction: column; + flex-wrap: wrap; justify-content: space-between; + width: 135vh; + + border-radius: 12px; + padding: .8rem; } -.seniority-container { - position: absolute; - top: 245px; - width: 224px; - height: 58px; - background-color: #303030; +.input-container { + width: 41vh; + height: 9vh; display: flex; - flex-wrap: wrap; - /* justify-content: center; */ - gap: 9px; - align-items: center; - padding: 8px; - border-radius: 8px; + flex-direction: column; + justify-content: space-between; } .option-floating { position: absolute; - top: 245px; - width: 251.33px; + width: 41vh; background-color: #303030; display: flex; flex-wrap: wrap; justify-content: center; - gap: 9px; + gap: .8rem; align-items: center; - padding: 8px; + padding: .8rem; border-radius: 8px; } .floating { border: none; - padding-left: 8px; - padding-right: 8px; + padding-left: .8rem; + padding-right: .8rem; font-size: 12px; } -.content-1 { - background-color: #353434; - display: flex; - justify-content: space-between; - width: 135vh; - height: 10.5vh; - border-radius: 12px; - padding: 8px; -} h4 { margin: 0; font-size: 16px; } .option-select { - position: relative; + position: relative; border: 2px solid #fff; border: none; color: #c2bbbb99; background-color: #202020; - width: 251.33px; - height: 28px; - display: flex; - align-items: center; + height: 2.5rem; } .option { diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index de5e813..73f7db7 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -12,8 +12,8 @@ export class NewPagesComponent { ngOnInit(): void { this.selectHeaderForm = this.formsBuilder.group({ - nombreQuiz: ['', Validators.required], - descripcion: ['', Validators.required], + nombreQuiz: [''], + descripcion: [''], modulo: [''], }); } From af5cb467213fec1fd53699c617195f0a1e901cb3 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 1 Oct 2024 19:11:52 -0300 Subject: [PATCH 047/203] welcome --- .../pages/new-pages/new-pages.component.scss | 3 +- .../welcome-page/welcome-page.component.html | 70 +++++++++++-------- .../welcome-page/welcome-page.component.scss | 42 ++--------- 3 files changed, 46 insertions(+), 69 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 5cf92c3..6b88770 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -85,6 +85,7 @@ $spacing: 20px; } .input-container { + width: 41vh; height: 9vh; display: flex; @@ -119,7 +120,7 @@ h4 { } .option-select { - position: relative; + border: 2px solid #fff; border: none; color: #c2bbbb99; diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 949c87f..cda080e 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -1,41 +1,49 @@
- - - -
- -
-
-
+
+
-
- -
+ +
+ +
-
- -
+ +
+ +
-
- -
-
- - -
+ +
+ +
+ +
+ +
+ + +
+ + +
+
+
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index 0787db7..dffab43 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -1,14 +1,6 @@ -.welcome-container { - background-color: pink; - width: 1034px; - display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 10px; -} - +.active-column, .column-tasks { - width: 8vh; + width: 9vh; height: 95vh; border-radius: 12px; padding: 1.5rem 2rem 2rem 2rem; @@ -20,26 +12,12 @@ box-shadow: 0px 4px 4px 0px #718ee3, 0px 4px 4px 0px #00000040; - position: relative; - z-index: 1; - /* top: 90px; */ } .active-column { - width: 8vh; - height: 95vh; - border-radius: 12px; - padding: 2.1rem 2rem 2rem 2rem; - background-color: #212121; - display: flex; - align-items: start; - justify-content: center; - gap: 3px; box-shadow: - 0px 4px 4px 0px #FF5EA6, + 0px 4px 4px 0px #ff5ea6, 0px 4px 4px 0px #00000040; - position: relative; - z-index: 1; } .column-btn { @@ -96,31 +74,21 @@ font-size: 22px; } -.ti-img { - width: 414px; - position: absolute; - - z-index: 0; -} - .wall { height: 95vh; width: 170vh; display: flex; - flex-direction: row-reverse; + /* flex-direction: row-reverse; */ justify-content: space-between; background-image: url('../../../../../assets/layout/images/logo.svg'); background-repeat: no-repeat; background-position: center; background-size: 414px 404px; - } -.order-item{ - +.order-item { display: flex; flex-direction: row-reverse; - justify-content: start; } .negro { From 7b467821208e7c3832f6042fd4eb251f311741d6 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 1 Oct 2024 19:51:07 -0300 Subject: [PATCH 048/203] ajustes --- .../modules/new/pages/new-pages/new-pages.component.html | 6 +++--- .../modules/new/pages/new-pages/new-pages.component.scss | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index c56f76f..7558fe2 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -24,7 +24,7 @@

Módulo

formControlName="modulo" class="form-select option-select" aria-label="Default select example"> - + @@ -40,7 +40,7 @@

Célula

aria-label="Default select example"> {{ questionCategory?.modulo - }} + }} Selecciona la célula
Seniority / Nivel aria-label="Default select example"> {{ questionCategory?.seniority - }} + }} Seniority
Date: Tue, 1 Oct 2024 20:23:29 -0300 Subject: [PATCH 049/203] Modifying 'All' screen,stylizing component, adding icons --- .../pages/all-page/all-page.component.html | 32 +++++++++---------- .../pages/all-page/all-page.component.scss | 15 ++++++++- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index f073c33..223adcd 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -3,34 +3,34 @@

Todos los Quiz

-
+
- - - - - - - - - + + + + + + + + + - - + + - + diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index 1238ff0..44fd042 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -12,7 +12,19 @@ $spacing: 20px; background-color: #1e1e1e; color: #fff; } +.table-sup{ + font-family: Poppins; + font-size: 16px; + font-weight: 400; + line-height: 24px; + letter-spacing: 0.20000000298023224px; + text-align: center; +} +.table-int{ + text-align: center; + +} h2 { color: #fff; font-size: 1.5rem; @@ -112,7 +124,8 @@ h2 { } .status.Activo { - color: #00ff00; + color: rgba(151, 71, 255, 1); + ; } .status.Inactivo { From abebcf665e382affffcabf628ac2427beeebbd17 Mon Sep 17 00:00:00 2001 From: Agustindardanelli-stack Date: Tue, 1 Oct 2024 21:52:50 -0300 Subject: [PATCH 050/203] modifying logic --- src/app/modules/all/pages/all-page/all-page.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 61ff001..ebddd6f 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { Router } from '@angular/router'; interface Quiz { name: string; @@ -17,6 +18,7 @@ interface Quiz { }) export class AllPageComponent { searchText: string = ''; + constructor(private router: Router) { } quizzes: Quiz[] = [ { name: 'UI Jr Quiz', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Oscar A.', module: 'Desarrollo', cell: 'Diseño UX/UI', status: 'Activo' }, @@ -41,7 +43,10 @@ export class AllPageComponent { } editQuiz(quiz: Quiz) { - alert(`Editando el quiz: ${quiz.name}`); + alert(`Editando el quiz: ${quiz.name}`), + this.router.navigate(['/edit', quiz.name]); // Redirecciona con el nombre del quiz o un ID único + + } deleteQuiz(quiz: Quiz) { From a6cb961a7a1c8956de8f7b503fbb6ef2afc32805 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Wed, 2 Oct 2024 12:52:19 -0300 Subject: [PATCH 051/203] arreglos --- .../pages/new-pages/new-pages.component.html | 67 ++++++++++--------- .../pages/new-pages/new-pages.component.scss | 32 ++++----- .../pages/new-pages/new-pages.component.ts | 17 +++-- 3 files changed, 65 insertions(+), 51 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 7558fe2..4409727 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -40,40 +40,40 @@

Célula

aria-label="Default select example"> {{ questionCategory?.modulo - }} Selecciona la célula + }}
@@ -88,9 +88,9 @@

Seniority / Nivel

(click)="isShowSeniority()" class="form-select option-select" aria-label="Default select example"> - {{ - questionCategory?.seniority - }} Seniority + {{ questionCategory?.seniority }} +
Define la pregunta 1/5 - - - - + *ngFor="let type of questionTypes" + class="custom-select" + [value]="type"> + {{ type }} + + +
+ +
+
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 71c3051..77e94b8 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -104,6 +104,7 @@ $spacing: 20px; align-items: center; padding: .8rem; border-radius: 8px; + cursor: pointer; } .floating { @@ -120,7 +121,7 @@ h4 { } .option-select { - + cursor: pointer; border: 2px solid #fff; border: none; color: #c2bbbb99; @@ -133,34 +134,34 @@ h4 { white-space: nowrap; } -.diseño-ux-ui { +.Diseño-UX-UI { background-color: #ffcc00; color: #795f3a; border-radius: 10px; white-space: nowrap; } -.qa-tester { +.QA-Tester { border-radius: 20px; background-color: #ff9500; color: #795f3a; } -.frontend { +.Frontend { border-radius: 20px; background-color: #34c759; color: #795f3a; } -.backend { +.Backend { border-radius: 20px; background-color: #00c7be; color: #795f3a; } -.pm { +.PM { border-radius: 20px; background-color: #30b0c7; color: #795f3a; } -.scrum-master { +.Scrum-Master { border-radius: 20px; background-color: #32ade6; color: #795f3a; @@ -187,10 +188,11 @@ h4 { } .form-group { + display: flex; justify-content: space-between; flex-wrap: wrap; - width: 772px; + width: 130vh; } .content-2 { @@ -205,7 +207,7 @@ h4 { box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); } .question-container { - width: 772px; + width: 130vh; height: 52px; display: flex; align-items: center; @@ -230,7 +232,7 @@ h4 { color: rgba(194, 187, 187, 0.6); } .custom-input { - width: 377.5px; + width: 60vh; height: 28px; border: none; gap: 0px; @@ -245,14 +247,15 @@ h4 { } .option-row { - width: 804px; + + width: 130vh; display: flex; justify-content: space-between; flex-wrap: wrap; } .custom-option-input { - width: 350px; + width: 60vh; height: 28px; border-radius: 8px; background-color: #202020; @@ -272,9 +275,8 @@ h4 { } .checkbox-input { - height: 29px; background-color: red; - border: none; + } .custom-radio { @@ -283,7 +285,7 @@ h4 { } .custom-add-option-btn { - width: 350px; + width: 60vh; gap: 5px; border-radius: 8px; padding: 5px; diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 73f7db7..5c4d269 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -16,6 +16,7 @@ export class NewPagesComponent { descripcion: [''], modulo: [''], }); + this.showCelula=false } questionTypes: string[] = [ @@ -25,15 +26,13 @@ export class NewPagesComponent { ]; questionClass: string = ''; - - questionCategory: any = { modulo: '', seniority: '' }; + questionCategory: any = { modulo: 'Selecciona la célula', seniority: 'Seniority' }; showCelula: boolean = false; showSeniority: boolean = false; options: string[] = []; selection: string[] = ['']; array: string[] = ['']; - selectedOption: string | null = null; - + selectedOption: string = ''; isTrueFalseQuestion: boolean = false; showPlus: boolean = false; showPlus2: boolean = false; @@ -42,15 +41,21 @@ export class NewPagesComponent { pushQuestionCategory(prop: string, val: string) { this.questionCategory[prop] = val; - console.log(this.questionCategory); - + this.closeInputs() + console.log(this.showCelula); } isShowCelula() { this.showCelula = !this.showCelula; + this.showSeniority = false; } isShowSeniority() { this.showSeniority = !this.showSeniority; + this.showCelula = false; + } + closeInputs(){ + this.showCelula = false; + this.showSeniority = false; } onQuestionTypeChange(selectedType: string) { this.array = From c6de562aee740a01900d109db2fb21de6a3db425 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Wed, 2 Oct 2024 19:06:08 -0300 Subject: [PATCH 052/203] ajustes --- .../pages/new-pages/new-pages.component.html | 69 ++++++++----------- .../pages/new-pages/new-pages.component.scss | 20 ++++-- .../pages/new-pages/new-pages.component.ts | 19 +++-- 3 files changed, 59 insertions(+), 49 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 4409727..3df1e5a 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -6,13 +6,13 @@ type="text" class="input-name mb-2" placeholder="Nombre del Quiz" - formControlName="nombreQuiz" /> + />
- + >Descripción
@@ -21,7 +21,7 @@

Módulo

- - - -
- -
-
+
+ + + +
+

v

+
+ +
@@ -242,14 +241,6 @@

Define la pregunta 1/5

- -
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 77e94b8..c7115c7 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -233,13 +233,13 @@ h4 { } .custom-input { width: 60vh; - height: 28px; + height: 4vh; border: none; gap: 0px; padding: 0px 0px 0px 8px; opacity: 0px; background: rgba(32, 32, 32, 1); - border-radius: 8px; + border-radius: 8px 0 0 8px; } .custom-option-group { @@ -256,23 +256,33 @@ h4 { .custom-option-input { width: 60vh; - height: 28px; + height: 4vh; border-radius: 8px; background-color: #202020; border: none; color: gray; border-radius: 0 8px 8px 0px; + cursor: pointer; } .checkbox-container { - width: 28px; - height: 28px; + width: 4vh; + height: 4vh; background-color: #303030; border-radius: 8px 0 0 8px; display: flex; justify-content: center; align-items: center; } +.checkbox-container-1 { + width: 4vh; + height: 4vh; + background-color: #303030; + border-radius: 0 8px 8px 0; + display: flex; + justify-content: center; + align-items: center; +} .checkbox-input { background-color: red; diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 5c4d269..33ac10c 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -16,7 +16,7 @@ export class NewPagesComponent { descripcion: [''], modulo: [''], }); - this.showCelula=false + this.showCelula = false; } questionTypes: string[] = [ @@ -26,9 +26,13 @@ export class NewPagesComponent { ]; questionClass: string = ''; - questionCategory: any = { modulo: 'Selecciona la célula', seniority: 'Seniority' }; + questionCategory: any = { + modulo: 'Selecciona la célula', + seniority: 'Seniority', + }; showCelula: boolean = false; showSeniority: boolean = false; + showForm: boolean = false; options: string[] = []; selection: string[] = ['']; array: string[] = ['']; @@ -41,8 +45,13 @@ export class NewPagesComponent { pushQuestionCategory(prop: string, val: string) { this.questionCategory[prop] = val; - this.closeInputs() - console.log(this.showCelula); + this.closeInputs(); + if ( + this.questionCategory.modulo != 'Selecciona la célula' && + this.questionCategory.seniority != 'Seniority' + ) { + this.showForm = true; + } } isShowCelula() { @@ -53,7 +62,7 @@ export class NewPagesComponent { this.showSeniority = !this.showSeniority; this.showCelula = false; } - closeInputs(){ + closeInputs() { this.showCelula = false; this.showSeniority = false; } From 70b80585a815c8a298d1c10e8eded2700b3854ce Mon Sep 17 00:00:00 2001 From: Ignacio Date: Thu, 3 Oct 2024 11:28:55 -0300 Subject: [PATCH 053/203] alineado --- .../pages/new-pages/new-pages.component.html | 10 +++---- .../pages/new-pages/new-pages.component.scss | 29 ++++++++----------- .../pages/new-pages/new-pages.component.ts | 2 +- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 3df1e5a..eac55b2 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -156,9 +156,7 @@

Define la pregunta 1/5

-
-

v

-
+ @@ -188,9 +186,9 @@

Define la pregunta 1/5

-
+
-
+
Define la pregunta 1/5 Date: Thu, 3 Oct 2024 17:44:41 -0300 Subject: [PATCH 054/203] cambiando componente a exportable --- src/app/modules/home/home-routing.module.ts | 12 - src/app/modules/home/home.module.ts | 4 - src/app/modules/new/new.module.ts | 12 +- .../pages/new-pages/new-pages.component.html | 126 +------ .../header-form/header-form-routing.module.ts | 10 + .../header-form/header-form.module.ts | 21 ++ .../header-page/header-page.component.html | 124 +++++++ .../header-page/header-page.component.scss | 341 ++++++++++++++++++ .../header-page/header-page.component.spec.ts | 23 ++ .../header-page/header-page.component.ts | 37 ++ 10 files changed, 568 insertions(+), 142 deletions(-) create mode 100644 src/app/shared/components/header-form/header-form-routing.module.ts create mode 100644 src/app/shared/components/header-form/header-form.module.ts create mode 100644 src/app/shared/components/header-form/pages/header-page/header-page.component.html create mode 100644 src/app/shared/components/header-form/pages/header-page/header-page.component.scss create mode 100644 src/app/shared/components/header-form/pages/header-page/header-page.component.spec.ts create mode 100644 src/app/shared/components/header-form/pages/header-page/header-page.component.ts diff --git a/src/app/modules/home/home-routing.module.ts b/src/app/modules/home/home-routing.module.ts index 18979cf..ddd58d2 100644 --- a/src/app/modules/home/home-routing.module.ts +++ b/src/app/modules/home/home-routing.module.ts @@ -7,18 +7,6 @@ const routes: Routes = [ loadChildren: () => import('../welcome/welcome.module').then(m => m.WelcomeModule), }, - { - path: 'create', - loadChildren: () => import('../new/new.module').then(m => m.NewModule), - }, - { - path: 'edit', - loadChildren: () => import('../edit/edit.module').then(m => m.EditModule), - }, - { - path: 'all', - loadChildren: () => import('../all/all.module').then(m => m.AllModule), - }, ]; @NgModule({ diff --git a/src/app/modules/home/home.module.ts b/src/app/modules/home/home.module.ts index 88b9a3b..f140f4d 100644 --- a/src/app/modules/home/home.module.ts +++ b/src/app/modules/home/home.module.ts @@ -3,9 +3,6 @@ import { CommonModule } from '@angular/common'; import { HomePageComponent } from './pages/home-page/home-page.component'; import { HomeRoutingModule } from './home-routing.module'; import { SharedModule } from 'src/app/shared/shared.module'; -import { AllModule } from '../all/all.module'; -import { NewModule } from '../new/new.module'; -import { EditModule } from "../edit/edit.module"; import { WelcomeModule } from '../welcome/welcome.module'; @NgModule({ @@ -14,7 +11,6 @@ import { WelcomeModule } from '../welcome/welcome.module'; CommonModule, HomeRoutingModule, SharedModule, - WelcomeModule ], }) diff --git a/src/app/modules/new/new.module.ts b/src/app/modules/new/new.module.ts index d75ca7d..9ca3445 100644 --- a/src/app/modules/new/new.module.ts +++ b/src/app/modules/new/new.module.ts @@ -3,11 +3,19 @@ import { CommonModule } from '@angular/common'; import { NewPagesComponent } from './pages/new-pages/new-pages.component'; import { NewRoutingModule } from './new-routing.module'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - +import { SharedModule } from 'primeng/api'; +import { HeaderFormModule } from 'src/app/shared/components/header-form/header-form.module'; @NgModule({ declarations: [NewPagesComponent], - imports: [CommonModule, NewRoutingModule,FormsModule, ReactiveFormsModule], + imports: [ + CommonModule, + NewRoutingModule, + FormsModule, + ReactiveFormsModule, + SharedModule, + HeaderFormModule, + ], exports: [NewPagesComponent], }) export class NewModule {} diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index eac55b2..7844b82 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,128 +1,6 @@
-
-
-
- -
-
-
Descripción
-
-
- -
-
-
-

Módulo

- -
- -
-

Célula

- - -
- {{ - questionCategory?.modulo - }} - -
- - - - - - -
-
- - -
- -
-

Seniority / Nivel

-
- {{ questionCategory?.seniority }} - - - -
- - - - -
-
-
-
-
- + + diff --git a/src/app/shared/components/header-form/header-form-routing.module.ts b/src/app/shared/components/header-form/header-form-routing.module.ts new file mode 100644 index 0000000..0ff92a6 --- /dev/null +++ b/src/app/shared/components/header-form/header-form-routing.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; + +const routes: Routes = []; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class HeaderFormRoutingModule { } diff --git a/src/app/shared/components/header-form/header-form.module.ts b/src/app/shared/components/header-form/header-form.module.ts new file mode 100644 index 0000000..923027f --- /dev/null +++ b/src/app/shared/components/header-form/header-form.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { HeaderFormRoutingModule } from './header-form-routing.module'; +import { HeaderPageComponent } from './pages/header-page/header-page.component'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; + + +@NgModule({ + declarations: [HeaderPageComponent], + imports: [ + CommonModule, + HeaderFormRoutingModule, + FormsModule, + ReactiveFormsModule + ], + exports: [ + HeaderPageComponent + ] +}) +export class HeaderFormModule { } diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html new file mode 100644 index 0000000..b118831 --- /dev/null +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -0,0 +1,124 @@ +
+
+
+ +
+
+
Descripción
+
+
+ +
+
+
+

Módulo

+ +
+ +
+

Célula

+ + +
+ {{ + questionCategory?.modulo + }} + +
+ + + + + + +
+
+ + +
+ +
+

Seniority / Nivel

+
+ {{ questionCategory?.seniority }} + + + +
+ + + + +
+
+
+
+
+ \ No newline at end of file diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss new file mode 100644 index 0000000..e1675a8 --- /dev/null +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -0,0 +1,341 @@ +$background-color: #2a2a2a; +$shadow-color: rgba(0, 217, 255, 0.4); +$input-bg-color: #333; +$text-color: #fff; +$border-radius: 12px; +$transition-time: 0.3s; +$spacing: 20px; + +.new-title { + margin-top: 20px; + height: 40; +} + +.question-title { + font-style: Poppins; + font-weight: 400; + font-size: 22px; +} + +.input-name { + width: 384px; + height: 40px; +} + +.text-description { + width: 135vh; + height: 76px; + margin: 0; + padding-top: 8px; +} +.input-name, +.text-description { + border-radius: 8px; + border: 1px solid #333232; + background-color: #1b1b1b; + padding-left: 16px; + font-size: 14px; +} + +.header-inputs-container { + padding: 0 1rem 1 rem 0; + display: flex; + flex-direction: column; + justify-content: space-between; + margin-bottom: 2.2rem; +} + +.transparent { + background-color: #2121217a; + /* width: 170vh; */ + height: 95vh; + display: flex; + flex-direction: column; + align-items: center; +} + +.normal-container { + background-color: #212121; + padding: 1.5rem; + border-radius: $border-radius; + box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); + background-color: #212121; + + background-image: url('../../../../../../assets/layout/images/logo.svg'); + background-repeat: no-repeat; + background-position: center; + background-size: 180px; +} +.content { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin-bottom: 30px; +} + +.content-1 { + background-color: #353434; + display: flex; + flex-wrap: wrap; + justify-content: space-between; + width: 135vh; + + border-radius: 12px; + padding: .8rem; +} + +.input-container { + + width: 41vh; + height: 9vh; + display: flex; + flex-direction: column; + justify-content: space-between; +} + +.option-floating { + position: absolute; + width: 41vh; + background-color: #303030; + display: flex; + flex-wrap: wrap; + justify-content: center; + gap: .8rem; + align-items: center; + padding: .8rem; + border-radius: 8px; + cursor: pointer; +} + +.floating { + border: none; + padding-left: .8rem; + padding-right: .8rem; + font-size: 12px; +} + + +h4 { + margin: 0; + font-size: 16px; +} + +.option-select { + cursor: pointer; + border: 2px solid #fff; + border: none; + color: #c2bbbb99; + background-color: #202020; + height: 4vh; +} + +.option { + background-color: #353434; + white-space: nowrap; +} + +.Diseño-UX-UI { + background-color: #ffcc00; + color: #795f3a; + border-radius: 10px; + white-space: nowrap; +} + +.QA-Tester { + border-radius: 20px; + background-color: #ff9500; + color: #795f3a; +} +.Frontend { + border-radius: 20px; + background-color: #34c759; + color: #795f3a; +} +.Backend { + border-radius: 20px; + background-color: #00c7be; + color: #795f3a; +} +.PM { + border-radius: 20px; + background-color: #30b0c7; + color: #795f3a; +} +.Scrum-Master { + border-radius: 20px; + background-color: #32ade6; + color: #795f3a; +} +.trainee { + border-radius: 20px; + background-color: #007aff; + color: #795f3a; +} +.junior { + border-radius: 20px; + background-color: #5856d6; + color: #57462e; +} +.semi-sr { + border-radius: 20px; + background-color: #af52de; + color: #5e4b30; +} +.senior { + border-radius: 20px; + background-color: #ff2d55; + color: #423420; +} + +.form-group { + + display: flex; + justify-content: space-between; + flex-wrap: wrap; + width: 130vh; +} + +.content-2 { + width: 135vh; + padding: 16px 0px 0px 0px; + gap: 17px; + font-family: Poppins; + border-radius: 8px; + padding: 16px; + opacity: 0px; + background-color: #4f4d4d73; + box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); +} +.question-container { + width: 130vh; + height: 52px; + display: flex; + align-items: center; + justify-content: space-around; +} + +.custom-label { + font-family: Poppins; + font-weight: 500; + font-size: 14px; + color: rgba(255, 255, 255, 1); +} + +.custom-select { + width: 63.5vh; + height: 28px; + border: none; + opacity: 0px; + padding: 0 0 0 8px; + + background: rgba(32, 32, 32, 1); + color: rgba(194, 187, 187, 0.6); +} +.custom-input { + width: 64vh; + height: 4vh; + border: none; + gap: 0px; + padding: 0px 8px 0px 8px; + opacity: 0px; + background: rgba(32, 32, 32, 1); + border-radius: 8px ; + +} + +.custom-option-group { + margin-bottom: 10px; +} + +.option-row { + + width: 130vh; + display: flex; + justify-content: space-around; + flex-wrap: wrap; + +} + +.custom-option-input { + width: 60vh; + height: 4vh; + border-radius: 8px; + background-color: #202020; + border: none; + color: gray; + border-radius: 0 8px 8px 0px; + cursor: pointer; +} + +.checkbox-container { + width: 4vh; + height: 4vh; + background-color: #303030; + border-radius: 8px 0 0 8px; + display: flex; + justify-content: center; + align-items: center; + padding: 0 +} + + +.checkbox-input { + background-color: red; + +} + +.custom-radio { + padding: 0 0 0 8px; + width: 378px; +} + +.custom-add-option-btn { + width: 60vh; + gap: 5px; + border-radius: 8px; + padding: 5px; + color: #d8d6d6; +} + +.custom-btn-submit { + width: 91px; + height: 42px; + padding: 3px; + background-color: rgba(106, 95, 255, 1); + box-shadow: 0px 4px 4px 0px #00000026; + cursor: pointer; + border-radius: 8px; + border: 1.4px solid #706fe5; + font-size: 12px; + color: #ffff; +} +.i { + width: 7.89px; + height: 10px; + top: 2.5px; + left: 1.97px; + gap: 0px; + opacity: 0px; +} + +.custom-btn-new-question { + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); + width: 91px; + height: 42px; + padding: 8px; + + border-radius: 8px; + border: 1.4px solid #5f5f5f; + font-size: 12px; + background: rgba(95, 95, 95, 1); + color: rgba(126, 126, 126, 1); + display: flex; + justify-content: center; + align-items: center; +} + +.label-input { + display: flex; + justify-content: flex-start; +} diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.spec.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.spec.ts new file mode 100644 index 0000000..777ef2c --- /dev/null +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HeaderPageComponent } from './header-page.component'; + +describe('HeaderPageComponent', () => { + let component: HeaderPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [HeaderPageComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HeaderPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts new file mode 100644 index 0000000..4b32652 --- /dev/null +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -0,0 +1,37 @@ +import { Component } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; + +@Component({ + selector: 'app-header-page', + templateUrl: './header-page.component.html', + styleUrl: './header-page.component.scss' +}) +export class HeaderPageComponent { + public selectHeaderForm: FormGroup; + constructor(private formsBuilder: FormBuilder) {} + + ngOnInit(): void { + this.selectHeaderForm = this.formsBuilder.group({ + nombreQuiz: [''], + descripcion: [''], + modulo: [''], + }); + this.showCelula = false; + } + + showCelula: boolean = false; + showSeniority: boolean = false; + questionCategory: any = { + modulo: 'Selecciona la célula', + seniority: 'Seniority', + }; + + isShowCelula() { + this.showCelula = !this.showCelula; + this.showSeniority = false; + } + isShowSeniority() { + this.showSeniority = !this.showSeniority; + this.showCelula = false; + } +} From 509a8fb86688d2cdf18d6b90ef89997465e6a0ca Mon Sep 17 00:00:00 2001 From: Agustindardanelli-stack Date: Thu, 3 Oct 2024 20:14:47 -0300 Subject: [PATCH 055/203] modifying logic search --- src/app/modules/all/all.module.ts | 5 +- .../pages/all-page/all-page.component.html | 71 ++++++++++--------- .../pages/all-page/all-page.component.scss | 4 +- .../all/pages/all-page/all-page.component.ts | 35 +++++---- 4 files changed, 66 insertions(+), 49 deletions(-) diff --git a/src/app/modules/all/all.module.ts b/src/app/modules/all/all.module.ts index a9e1c09..321c812 100644 --- a/src/app/modules/all/all.module.ts +++ b/src/app/modules/all/all.module.ts @@ -2,10 +2,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { AllPageComponent } from './pages/all-page/all-page.component'; import { AllRoutingModule } from './all-routing.module'; +import { FormsModule } from '@angular/forms'; @NgModule({ declarations: [AllPageComponent], - imports: [CommonModule, AllRoutingModule], + imports: [CommonModule, AllRoutingModule, FormsModule], exports: [AllPageComponent] }) export class AllModule {} + + diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 223adcd..949bd28 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1,39 +1,42 @@

Todos los Quiz

- + + +
+
+
Nombre Q.SeniorityFec. CreaciónCreadorMóduloCélulaEstadoAcciones
Nombre Q.SeniorityFec. CreaciónCreadorMóduloCélulaEstadoAcciones
{{ quiz.name }}
{{ quiz.name }} {{ quiz.seniority }}{{ quiz.creationDate }}{{ quiz.creationDate }} {{ quiz.creator }} {{ quiz.module }} {{ quiz.cell }} {{ quiz.status }} - - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Nombre Q.SeniorityFec. CreaciónCreadorMóduloCélulaEstadoAcciones
{{ quiz.name }}{{ quiz.seniority }}{{ quiz.creationDate }}{{ quiz.creator }}{{ quiz.module }}{{ quiz.cell }} + {{ quiz.status }} + + + + +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Nombre Q.SeniorityFec. CreaciónCreadorMóduloCélulaEstadoAcciones
{{ quiz.name }}{{ quiz.seniority }}{{ quiz.creationDate }}{{ quiz.creator }}{{ quiz.module }}{{ quiz.cell }}{{ quiz.status }} - - - -
-
diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index 44fd042..3bcc60a 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -11,6 +11,8 @@ $spacing: 20px; padding: 20px; background-color: #1e1e1e; color: #fff; + height: 95vh; + width: 150vh; } .table-sup{ font-family: Poppins; @@ -22,7 +24,7 @@ $spacing: 20px; } .table-int{ - text-align: center; + margin: 0 auto; } h2 { diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index ebddd6f..93e5fc9 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Router } from '@angular/router'; +import { Router } from '@angular/router'; interface Quiz { name: string; @@ -14,12 +14,10 @@ interface Quiz { @Component({ selector: 'app-all-page', templateUrl: './all-page.component.html', - styleUrl: './all-page.component.scss', + styleUrls: ['./all-page.component.scss'], // Cambiado a styleUrls para usar un array }) export class AllPageComponent { - searchText: string = ''; - constructor(private router: Router) { } - + searchText: string = ''; // Campo de búsqueda quizzes: Quiz[] = [ { name: 'UI Jr Quiz', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Oscar A.', module: 'Desarrollo', cell: 'Diseño UX/UI', status: 'Activo' }, { name: 'QA Sr Quiz', seniority: 'Senior', creationDate: '30/08/2024', creator: 'Thamy G.', module: 'Desarrollo', cell: 'QA', status: 'Activo' }, @@ -31,28 +29,39 @@ export class AllPageComponent { { name: 'UI Jr Quiz 1', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Oscar A.', module: 'Desarrollo', cell: 'Diseño UX/UI', status: 'Activo' } ]; - filteredQuizzes() { + constructor(private router: Router) { } + + // Método para filtrar quizzes según el texto de búsqueda + filteredQuizzes(): Quiz[] { + const search = this.searchText.toLowerCase(); // Convertir a minúsculas para hacer la búsqueda insensible a mayúsculas/minúsculas + + // Retornar los quizzes filtrados return this.quizzes.filter(quiz => - quiz.name.toLowerCase().includes(this.searchText.toLowerCase()) || - quiz.creator.toLowerCase().includes(this.searchText.toLowerCase()) + quiz.name.toLowerCase().includes(search) || + quiz.seniority.toLowerCase().includes(search) || + quiz.creator.toLowerCase().includes(search) || + quiz.module.toLowerCase().includes(search) || + quiz.cell.toLowerCase().includes(search) || + quiz.status.toLowerCase().includes(search) ); } + // Método para ver los detalles de un quiz viewQuiz(quiz: Quiz) { alert(`Viendo el quiz: ${quiz.name}`); } + // Método para editar un quiz editQuiz(quiz: Quiz) { - alert(`Editando el quiz: ${quiz.name}`), - this.router.navigate(['/edit', quiz.name]); // Redirecciona con el nombre del quiz o un ID único - - + alert(`Editando el quiz: ${quiz.name}`); + this.router.navigate(['/edit', quiz.name]); // Redirigir al editar usando el nombre del quiz } + // Método para eliminar un quiz deleteQuiz(quiz: Quiz) { if (confirm(`¿Estás seguro de eliminar el quiz: ${quiz.name}?`)) { + // Eliminar el quiz del array this.quizzes = this.quizzes.filter(q => q !== quiz); } } - } From 49774ffeb754d02f93a025b8e2e38394b8c67a30 Mon Sep 17 00:00:00 2001 From: Agustindardanelli-stack Date: Thu, 3 Oct 2024 20:42:39 -0300 Subject: [PATCH 056/203] adjusting container layaout --- src/app/modules/all/all.module.ts | 4 ++-- .../all/pages/all-page/all-page.component.html | 2 ++ .../all/pages/all-page/all-page.component.scss | 15 ++++++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/app/modules/all/all.module.ts b/src/app/modules/all/all.module.ts index 321c812..d53286f 100644 --- a/src/app/modules/all/all.module.ts +++ b/src/app/modules/all/all.module.ts @@ -3,10 +3,10 @@ import { CommonModule } from '@angular/common'; import { AllPageComponent } from './pages/all-page/all-page.component'; import { AllRoutingModule } from './all-routing.module'; import { FormsModule } from '@angular/forms'; - +import { HeaderFormModule } from 'src/app/shared/components/header-form/header-form.module'; @NgModule({ declarations: [AllPageComponent], - imports: [CommonModule, AllRoutingModule, FormsModule], + imports: [CommonModule, AllRoutingModule, FormsModule, HeaderFormModule], exports: [AllPageComponent] }) export class AllModule {} diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 949bd28..7ada0a0 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1,3 +1,5 @@ + +

Todos los Quiz

diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index 3bcc60a..0407ae5 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -12,7 +12,12 @@ $spacing: 20px; background-color: #1e1e1e; color: #fff; height: 95vh; - width: 150vh; + width: 150vh; + border-radius: 12px; + padding: 24px 8px 8px 8px; + gap: 47px; + opacity: 0px; + } .table-sup{ font-family: Poppins; @@ -25,6 +30,9 @@ $spacing: 20px; } .table-int{ margin: 0 auto; + flex: auto; + + } h2 { @@ -107,10 +115,15 @@ h2 { .quiz-table th { background-color: #333; + } .quiz-table td { background-color: #222; + text-align: center; // Centrar el texto horizontalmente + padding: 12px; // Espacio alrededor del texto + font-family: "Poppins"; + } .actions button { From f2bb13d44813d37108b8f1e0cd7524093e20c831 Mon Sep 17 00:00:00 2001 From: Agustindardanelli-stack Date: Thu, 3 Oct 2024 21:38:59 -0300 Subject: [PATCH 057/203] adjusting style --- src/app/modules/all/pages/all-page/all-page.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index 0407ae5..e719335 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -121,8 +121,8 @@ h2 { .quiz-table td { background-color: #222; text-align: center; // Centrar el texto horizontalmente - padding: 12px; // Espacio alrededor del texto - font-family: "Poppins"; + padding: 12px; // Espacio alrededor del texto + font-family: "Poppins"; } From f08e43d4bddb8d2a5189be98acd2177eee4a5c83 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Fri, 4 Oct 2024 12:26:55 -0300 Subject: [PATCH 058/203] datos --- .../pages/new-pages/new-pages.component.html | 3 +- .../pages/new-pages/new-pages.component.scss | 177 +----------------- .../pages/new-pages/new-pages.component.ts | 66 +++---- .../header-page/header-page.component.scss | 173 +---------------- .../header-page/header-page.component.ts | 16 +- 5 files changed, 47 insertions(+), 388 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 7844b82..d0c5707 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,5 +1,5 @@
- + @@ -7,7 +7,6 @@

Define la pregunta 1/5

-
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 277d66a..cba9fc2 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -1,50 +1,3 @@ -$background-color: #2a2a2a; -$shadow-color: rgba(0, 217, 255, 0.4); -$input-bg-color: #333; -$text-color: #fff; -$border-radius: 12px; -$transition-time: 0.3s; -$spacing: 20px; - -.new-title { - margin-top: 20px; - height: 40; -} - -.question-title { - font-style: Poppins; - font-weight: 400; - font-size: 22px; -} - -.input-name { - width: 384px; - height: 40px; -} - -.text-description { - width: 135vh; - height: 76px; - margin: 0; - padding-top: 8px; -} -.input-name, -.text-description { - border-radius: 8px; - border: 1px solid #333232; - background-color: #1b1b1b; - padding-left: 16px; - font-size: 14px; -} - -.header-inputs-container { - padding: 0 1rem 1 rem 0; - display: flex; - flex-direction: column; - justify-content: space-between; - margin-bottom: 2.2rem; -} - .transparent { background-color: #2121217a; /* width: 170vh; */ @@ -57,7 +10,7 @@ $spacing: 20px; .normal-container { background-color: #212121; padding: 1.5rem; - border-radius: $border-radius; + border-radius: 12px; box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); background-color: #212121; background-image: url('../../../../../assets/layout/images/logo.svg'); @@ -65,13 +18,6 @@ $spacing: 20px; background-position: center; background-size: 180px; } -.content { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - margin-bottom: 30px; -} .content-1 { background-color: #353434; @@ -79,54 +25,9 @@ $spacing: 20px; flex-wrap: wrap; justify-content: space-between; width: 135vh; - - border-radius: 12px; - padding: .8rem; -} - -.input-container { - - width: 41vh; - height: 9vh; - display: flex; - flex-direction: column; - justify-content: space-between; -} -.option-floating { - position: absolute; - width: 41vh; - background-color: #303030; - display: flex; - flex-wrap: wrap; - justify-content: center; - gap: .8rem; - align-items: center; - padding: .8rem; - border-radius: 8px; - cursor: pointer; -} - -.floating { - border: none; - padding-left: .8rem; - padding-right: .8rem; - font-size: 12px; -} - - -h4 { - margin: 0; - font-size: 16px; -} - -.option-select { - cursor: pointer; - border: 2px solid #fff; - border: none; - color: #c2bbbb99; - background-color: #202020; - height: 4vh; + border-radius: 12px; + padding: 0.8rem; } .option { @@ -134,61 +35,7 @@ h4 { white-space: nowrap; } -.Diseño-UX-UI { - background-color: #ffcc00; - color: #795f3a; - border-radius: 10px; - white-space: nowrap; -} - -.QA-Tester { - border-radius: 20px; - background-color: #ff9500; - color: #795f3a; -} -.Frontend { - border-radius: 20px; - background-color: #34c759; - color: #795f3a; -} -.Backend { - border-radius: 20px; - background-color: #00c7be; - color: #795f3a; -} -.PM { - border-radius: 20px; - background-color: #30b0c7; - color: #795f3a; -} -.Scrum-Master { - border-radius: 20px; - background-color: #32ade6; - color: #795f3a; -} -.trainee { - border-radius: 20px; - background-color: #007aff; - color: #795f3a; -} -.junior { - border-radius: 20px; - background-color: #5856d6; - color: #57462e; -} -.semi-sr { - border-radius: 20px; - background-color: #af52de; - color: #5e4b30; -} -.senior { - border-radius: 20px; - background-color: #ff2d55; - color: #423420; -} - .form-group { - display: flex; justify-content: space-between; flex-wrap: wrap; @@ -222,7 +69,7 @@ h4 { } .custom-select { - width: 63.5vh; + width: 60.5vh; height: 28px; border: none; opacity: 0px; @@ -232,15 +79,14 @@ h4 { color: rgba(194, 187, 187, 0.6); } .custom-input { - width: 64vh; + width: 61vh; height: 4vh; border: none; gap: 0px; padding: 0px 8px 0px 8px; opacity: 0px; background: rgba(32, 32, 32, 1); - border-radius: 8px ; - + border-radius: 8px; } .custom-option-group { @@ -248,16 +94,14 @@ h4 { } .option-row { - width: 130vh; display: flex; justify-content: space-around; flex-wrap: wrap; - } .custom-option-input { - width: 60vh; + width: 57vh; height: 4vh; border-radius: 8px; background-color: #202020; @@ -271,17 +115,15 @@ h4 { width: 4vh; height: 4vh; background-color: #303030; - border-radius: 8px 0 0 8px; + border-radius: 8px 0 0 8px; display: flex; justify-content: center; align-items: center; - padding: 0 + padding: 0; } - .checkbox-input { background-color: red; - } .custom-radio { @@ -323,7 +165,6 @@ h4 { width: 91px; height: 42px; padding: 8px; - border-radius: 8px; border: 1.4px solid #5f5f5f; font-size: 12px; diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 28521aa..fefb7c4 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,5 +1,4 @@ import { Component } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'app-new-pages', @@ -7,17 +6,9 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; styleUrls: ['./new-pages.component.scss'], }) export class NewPagesComponent { - public selectHeaderForm: FormGroup; - constructor(private formsBuilder: FormBuilder) {} + constructor() {} - ngOnInit(): void { - this.selectHeaderForm = this.formsBuilder.group({ - nombreQuiz: [''], - descripcion: [''], - modulo: [''], - }); - this.showCelula = false; - } + ngOnInit(): void {} questionTypes: string[] = [ 'Selección mutiple', @@ -25,14 +16,14 @@ export class NewPagesComponent { 'Verdadero o falso', ]; + questionClass: string = ''; questionCategory: any = { modulo: 'Selecciona la célula', seniority: 'Seniority', }; - showCelula: boolean = false; - showSeniority: boolean = false; - showForm: boolean = true; + + showForm: any = false; options: string[] = []; selection: string[] = ['']; array: string[] = ['']; @@ -43,29 +34,6 @@ export class NewPagesComponent { showSubmits: boolean = false; inputType: string = ''; - pushQuestionCategory(prop: string, val: string) { - this.questionCategory[prop] = val; - this.closeInputs(); - if ( - this.questionCategory.modulo != 'Selecciona la célula' && - this.questionCategory.seniority != 'Seniority' - ) { - this.showForm = true; - } - } - - isShowCelula() { - this.showCelula = !this.showCelula; - this.showSeniority = false; - } - isShowSeniority() { - this.showSeniority = !this.showSeniority; - this.showCelula = false; - } - closeInputs() { - this.showCelula = false; - this.showSeniority = false; - } onQuestionTypeChange(selectedType: string) { this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ @@ -98,6 +66,16 @@ export class NewPagesComponent { /* Pero al agregar un campo el problema vuelve a surgir */ } } + recibirDatos(datos: any) { + if ( + datos.modulo != 'Selecciona la célula' && + datos.seniority != 'Seniority' + ) { + this.showForm = true; + } + console.log(datos); + + } answerChoice(i: number, type: string, form: any) { if (type === 'radio') { @@ -118,12 +96,14 @@ export class NewPagesComponent { } } - send(): any { - console.log(this.selectHeaderForm.value); - } - addOption() { - this.options.push(`Opción ${this.options.length + 1}`); + if (this.options.length < 5) { + this.options.push(`Opción ${this.options.length + 1}`); + } else { + this.options.push(`Opción ${this.options.length + 1}`); + this.showPlus = false; + this.showPlus2 = false; + } } addOption2() { this.options.push(`Opción ${this.options.length + 1 + '.'}`); @@ -131,10 +111,8 @@ export class NewPagesComponent { // enviar el formulario onSubmit(form: any) { - const formHeader = this.selectHeaderForm.value; const formSection = form.value; console.log(formSection); - console.log(formHeader); } // Crear una nueva pregunta addNewQuestion(form: any) { diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index e1675a8..4fba6cb 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -1,11 +1,3 @@ -$background-color: #2a2a2a; -$shadow-color: rgba(0, 217, 255, 0.4); -$input-bg-color: #333; -$text-color: #fff; -$border-radius: 12px; -$transition-time: 0.3s; -$spacing: 20px; - .new-title { margin-top: 20px; height: 40; @@ -54,18 +46,6 @@ $spacing: 20px; align-items: center; } -.normal-container { - background-color: #212121; - padding: 1.5rem; - border-radius: $border-radius; - box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); - background-color: #212121; - - background-image: url('../../../../../../assets/layout/images/logo.svg'); - background-repeat: no-repeat; - background-position: center; - background-size: 180px; -} .content { display: flex; flex-direction: column; @@ -128,6 +108,8 @@ h4 { color: #c2bbbb99; background-color: #202020; height: 4vh; + display: flex; + align-items: center; } .option { @@ -188,154 +170,3 @@ h4 { color: #423420; } -.form-group { - - display: flex; - justify-content: space-between; - flex-wrap: wrap; - width: 130vh; -} - -.content-2 { - width: 135vh; - padding: 16px 0px 0px 0px; - gap: 17px; - font-family: Poppins; - border-radius: 8px; - padding: 16px; - opacity: 0px; - background-color: #4f4d4d73; - box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); -} -.question-container { - width: 130vh; - height: 52px; - display: flex; - align-items: center; - justify-content: space-around; -} - -.custom-label { - font-family: Poppins; - font-weight: 500; - font-size: 14px; - color: rgba(255, 255, 255, 1); -} - -.custom-select { - width: 63.5vh; - height: 28px; - border: none; - opacity: 0px; - padding: 0 0 0 8px; - - background: rgba(32, 32, 32, 1); - color: rgba(194, 187, 187, 0.6); -} -.custom-input { - width: 64vh; - height: 4vh; - border: none; - gap: 0px; - padding: 0px 8px 0px 8px; - opacity: 0px; - background: rgba(32, 32, 32, 1); - border-radius: 8px ; - -} - -.custom-option-group { - margin-bottom: 10px; -} - -.option-row { - - width: 130vh; - display: flex; - justify-content: space-around; - flex-wrap: wrap; - -} - -.custom-option-input { - width: 60vh; - height: 4vh; - border-radius: 8px; - background-color: #202020; - border: none; - color: gray; - border-radius: 0 8px 8px 0px; - cursor: pointer; -} - -.checkbox-container { - width: 4vh; - height: 4vh; - background-color: #303030; - border-radius: 8px 0 0 8px; - display: flex; - justify-content: center; - align-items: center; - padding: 0 -} - - -.checkbox-input { - background-color: red; - -} - -.custom-radio { - padding: 0 0 0 8px; - width: 378px; -} - -.custom-add-option-btn { - width: 60vh; - gap: 5px; - border-radius: 8px; - padding: 5px; - color: #d8d6d6; -} - -.custom-btn-submit { - width: 91px; - height: 42px; - padding: 3px; - background-color: rgba(106, 95, 255, 1); - box-shadow: 0px 4px 4px 0px #00000026; - cursor: pointer; - border-radius: 8px; - border: 1.4px solid #706fe5; - font-size: 12px; - color: #ffff; -} -.i { - width: 7.89px; - height: 10px; - top: 2.5px; - left: 1.97px; - gap: 0px; - opacity: 0px; -} - -.custom-btn-new-question { - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); - width: 91px; - height: 42px; - padding: 8px; - - border-radius: 8px; - border: 1.4px solid #5f5f5f; - font-size: 12px; - background: rgba(95, 95, 95, 1); - color: rgba(126, 126, 126, 1); - display: flex; - justify-content: center; - align-items: center; -} - -.label-input { - display: flex; - justify-content: flex-start; -} diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index 4b32652..c7f9f6c 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -1,12 +1,13 @@ -import { Component } from '@angular/core'; +import { Component, EventEmitter, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'app-header-page', templateUrl: './header-page.component.html', - styleUrl: './header-page.component.scss' + styleUrl: './header-page.component.scss', }) export class HeaderPageComponent { + @Output() datosParaPadre = new EventEmitter(); public selectHeaderForm: FormGroup; constructor(private formsBuilder: FormBuilder) {} @@ -18,7 +19,7 @@ export class HeaderPageComponent { }); this.showCelula = false; } - + showForm: boolean = false; showCelula: boolean = false; showSeniority: boolean = false; questionCategory: any = { @@ -34,4 +35,13 @@ export class HeaderPageComponent { this.showSeniority = !this.showSeniority; this.showCelula = false; } + pushQuestionCategory(prop: string, val: string): void { + this.questionCategory[prop] = val; + this.closeInputs(); + this.datosParaPadre.emit(this.questionCategory); + } + closeInputs() { + this.showCelula = false; + this.showSeniority = false; + } } From e92fa64b69389e1a1c67d31c8386c88b99f73ddd Mon Sep 17 00:00:00 2001 From: Ignacio Date: Fri, 4 Oct 2024 19:06:32 -0300 Subject: [PATCH 059/203] todos --- .../pages/all-page/all-page.component.html | 1 + .../pages/new-pages/new-pages.component.html | 15 ++++++++++ .../pages/new-pages/new-pages.component.scss | 28 +++++++++++++++++++ .../welcome-page/welcome-page.component.html | 4 +-- .../header-page/header-page.component.html | 16 ----------- .../header-page/header-page.component.scss | 13 +-------- .../header-page/header-page.component.ts | 2 +- 7 files changed, 48 insertions(+), 31 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 7ada0a0..361598d 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1,5 +1,6 @@ +

Todos los Quiz

diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index d0c5707..5251a7d 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,4 +1,19 @@
+
+
+ +
+
+
Descripción
+
+
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index cba9fc2..fed2712 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -7,6 +7,34 @@ align-items: center; } +.header-inputs-container { + padding: 0 1rem 1 rem 0; + display: flex; + flex-direction: column; + justify-content: space-between; + margin-bottom: 2.2rem; +} + +.input-name { + width: 384px; + height: 40px; +} + +.text-description { + width: 135vh; + height: 76px; + margin: 0; + padding-top: 8px; +} +.input-name, +.text-description { + border-radius: 8px; + border: 1px solid #333232; + background-color: #1b1b1b; + padding-left: 16px; + font-size: 14px; +} + .normal-container { background-color: #212121; padding: 1.5rem; diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index cda080e..1801a1c 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -40,10 +40,10 @@
-
+
diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index b118831..616f263 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -1,20 +1,4 @@ -
-
- -
-
-
Descripción
-
-
-
diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index 4fba6cb..fcc84aa 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -9,10 +9,7 @@ font-size: 22px; } -.input-name { - width: 384px; - height: 40px; -} + .text-description { width: 135vh; @@ -29,14 +26,6 @@ font-size: 14px; } -.header-inputs-container { - padding: 0 1rem 1 rem 0; - display: flex; - flex-direction: column; - justify-content: space-between; - margin-bottom: 2.2rem; -} - .transparent { background-color: #2121217a; /* width: 170vh; */ diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index c7f9f6c..15e4b80 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -19,7 +19,7 @@ export class HeaderPageComponent { }); this.showCelula = false; } - showForm: boolean = false; + showCelula: boolean = false; showSeniority: boolean = false; questionCategory: any = { From 25d4eeea070ea6c7281d85f010580067c4421154 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 5 Oct 2024 11:56:32 -0300 Subject: [PATCH 060/203] figma --- .../pages/new-pages/new-pages.component.html | 45 +++++++------ .../pages/new-pages/new-pages.component.scss | 66 ++++++++++++++++--- .../welcome-page/welcome-page.component.html | 6 +- .../header-page/header-page.component.scss | 2 +- 4 files changed, 89 insertions(+), 30 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 5251a7d..e752b0c 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,25 +1,36 @@
- -
-
-
Descripción
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
- - -

Define la pregunta 1/5

@@ -31,7 +42,6 @@

Define la pregunta 1/5

>
- - - -
@@ -78,7 +85,7 @@

Define la pregunta 1/5

-
+
-
+ + +
+
diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index fcc84aa..8e585b1 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -40,7 +40,7 @@ flex-direction: column; justify-content: center; align-items: center; - margin-bottom: 30px; + /* margin-bottom: 30px; */ } .content-1 { From b8f426bbcc322de007a88299b40a28d8bef8cbdb Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 5 Oct 2024 12:36:13 -0300 Subject: [PATCH 061/203] correccion --- .../modules/all/pages/all-page/all-page.component.html | 2 +- .../pages/welcome-page/welcome-page.component.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 361598d..983f0d1 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1,7 +1,7 @@ -
+

Todos los Quiz

diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 867950d..b7e6daa 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -32,12 +32,12 @@ - -
+
+
From fb89d9674c57f933f75da8958222e38ba764ae78 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Mon, 7 Oct 2024 12:11:47 -0300 Subject: [PATCH 062/203] puliendo --- .../pages/new-pages/new-pages.component.html | 9 +++++-- .../pages/new-pages/new-pages.component.scss | 25 +++++++++++++------ .../pages/new-pages/new-pages.component.ts | 23 +++++++++++++---- .../header-page/header-page.component.html | 4 +-- .../header-page/header-page.component.scss | 11 ++++++++ src/index.html | 1 + 6 files changed, 57 insertions(+), 16 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index e752b0c..bade08d 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -11,8 +11,8 @@ placeholder="Nombre del Quiz" />
-
@@ -28,6 +28,11 @@
+
+ + +
+ diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 65d7ad2..7f786db 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -227,13 +227,24 @@ font-size: 12px; color: #ffff; } -.i { - width: 7.89px; - height: 10px; - top: 2.5px; - left: 1.97px; - gap: 0px; - opacity: 0px; + +.custom-btn-save { + width: 12vh; + height: 42px; + padding: .3rem; + top: 80vh; + right: 40vh; + position: absolute; + background-color: rgba(106, 95, 255, 1); + box-shadow: 0px 4px 4px 0px #00000026; + cursor: pointer; + border-radius: 8px; + border: 1.4px solid #706fe5; + font-size: 12px; + color: #ffff; +} +i { + font-size: 22px; } .custom-btn-new-question { diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index fefb7c4..8f5a6da 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -16,14 +16,14 @@ export class NewPagesComponent { 'Verdadero o falso', ]; - questionClass: string = ''; questionCategory: any = { modulo: 'Selecciona la célula', seniority: 'Seniority', }; - - showForm: any = false; + + showButton: boolean = false; + showForm: boolean = false; options: string[] = []; selection: string[] = ['']; array: string[] = ['']; @@ -71,12 +71,19 @@ export class NewPagesComponent { datos.modulo != 'Selecciona la célula' && datos.seniority != 'Seniority' ) { - this.showForm = true; + this.showButton = true; } console.log(datos); + } + createQuiz(): void{ + this.showForm = true + this.showButton = false + console.log('dale') + } + editQuiz():void{ + this.showForm = false } - answerChoice(i: number, type: string, form: any) { if (type === 'radio') { this.array = @@ -106,7 +113,13 @@ export class NewPagesComponent { } } addOption2() { + if (this.options.length < 5) { this.options.push(`Opción ${this.options.length + 1 + '.'}`); + } else { + this.options.push(`Opción ${this.options.length + 1 + '.'}`); + this.showPlus = false; + this.showPlus2 = false; + } } // enviar el formulario diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index 616f263..1c7d53a 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -27,7 +27,7 @@

Célula

diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index e719335..65182d7 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -36,9 +36,12 @@ $spacing: 20px; } h2 { - color: #fff; - font-size: 1.5rem; - margin-bottom: 20px; + color: #fff; + font-size: 1.5rem; + position: absolute; + left: 20%; + text-align: left; + } .filters { @@ -60,6 +63,7 @@ h2 { display: flex; justify-content: flex-end; margin-bottom: 10px; + margin-top: 10px; } .search-container input { From f51922d02fa0556535325f03fa83262ec2ff6a25 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 8 Oct 2024 12:15:43 -0300 Subject: [PATCH 064/203] form --- .../pages/new-pages/new-pages.component.html | 23 +++++++++---------- .../pages/new-pages/new-pages.component.ts | 20 +++++++++------- .../header-page/header-page.component.scss | 17 +++++--------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index bade08d..2bc957c 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,15 +1,16 @@
-
+
- -
+ -
+ type="text" + class="input-name mb-2" + placeholder="Nombre del Quiz" + formControlName="name" /> +
- - -
- + +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 8f5a6da..70ec5f1 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'app-new-pages', @@ -6,7 +7,10 @@ import { Component } from '@angular/core'; styleUrls: ['./new-pages.component.scss'], }) export class NewPagesComponent { - constructor() {} + constructor(private formsBuilder: FormBuilder) {} + public selectNameForm = this.formsBuilder.group({ + name: [''] + }) ngOnInit(): void {} @@ -22,17 +26,17 @@ export class NewPagesComponent { seniority: 'Seniority', }; - showButton: boolean = false; - showForm: boolean = false; options: string[] = []; selection: string[] = ['']; array: string[] = ['']; selectedOption: string = ''; + inputType: string = ''; + showButton: boolean = false; + showForm: boolean = false; isTrueFalseQuestion: boolean = false; showPlus: boolean = false; showPlus2: boolean = false; showSubmits: boolean = false; - inputType: string = ''; onQuestionTypeChange(selectedType: string) { this.array = @@ -66,7 +70,7 @@ export class NewPagesComponent { /* Pero al agregar un campo el problema vuelve a surgir */ } } - recibirDatos(datos: any) { + recibirDatos(datos: any): void { if ( datos.modulo != 'Selecciona la célula' && datos.seniority != 'Seniority' @@ -78,13 +82,13 @@ export class NewPagesComponent { createQuiz(): void{ this.showForm = true this.showButton = false - console.log('dale') + console.log(this.selectNameForm.value) + console.log(this.questionCategory) } editQuiz():void{ this.showForm = false - } - answerChoice(i: number, type: string, form: any) { + answerChoice(i: number, type: string) { if (type === 'radio') { this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index 52032b6..4d448fa 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -9,8 +9,6 @@ font-size: 22px; } - - .text-description { width: 135vh; height: 76px; @@ -49,13 +47,12 @@ flex-wrap: wrap; justify-content: space-between; width: 135vh; - + border-radius: 12px; - padding: .8rem; + padding: 0.8rem; } .input-container { - width: 41vh; height: 9vh; display: flex; @@ -71,9 +68,9 @@ display: flex; flex-wrap: wrap; justify-content: center; - gap: .8rem; + gap: 0.8rem; align-items: center; - padding: .8rem; + padding: 0.8rem; border-radius: 8px; cursor: pointer; } @@ -90,12 +87,11 @@ .floating { border: none; - padding-left: .8rem; - padding-right: .8rem; + padding-left: 0.8rem; + padding-right: 0.8rem; font-size: 12px; } - h4 { margin: 0; font-size: 16px; @@ -169,4 +165,3 @@ h4 { background-color: #ff2d55; color: #423420; } - From 711e9965f646f5196f8dfb922b1743dae9e6846d Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 8 Oct 2024 18:16:07 -0300 Subject: [PATCH 065/203] consumiendo endpoint --- .../new/pages/new-pages/new-pages.component.ts | 14 +++++++++++--- src/app/modules/new/pages/new-pages/try.js | 0 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 src/app/modules/new/pages/new-pages/try.js diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 70ec5f1..370102e 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -79,12 +79,20 @@ export class NewPagesComponent { } console.log(datos); } - createQuiz(): void{ + async createQuiz() { + let fetchs = await fetch( + 'https://challenge-be-development-99e1.onrender.com/quiz' + ); + fetchs = await fetchs.json(); this.showForm = true this.showButton = false - console.log(this.selectNameForm.value) - console.log(this.questionCategory) + console.log("this.questionCategory") + console.log(fetchs); } + + + + editQuiz():void{ this.showForm = false } diff --git a/src/app/modules/new/pages/new-pages/try.js b/src/app/modules/new/pages/new-pages/try.js new file mode 100644 index 0000000..e69de29 From 0ba9603c4d6a7eaafe3b63ad465717e0b6f7b153 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 8 Oct 2024 20:01:50 -0300 Subject: [PATCH 066/203] POST --- .../pages/new-pages/new-pages.component.ts | 59 +++++++++++++------ 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 370102e..24ee5f8 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -9,8 +9,8 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; export class NewPagesComponent { constructor(private formsBuilder: FormBuilder) {} public selectNameForm = this.formsBuilder.group({ - name: [''] - }) + name: [''], + }); ngOnInit(): void {} @@ -80,21 +80,46 @@ export class NewPagesComponent { console.log(datos); } async createQuiz() { - let fetchs = await fetch( - 'https://challenge-be-development-99e1.onrender.com/quiz' - ); - fetchs = await fetchs.json(); - this.showForm = true - this.showButton = false - console.log("this.questionCategory") - console.log(fetchs); - } + try { + this.showForm = true; + this.showButton = false; + this.questionCategory.name = this.selectNameForm.value.name; - - + const prueba = { + created_by: "f0f41d59-fca3-4266-b24e-042aafce6a6a", + "name": "string", + "description": "string", + "cell_id": "string", + "seniority": "trainee", + "challenge_type": "immediate", + + "created_by_id": "string", + "is_active": true + } + const response = await fetch( + 'https://challenge-be-development-99e1.onrender.com/quiz', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(prueba), + } + ); + if (!response.ok) { + throw new Error(`Error: ${response.status}`); + } + + const data = await response.json(); + console.log(data); + + } catch (error) { + console.error('Error creating quiz:', error); + } + } - editQuiz():void{ - this.showForm = false + editQuiz(): void { + this.showForm = false; } answerChoice(i: number, type: string) { if (type === 'radio') { @@ -126,8 +151,8 @@ export class NewPagesComponent { } addOption2() { if (this.options.length < 5) { - this.options.push(`Opción ${this.options.length + 1 + '.'}`); - } else { + this.options.push(`Opción ${this.options.length + 1 + '.'}`); + } else { this.options.push(`Opción ${this.options.length + 1 + '.'}`); this.showPlus = false; this.showPlus2 = false; From c465adf322e53d995a6d9c6c1313c30f96001c36 Mon Sep 17 00:00:00 2001 From: Agustindardanelli-stack Date: Tue, 8 Oct 2024 20:18:04 -0300 Subject: [PATCH 067/203] =?UTF-8?q?Querying=20api=20for=20=C2=B4ALL=C2=B4?= =?UTF-8?q?=20screen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/all-page/all-page.component.html | 10 +-- .../all/pages/all-page/all-page.component.ts | 68 +++++++++++++------ 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 4291c39..404a332 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -29,12 +29,12 @@

Todos los Quiz

{{ quiz.name }} {{ quiz.seniority }} - {{ quiz.creationDate }} - {{ quiz.creator }} - {{ quiz.module }} - {{ quiz.cell }} + {{ quiz.created_at | date:'yyyy-MM-dd'}} + {{ quiz.created_by.first_name }} + {{ quiz.cell.module.name }} + {{ quiz.cell.name }} - {{ quiz.status }} + {{ quiz.is_active ? 'Activo' : 'Inactivo' }} diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 93e5fc9..f9cc21a 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -1,14 +1,14 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; interface Quiz { name: string; - seniority: string; - creationDate: string; - creator: string; + seniority: string; + created_at: string; + created_by:string module: string; cell: string; - status: string; + is_active: string; } @Component({ @@ -16,33 +16,57 @@ interface Quiz { templateUrl: './all-page.component.html', styleUrls: ['./all-page.component.scss'], // Cambiado a styleUrls para usar un array }) -export class AllPageComponent { +export class AllPageComponent implements OnInit { searchText: string = ''; // Campo de búsqueda - quizzes: Quiz[] = [ - { name: 'UI Jr Quiz', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Oscar A.', module: 'Desarrollo', cell: 'Diseño UX/UI', status: 'Activo' }, - { name: 'QA Sr Quiz', seniority: 'Senior', creationDate: '30/08/2024', creator: 'Thamy G.', module: 'Desarrollo', cell: 'QA', status: 'Activo' }, - { name: 'FS Trainee Quiz', seniority: 'Trainee', creationDate: '30/08/2024', creator: 'Javier B.', module: 'Desarrollo', cell: 'Back End', status: 'Activo' }, - { name: 'FS Jr Quiz', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Brayan C.', module: 'Desarrollo', cell: 'Back End', status: 'Activo' }, - { name: 'Diseñador Jr.', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Rafael B.', module: 'Marketing', cell: 'Diseño', status: 'Activo' }, - { name: 'BE Trainee Quiz', seniority: 'Trainee', creationDate: '30/08/2024', creator: 'Brayan C.', module: 'Sistemas', cell: 'Python', status: 'Activo' }, - { name: 'BE Jr Quiz', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Brayan C.', module: 'Sistemas', cell: 'Python', status: 'Activo' }, - { name: 'UI Jr Quiz 1', seniority: 'Junior', creationDate: '30/08/2024', creator: 'Oscar A.', module: 'Desarrollo', cell: 'Diseño UX/UI', status: 'Activo' } - ]; + quizzes: Quiz[] = []; // Inicializa el array de quizzes + constructor(private router: Router) { } + ngOnInit(): void { + // Llama al método para obtener todos los quizzes al iniciar el componente + this.fetchAllQuizzes(); + } + + // Método para obtener todos los quizzes desde la API +async fetchAllQuizzes() { + try { + const response = await fetch('https://challenge-be-development-99e1.onrender.com/quiz'); + + if (!response.ok) { // Verifica si la respuesta fue exitosa + throw new Error('Error en la consulta: ' + response.status); + } + + // Lee el cuerpo de la respuesta solo una vez + const data = await response.json(); // Renombrado a 'data' para reflejar que es un objeto + console.log("Datos recibidos de la API:", data); // Inspecciona la estructura de la respuesta + + // Asegúrate de que quizData es un array antes de asignarlo + this.quizzes = Array.isArray(data.quizzes) ? data.quizzes : []; // Accede al array 'quizzes' dentro del objeto + + console.log("Quizzes recibidos:", this.quizzes); + + } catch (error) { + // Manejo de errores + console.error("Error al obtener los quizzes:", error); + } +} + + + // Método para filtrar quizzes según el texto de búsqueda - filteredQuizzes(): Quiz[] { + filteredQuizzes(): Quiz[] { const search = this.searchText.toLowerCase(); // Convertir a minúsculas para hacer la búsqueda insensible a mayúsculas/minúsculas // Retornar los quizzes filtrados return this.quizzes.filter(quiz => quiz.name.toLowerCase().includes(search) || quiz.seniority.toLowerCase().includes(search) || - quiz.creator.toLowerCase().includes(search) || - quiz.module.toLowerCase().includes(search) || - quiz.cell.toLowerCase().includes(search) || - quiz.status.toLowerCase().includes(search) + quiz.created_at.toLowerCase().includes(search) || // fecha + quiz.created_by.toLowerCase().includes(search) || + quiz.module.toLowerCase().includes(search) || //modulo + quiz.cell.toLowerCase().includes(search) || + quiz.is_active.toLowerCase().includes(search) ); } @@ -64,4 +88,6 @@ export class AllPageComponent { this.quizzes = this.quizzes.filter(q => q !== quiz); } } + + } From a391be20b07222070e0fb5404391cc6f2dbc1f6b Mon Sep 17 00:00:00 2001 From: Agustindardanelli-stack Date: Tue, 8 Oct 2024 20:59:06 -0300 Subject: [PATCH 068/203] =?UTF-8?q?styles=20screen=20=C2=B4ALL=C2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/all-page/all-page.component.html | 6 +- .../pages/all-page/all-page.component.scss | 9 +++ .../all/pages/all-page/all-page.component.ts | 62 ++++++++++++++----- 3 files changed, 59 insertions(+), 18 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 404a332..09bf30c 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -34,7 +34,11 @@

Todos los Quiz

{{ quiz.cell.module.name }} {{ quiz.cell.name }} - {{ quiz.is_active ? 'Activo' : 'Inactivo' }} + + {{ quiz.is_active ? 'Activo' : 'Inactivo' }} + diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index 65182d7..dc70b63 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -110,7 +110,16 @@ h2 { border-collapse: collapse; margin-top: 10px; } +.activo { + color:rgba(151, 71, 255, 1); + ; /* Color para activo */ + font-weight: bold; /* Puedes ajustar el estilo como desees */ +} +.inactivo { + color: red; /* Color para inactivo */ + font-weight: normal; /* Estilo normal para inactivo */ +} .quiz-table th, .quiz-table td { padding: 10px; text-align: left; diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index f9cc21a..d00e682 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -1,14 +1,26 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +interface User { + first_name: string; +} + +interface Module { + name: string; +} + +interface Cell { + name: string; +} + interface Quiz { name: string; seniority: string; created_at: string; - created_by:string - module: string; - cell: string; - is_active: string; + created_by: User; // Cambiado a objeto + module: Module; // Cambiado a objeto + cell: Cell; // Cambiado a objeto + is_active: boolean; } @Component({ @@ -20,7 +32,6 @@ export class AllPageComponent implements OnInit { searchText: string = ''; // Campo de búsqueda quizzes: Quiz[] = []; // Inicializa el array de quizzes - constructor(private router: Router) { } ngOnInit(): void { @@ -29,8 +40,8 @@ export class AllPageComponent implements OnInit { } // Método para obtener todos los quizzes desde la API -async fetchAllQuizzes() { - try { + async fetchAllQuizzes() { + try { const response = await fetch('https://challenge-be-development-99e1.onrender.com/quiz'); if (!response.ok) { // Verifica si la respuesta fue exitosa @@ -46,13 +57,11 @@ async fetchAllQuizzes() { console.log("Quizzes recibidos:", this.quizzes); - } catch (error) { + } catch (error) { // Manejo de errores console.error("Error al obtener los quizzes:", error); + } } -} - - // Método para filtrar quizzes según el texto de búsqueda filteredQuizzes(): Quiz[] { @@ -63,13 +72,34 @@ async fetchAllQuizzes() { quiz.name.toLowerCase().includes(search) || quiz.seniority.toLowerCase().includes(search) || quiz.created_at.toLowerCase().includes(search) || // fecha - quiz.created_by.toLowerCase().includes(search) || - quiz.module.toLowerCase().includes(search) || //modulo - quiz.cell.toLowerCase().includes(search) || - quiz.is_active.toLowerCase().includes(search) + quiz.created_by.first_name.toLowerCase().includes(search) || // creador + quiz.module.name.toLowerCase().includes(search) || //modulo + quiz.cell.name.toLowerCase().includes(search) || //celula + (quiz.is_active ? 'Activo' : 'Inactivo').toLowerCase().includes(search) // esta activo ); } + // Método para alternar el estado de is_active + async toggleActive(quiz: Quiz) { + quiz.is_active = !quiz.is_active; // Alterna el valor de is_active + + try { + const response = await fetch(`https://challenge-be-development-99e1.onrender.com/quiz/${quiz.name}`, { // Asegúrate de usar un identificador correcto + method: 'PUT', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ is_active: quiz.is_active }), // Envía el nuevo estado + }); + + if (!response.ok) { + throw new Error('Error al actualizar el estado del quiz: ' + response.status); + } + } catch (error) { + console.error("Error al actualizar el estado del quiz:", error); + } + } + // Método para ver los detalles de un quiz viewQuiz(quiz: Quiz) { alert(`Viendo el quiz: ${quiz.name}`); @@ -88,6 +118,4 @@ async fetchAllQuizzes() { this.quizzes = this.quizzes.filter(q => q !== quiz); } } - - } From 03cb96834acf8c99212e761770bf6dd8989bd6ad Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Tue, 8 Oct 2024 21:57:40 -0300 Subject: [PATCH 069/203] conexion --- .../new/pages/new-pages/new-pages.component.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 24ee5f8..23674c2 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -86,14 +86,12 @@ export class NewPagesComponent { this.questionCategory.name = this.selectNameForm.value.name; const prueba = { - created_by: "f0f41d59-fca3-4266-b24e-042aafce6a6a", - "name": "string", - "description": "string", - "cell_id": "string", + "name": "string2", + "description": "string2", + "cell_id": "8840a9c4-a1b1-472e-84e1-5c6506f257f1", "seniority": "trainee", "challenge_type": "immediate", - - "created_by_id": "string", + "created_by_id": "f0f41d59-fca3-4266-b24e-042aafce6a6a", "is_active": true } const response = await fetch( @@ -106,9 +104,9 @@ export class NewPagesComponent { body: JSON.stringify(prueba), } ); - if (!response.ok) { + if (!response.ok) { throw new Error(`Error: ${response.status}`); - } + } const data = await response.json(); console.log(data); From 44d4cbf21055e7345f3347fb15e1e1e05ec85bce Mon Sep 17 00:00:00 2001 From: Ignacio Date: Wed, 9 Oct 2024 12:27:23 -0300 Subject: [PATCH 070/203] correccion --- .../pages/new-pages/new-pages.component.ts | 2 +- .../header-page/header-page.component.html | 189 +++++++++--------- .../header-page/header-page.component.scss | 25 ++- .../header-page/header-page.component.ts | 20 +- 4 files changed, 128 insertions(+), 108 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 23674c2..86267d7 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -86,7 +86,7 @@ export class NewPagesComponent { this.questionCategory.name = this.selectNameForm.value.name; const prueba = { - "name": "string2", + "name": this.questionCategory.name, "description": "string2", "cell_id": "8840a9c4-a1b1-472e-84e1-5c6506f257f1", "seniority": "trainee", diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index 1c7d53a..51be9ca 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -1,108 +1,101 @@
-
-
-
-

Módulo

- -
- -
-

Célula

- - -
- {{ - questionCategory?.modulo - }} +
+
-
- - - - - - -
+
+

Módulo

+
+ {{questionCategory?.modulo}} +
+ + +
+
+
- +
+

Célula

+
+ {{questionCategory?.celula}} +
+ + + + + + +
- -
-

Seniority / Nivel

-
- {{ questionCategory?.seniority }} - - -
- - - - -
+ +
+ +
+

Seniority / Nivel

+
+ {{ questionCategory?.seniority }} + + + +
+ + + +
- \ No newline at end of file +
+ diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index 4d448fa..cc7d97e 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -62,7 +62,7 @@ .option-floating { position: absolute; - top: 11vh; + width: 41vh; background-color: #303030; display: flex; @@ -75,13 +75,36 @@ cursor: pointer; } +.module-option { + width: 38vh; + height: 4.5vh; + background-color: #202020; + border: none; + border-radius: 0.5rem; + display: flex; + justify-content: flex-start; + align-items: center; + padding: 0.2rem 0.2rem 0.2rem 0.7rem; + font-size: 12px; + color: rgb(142, 142, 142); + font-style: Poppins; + font-weight: 400; +} + .floating-seniority { position: absolute; + top: 11vh; right: 1.6vh; } +.floating-module { + position: absolute; + top: 11vh; + right: 92.5vh; +} .floating-cell { position: absolute; + top: 11vh; right: 47vh; } diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index 15e4b80..e1f7ff5 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -17,31 +17,35 @@ export class HeaderPageComponent { descripcion: [''], modulo: [''], }); - this.showCelula = false; } - + + showModulo: boolean = false; showCelula: boolean = false; showSeniority: boolean = false; questionCategory: any = { - modulo: 'Selecciona la célula', + modulo: 'Selecciona el modulo', + celula: 'Selecciona la célula', seniority: 'Seniority', }; + isShowModulo() { + this.showModulo = !this.showModulo; + this.showCelula = false; + this.showSeniority = false; + } isShowCelula() { this.showCelula = !this.showCelula; this.showSeniority = false; + this.showModulo = false; } isShowSeniority() { this.showSeniority = !this.showSeniority; this.showCelula = false; + this.showModulo = false; } pushQuestionCategory(prop: string, val: string): void { this.questionCategory[prop] = val; - this.closeInputs(); + this.datosParaPadre.emit(this.questionCategory); } - closeInputs() { - this.showCelula = false; - this.showSeniority = false; - } } From 95369fb5b7c5581dd58e5138f9a96e8a9d9ca5d2 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Wed, 9 Oct 2024 16:36:04 -0300 Subject: [PATCH 071/203] correcciones --- .../pages/new-pages/new-pages.component.html | 30 ++++++++++--------- .../pages/new-pages/new-pages.component.ts | 13 ++++++-- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 2bc957c..c930085 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -3,26 +3,28 @@
-
-
+ +
+
+ +
+
+
+ +
+
-
- -
-
-
- -
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 86267d7..9a1873a 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -9,7 +9,8 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; export class NewPagesComponent { constructor(private formsBuilder: FormBuilder) {} public selectNameForm = this.formsBuilder.group({ - name: [''], + name: ['', Validators.required], + description: ['', Validators.required], }); ngOnInit(): void {} @@ -70,10 +71,14 @@ export class NewPagesComponent { /* Pero al agregar un campo el problema vuelve a surgir */ } } + + recibirDatos(datos: any): void { if ( - datos.modulo != 'Selecciona la célula' && - datos.seniority != 'Seniority' + this.selectNameForm.valid && + datos.celula != 'Selecciona la célula' && + datos.modulo != 'Selecciona el modulo' && + datos.seniority != 'Seniority' ) { this.showButton = true; } @@ -84,6 +89,8 @@ export class NewPagesComponent { this.showForm = true; this.showButton = false; this.questionCategory.name = this.selectNameForm.value.name; + this.questionCategory.description = this.selectNameForm.value.description; +console.log(this.questionCategory); const prueba = { "name": this.questionCategory.name, From d4da68d87c29e3400a92e215e4a75160c0e410ff Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Wed, 9 Oct 2024 17:44:41 -0300 Subject: [PATCH 072/203] logica --- .../pages/new-pages/new-pages.component.html | 4 +- .../pages/new-pages/new-pages.component.ts | 56 ++++++++++++------- 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index c930085..536b926 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -38,9 +38,9 @@
-

Define la pregunta 1/5

+

Define la pregunta {{questions.length+1}}/5

-
+
+ + +
+ +
diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 07b2a6b..179c58d 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -15,6 +15,7 @@ interface Cell { } interface Quiz { + id: string; name: string; seniority: string; created_at: string; @@ -32,6 +33,7 @@ interface Quiz { export class AllPageComponent implements OnInit { searchText: string = ''; // Campo de búsqueda quizzes: Quiz[] = []; // Inicializa el array de quizzes + selectedQuiz: Quiz | null = null; // Define selectedQuiz aquí constructor(private router: Router) {} @@ -112,7 +114,9 @@ export class AllPageComponent implements OnInit { // Método para ver los detalles de un quiz viewQuiz(quiz: Quiz) { - alert(`Viendo el quiz: ${quiz.name}`); + this.selectedQuiz = quiz; // Establece el quiz seleccionado + // Redirige a la ruta de visualización si es necesario + this.router.navigate(['/view-quiz', quiz.id]); // Cambia según tu configuración de rutas } // Método para editar un quiz diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html new file mode 100644 index 0000000..bdc3a6a --- /dev/null +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -0,0 +1,21 @@ +
+

Detalles del Quiz: {{ quizDetails?.name }}

+
+
+

Módulo: {{ quizDetails?.cell?.module?.name }}

+

Célula: {{ quizDetails?.cell?.name }}

+

Seniority: {{ quizDetails?.seniority }}

+

Fecha de Creación: {{ quizDetails?.created_at | date:'dd-MM-yyyy' }}

+

Creador: {{ quizDetails?.created_by?.first_name }}

+

Estado: {{ quizDetails?.is_active ? 'Activo' : 'Inactivo' }}

+ + +

Preguntas:

+
    +
  • + {{ question.text }} +
    • +
+
+
+
diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.spec.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.spec.ts new file mode 100644 index 0000000..b6c90c4 --- /dev/null +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ViewQuizComponent } from './view-quiz.component'; + +describe('ViewQuizComponent', () => { + let component: ViewQuizComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ViewQuizComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ViewQuizComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts new file mode 100644 index 0000000..bab0153 --- /dev/null +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -0,0 +1,35 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +@Component({ + selector: 'app-view-quiz', + templateUrl: './view-quiz.component.html', + styleUrls: ['./view-quiz.component.scss'], +}) +export class ViewQuizComponent implements OnInit { + quizId: string = ''; // Para almacenar el ID del quiz + quizDetails: any; // Aquí se guardarán los detalles del quiz + + constructor(private route: ActivatedRoute) {} + + ngOnInit(): void { + // Obtén el ID del quiz desde la ruta + this.quizId = this.route.snapshot.paramMap.get('id') || ''; + + // Llama al método para obtener detalles del quiz + this.fetchQuizDetails(); + } + + async fetchQuizDetails() { + try { + const response = await fetch(`https://challenge-be-development-99e1.onrender.com/quiz/${this.quizId}`); + if (response.ok) { + this.quizDetails = await response.json(); + } else { + console.error('Error al obtener detalles del quiz.'); + } + } catch (error) { + console.error('Error en la solicitud:', error); + } + } +} From e593916678bb5bf89dcb890517bf1708ffb6cf38 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Thu, 17 Oct 2024 19:10:51 -0300 Subject: [PATCH 093/203] me --- .../pages/new-pages/new-pages.component.ts | 34 ++++++++++++------- .../header-page/header-page.component.html | 20 +++++------ .../header-page/header-page.component.scss | 10 +++--- 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 41114db..db8cb08 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -89,7 +89,7 @@ export class NewPagesComponent { } } - recibirDatos(datos: any): void { + async recibirDatos(datos: any) { if ( this.selectNameForm.valid && datos.celula != 'Selecciona la célula' && @@ -98,23 +98,31 @@ export class NewPagesComponent { ) { this.showButton = true; } - + + + /* modulo */ switch (datos.module) { case 'Desarrollo': this.quizData.module = 'ID DE DESARROLLO'; break; - case 'Marketing': - this.quizData.module = 'ID DE MARKETING'; - break; - case 'Sistemas': - this.quizData.module = '84c66f03-c98f-47f1-a461-589cfb3dbf1f'; - break; - } - - /* celula */ + case 'Marketing': + this.quizData.module = 'ID DE MARKETING'; + break; + case 'Sistemas': + this.quizData.module = '84c66f03-c98f-47f1-a461-589cfb3dbf1f'; + break; + } + + /* celula */ + let cell: any = await fetch('https://challenge-be-development-99e1.onrender.com/cells') + cell = await cell.json() + + const findModule = cell.find((element)=>element.name == datos.cell) + console.log(findModule) + this.quizData.cell = findModule.id - switch (datos.cell) { +/* switch (datos.cell) { case 'Diseño-UX-UI': this.quizData.cell = '97928084-2555-405c-b6fa-c8fcbd47c3d5'; break; @@ -136,7 +144,7 @@ export class NewPagesComponent { case 'Fullstack': this.quizData.cell = '6c88f9e9-ee68-423f-bbf9-cb8af183924f'; break; - } + } */ /* seniority */ if (datos.seniority) { diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index ef7abc9..1ebc034 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -24,23 +24,23 @@

Célula

>{{questionCategory?.cell}}
diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index cc7d97e..f23f529 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -136,24 +136,24 @@ h4 { white-space: nowrap; } -.Diseño-UX-UI { +.UX-UI { background-color: #ffcc00; color: #795f3a; border-radius: 10px; white-space: nowrap; } -.QA-Tester { +.QA { border-radius: 20px; background-color: #ff9500; color: #795f3a; } -.Frontend { +.frontend { border-radius: 20px; background-color: #34c759; color: #795f3a; } -.Backend { +.backend { border-radius: 20px; background-color: #00c7be; color: #795f3a; @@ -163,7 +163,7 @@ h4 { background-color: #30b0c7; color: #795f3a; } -.Scrum-Master { +.scrum { border-radius: 20px; background-color: #32ade6; color: #795f3a; From b513313b00dbc6375a9c0ac81e6b57651e886bc5 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Thu, 17 Oct 2024 22:32:17 -0500 Subject: [PATCH 094/203] configuracion front end --- package-lock.json | 4 +- package.json | 15 ++-- src/app/app-routing.module.ts | 29 +++---- src/app/modules/all/all.module.ts | 3 +- .../pages/all-page/all-page.component.html | 5 ++ .../all/pages/all-page/all-page.component.ts | 36 +++++++- .../auth-sign-in/auth-sign-in.module.ts | 4 +- .../pages/auth-page/auth-page.component.html | 42 ++++----- .../pages/auth-page/auth-page.component.scss | 57 +++++++++++-- .../pages/auth-page/auth-page.component.ts | 67 ++++++++++++++- src/app/modules/edit/edit-routing.module.ts | 4 +- src/app/modules/edit/edit.module.ts | 7 +- .../edit-pages/edit-pages.component.html | 54 ++++++++++-- .../edit-pages/edit-pages.component.scss | 85 +++++++++++++++++++ .../pages/edit-pages/edit-pages.component.ts | 68 ++++++++++++++- src/app/modules/guards/role.guard.ts | 24 ++++++ .../pages/home-page/home-page.component.scss | 31 +++++-- .../welcome-page/welcome-page.component.html | 41 +++++---- .../welcome-page/welcome-page.component.scss | 36 +++++--- .../welcome-page/welcome-page.component.ts | 36 ++++++-- .../header-page/header-page.component.ts | 2 +- .../sideBar/side-bar/side-bar.component.html | 64 ++++++++------ .../sideBar/side-bar/side-bar.component.scss | 64 ++++++++++---- .../sideBar/side-bar/side-bar.component.ts | 18 +++- src/environments/environment.ts | 6 +- 25 files changed, 627 insertions(+), 175 deletions(-) create mode 100644 src/app/modules/guards/role.guard.ts diff --git a/package-lock.json b/package-lock.json index 1bbdaef..e4648a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,8 @@ "@angular/animations": "^17.3.12", "@angular/cdk": "^17.0.2", "@angular/common": "^17.0.5", - "@angular/compiler": "^17.0.5", - "@angular/core": "^17.3.2", + "@angular/compiler": "^17.3.12", + "@angular/core": "^17.0.5", "@angular/forms": "^17.0.5", "@angular/platform-browser": "^17.0.5", "@angular/platform-browser-dynamic": "^17.0.5", diff --git a/package.json b/package.json index afa678d..4ee795c 100644 --- a/package.json +++ b/package.json @@ -14,14 +14,14 @@ "private": true, "dependencies": { "@angular/animations": "^17.3.12", - "@angular/cdk": "^17.3.12", - "@angular/common": "^17.3.12", + "@angular/cdk": "^17.0.2", + "@angular/common": "^17.0.5", "@angular/compiler": "^17.3.12", - "@angular/core": "^17.3.12", - "@angular/forms": "^17.3.12", - "@angular/platform-browser": "^17.3.12", - "@angular/platform-browser-dynamic": "^17.3.12", - "@angular/router": "^17.3.12", + "@angular/core": "^17.0.5", + "@angular/forms": "^17.0.5", + "@angular/platform-browser": "^17.0.5", + "@angular/platform-browser-dynamic": "^17.0.5", + "@angular/router": "^17.0.5", "@auth0/auth0-angular": "^2.2.3", "auth0": "^4.7.0", "bootstrap": "^5.3.0", @@ -34,7 +34,6 @@ "tslib": "^2.5.0", "zone.js": "~0.14.0" }, - "devDependencies": { "@angular-devkit/build-angular": "^17.0.5", "@angular-eslint/builder": "17.5.1", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7b53c01..64953c0 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,38 +3,29 @@ import { NgModule } from '@angular/core'; import { AppLayoutComponent } from './layout/app.layout.component'; import { AuthPageComponent } from './modules/auth/pages/auth-page/auth-page.component'; - - - import { AuthSignInPageComponent } from './modules/auth-sign-in/pages/auth-sign-in-page/auth-sign-in-page.component'; import { HomePageComponent } from './modules/home/pages/home-page/home-page.component'; +import { AuthGuard } from '@auth0/auth0-angular'; +import { RoleGuard } from '../app/modules/guards/role.guard'; // Importa el guardia de roles +import { EditPagesComponent } from './modules/edit/pages/edit-pages/edit-pages.component'; @NgModule({ imports: [ RouterModule.forRoot( [ -/* { - path: '', - component: AppLayoutComponent, - children: [ - { - path: '', - loadChildren: () => - import('./demo/components/dashboard/routes').then( - m => m.DASHBOARD_ROUTES - ), - }, - ], - }, */ { - path: '', + path: 'home', component: HomePageComponent, + canActivate: [AuthGuard,RoleGuard], + data: { expectedRole: 'admin' }, loadChildren: () => import('./modules/home/home.module').then(m => m.HomeModule), }, + // { path: 'edit', component: EditPagesComponent }, + // { path: 'edit/:name', component: EditPagesComponent }, { - path: 'login', - /* component: AuthPageComponent, */ + path: '', + component: AuthPageComponent, loadChildren: () => import('./modules/auth/auth.module').then(m => m.AuthModule), }, diff --git a/src/app/modules/all/all.module.ts b/src/app/modules/all/all.module.ts index d53286f..81422a0 100644 --- a/src/app/modules/all/all.module.ts +++ b/src/app/modules/all/all.module.ts @@ -4,9 +4,10 @@ import { AllPageComponent } from './pages/all-page/all-page.component'; import { AllRoutingModule } from './all-routing.module'; import { FormsModule } from '@angular/forms'; import { HeaderFormModule } from 'src/app/shared/components/header-form/header-form.module'; +import { EditModule } from '../edit/edit.module'; @NgModule({ declarations: [AllPageComponent], - imports: [CommonModule, AllRoutingModule, FormsModule, HeaderFormModule], + imports: [CommonModule, AllRoutingModule, FormsModule, HeaderFormModule,EditModule], exports: [AllPageComponent] }) export class AllModule {} diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 61bfb32..7324647 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -50,4 +50,9 @@

Todos los Quiz

+ + +
+ +
diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index d00e682..153f132 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { trigger, style, transition, animate, state } from '@angular/animations'; +import { Output, EventEmitter } from '@angular/core'; interface User { first_name: string; @@ -27,12 +29,24 @@ interface Quiz { selector: 'app-all-page', templateUrl: './all-page.component.html', styleUrls: ['./all-page.component.scss'], // Cambiado a styleUrls para usar un array + + animations: [ + trigger('expandState3', [ + state('collapsed', style({ display: 'none' })), + state('expanded', style({ maxWidth: '150vh' })), + transition('collapsed => expanded', [animate('300ms ease-out')]), + transition('expanded => collapsed', [animate('300ms ease-in')]), + ]), + ], }) export class AllPageComponent implements OnInit { + @Output() quizSelected = new EventEmitter(); searchText: string = ''; // Campo de búsqueda quizzes: Quiz[] = []; // Inicializa el array de quizzes + selectedQuiz: any; constructor(private router: Router) { } + ngOnInit(): void { // Llama al método para obtener todos los quizzes al iniciar el componente @@ -106,10 +120,10 @@ export class AllPageComponent implements OnInit { } // Método para editar un quiz - editQuiz(quiz: Quiz) { - alert(`Editando el quiz: ${quiz.name}`); - this.router.navigate(['/edit', quiz.name]); // Redirigir al editar usando el nombre del quiz - } + // editQuiz(quiz: Quiz) { + // alert(`Editando el quiz: ${quiz.name}`); + // this.router.navigate(['/edit', quiz.name]); // Redirigir al editar usando el nombre del quiz + // } // Método para eliminar un quiz deleteQuiz(quiz: Quiz) { @@ -118,4 +132,18 @@ export class AllPageComponent implements OnInit { this.quizzes = this.quizzes.filter(q => q !== quiz); } } + + isExpanded3: boolean = false; + showEdit: boolean = false; + + + editQuiz(quiz: any) { + this.selectedQuiz = quiz; // Almacena el quiz seleccionado para editar + this.quizSelected.emit(quiz); // Expande la columna de edición + } + + // Cuando se cierra la edición + closeEdit() { + this.isExpanded3 = false; // Oculta la columna de edición + } } diff --git a/src/app/modules/auth-sign-in/auth-sign-in.module.ts b/src/app/modules/auth-sign-in/auth-sign-in.module.ts index 6f3321d..81015e9 100644 --- a/src/app/modules/auth-sign-in/auth-sign-in.module.ts +++ b/src/app/modules/auth-sign-in/auth-sign-in.module.ts @@ -1,14 +1,14 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { Router } from '@angular/router'; -import { AuthSignInRoutingModule } from './auth-sign-in-routing.module'; @NgModule({ declarations: [], imports: [ CommonModule, - AuthSignInRoutingModule + ] }) export class AuthSignInModule { } diff --git a/src/app/modules/auth/pages/auth-page/auth-page.component.html b/src/app/modules/auth/pages/auth-page/auth-page.component.html index 7fe2fcf..4b8d4d7 100644 --- a/src/app/modules/auth/pages/auth-page/auth-page.component.html +++ b/src/app/modules/auth/pages/auth-page/auth-page.component.html @@ -1,22 +1,26 @@ -
-
- -
-

Registrate para comenzar la aventura

-
-
- + +
+
+ logo
-
- +

Regístrate para comenzar la aventura

+
+
+ +
+
+ +
+
- - + o + + ¿Ya tienes una cuenta? Inicia sesión
- o - - Ya tiene una cuenta? Inicia sesion -
+ diff --git a/src/app/modules/auth/pages/auth-page/auth-page.component.scss b/src/app/modules/auth/pages/auth-page/auth-page.component.scss index eb99d39..fe4da90 100644 --- a/src/app/modules/auth/pages/auth-page/auth-page.component.scss +++ b/src/app/modules/auth/pages/auth-page/auth-page.component.scss @@ -1,10 +1,53 @@ -.input-w input { - background-color: white; - border: none; - border-radius: 8px; +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + background: linear-gradient(#4f2a40, #302151); } +img { + width: 100%; + max-width: 200px; + height: auto; +} + +.input-w input { + width: 100%; + padding: 10px; + background-color: white; + border: none; + border-radius: 8px; + color: rgb(40, 39, 39); +} +::placeholder{ + color: grey; +} .btn-li { - border-radius: 18px; - font-size: 10px; -} \ No newline at end of file + border-radius: 25px; + font-size: 15px; + font-weight: 600; + height: 50px; +} +.btn-google { + background-color: black; + color:white; + border-radius: 18px; + font-size: 10px; + padding: 10px 20px; + border: 1px solid white;; + cursor: pointer; + +} + +@media (max-width: 576px) { + h2 { + font-size: 18px; + } + + .btn-li { + font-size: 12px; + } +} diff --git a/src/app/modules/auth/pages/auth-page/auth-page.component.ts b/src/app/modules/auth/pages/auth-page/auth-page.component.ts index 3274954..3bf3a7d 100644 --- a/src/app/modules/auth/pages/auth-page/auth-page.component.ts +++ b/src/app/modules/auth/pages/auth-page/auth-page.component.ts @@ -1,10 +1,75 @@ import { Component } from '@angular/core'; +import { AuthService } from '@auth0/auth0-angular'; +import { Router } from '@angular/router'; @Component({ selector: 'app-auth-page', templateUrl: './auth-page.component.html', - styleUrl: './auth-page.component.scss' + styleUrls: ['./auth-page.component.scss'] }) export class AuthPageComponent { + constructor(private auth: AuthService, private router: Router) {} + login() { + this.auth.loginWithPopup().subscribe({ + next: () => { + this.auth.user$.subscribe(usuario => { + console.log('Usuario:', usuario); + if (usuario) { + const roles = usuario['https://miaplicacion.com/roles']; + console.log('Roles:', roles); + if (!roles || !roles.includes('admin')) { + const userData = { + email: usuario.email, + first_name: usuario.given_name, + last_name: usuario.family_name, + photo: usuario.picture, + phone_number: '', + timezone: '', + gender: '', + password: 'defaultPassword', + }; + + fetch('http://localhost:3000/user', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(userData), + }).then(response => { + if (response.ok) { + console.log('Usuario registrado exitosamente'); + this.handleUserRedirection(usuario); + } else { + response.json().then(data => { + if (data.user) { + this.handleUserRedirection(data.user); + } else { + console.error('Error al registrar el usuario'); + } + }); + } + }).catch(error => { + console.error('Error en la solicitud:', error); + }); + } else { + this.router.navigate(['/home']); + } + } + }); + }, + error: (error) => { + console.error('Error en el inicio de sesión:', error); + } + }); + } + + private handleUserRedirection(user: any) { + const roles = user['https://miaplicacion.com/roles']; + if (roles && roles.includes('admin')) { + this.router.navigate(['/home']); + } else { + this.router.navigate(['/sign-in']); + } + } } diff --git a/src/app/modules/edit/edit-routing.module.ts b/src/app/modules/edit/edit-routing.module.ts index 6a6e5d4..a03fe70 100644 --- a/src/app/modules/edit/edit-routing.module.ts +++ b/src/app/modules/edit/edit-routing.module.ts @@ -1,7 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -const routes: Routes = []; +const routes: Routes = [ + +]; @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/modules/edit/edit.module.ts b/src/app/modules/edit/edit.module.ts index 968c660..b53d1b3 100644 --- a/src/app/modules/edit/edit.module.ts +++ b/src/app/modules/edit/edit.module.ts @@ -1,12 +1,15 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { HeaderFormModule } from 'src/app/shared/components/header-form/header-form.module'; import { EditRoutingModule } from './edit-routing.module'; import { EditPagesComponent } from './pages/edit-pages/edit-pages.component'; +import { FormsModule } from '@angular/forms'; +import { ReactiveFormsModule } from '@angular/forms'; + @NgModule({ declarations: [EditPagesComponent], - imports: [CommonModule, EditRoutingModule], + imports: [CommonModule, EditRoutingModule, HeaderFormModule,FormsModule,ReactiveFormsModule], exports: [EditPagesComponent], }) export class EditModule {} diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index eaac0fe..c7bb56a 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -1,8 +1,48 @@ -

Soy el edit page

-
-

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione tempore - aliquam, ut veniam labore expedita officia sunt illum sit molestias - quisquam, unde molestiae nam ab recusandae iure, voluptatum quia odio. -

+
+
+ + volver al listado + +
+

{{quiz.name}}

+ +
+
+ +
+ + +
+

Preguntas del Quiz

+
+ + + +
+
+ Verdadero + Falso +
+
+
+ + {{ option.text }} +
+
+
+
+
+ + +
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss index e69de29..24b75a7 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss @@ -0,0 +1,85 @@ +.body { + display: flex; + flex-direction: column; + justify-content: center; + background-color: #1e1e1e; + height: 100vh; + } + +.fa-solid { + width: 30px; + height: 30px; + padding: 6px 0px; + border-radius: 15px; + text-align: center; + font-size: 12px; + line-height: 1.42857; +} + +a { + text-decoration: none; + color: white; + transition: .3s ease-in-out; + + &:hover { + color: darkviolet; + cursor: pointer; + } +} + +.tittle { + display: flex; + flex-wrap: nowrap; + align-items: center; + justify-content: space-between; + margin-right: 40%; + margin-top: 1%; + margin-left: 3%; + margin-bottom: 1%; +} + +.content-1 { + width: 100%; + height: 100%; + background-image: url('../../../../../assets/layout/images/logo.svg'); + background-repeat: no-repeat; + background-position: center; + background-size: 414px 404px; + background-color: #353434; + border-radius: 15px; + padding: 20px; // Asegúrate de tener espacio interno +} + +.question { + display: flex; + flex-direction: column; // Organiza preguntas de manera vertical + margin-bottom: 10px; // Espacio entre preguntas +} + +input[type="text"], .custom-option-input { + padding: 10px; // Espacio interno + margin-top: 5px; // Espacio encima del input + border: 1px solid #ccc; // Borde suave + border-radius: 5px; // Bordes redondeados + width: 100%; // Ancho completo +} + +.btn-primary { + background-color: #007bff; // Color de fondo + color: white; // Color de texto + padding: 10px 15px; // Espaciado interno + border: none; // Sin borde +} +.quiz-name-input { + font-size: 24px; // Aumentar el tamaño del texto + background-color: transparent; // Fondo transparente + color: white; // Color del texto + border: none; // Sin borde + border-bottom: 2px solid #ccc; // Borde inferior + outline: none; // Sin borde al hacer clic + width: 200px; // Ancho ajustable +} + +.quiz-name-input:focus { + border-bottom-color: darkviolet; // Cambiar color al enfocar +} \ No newline at end of file diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts index 69e0121..1a5fce7 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts @@ -1,10 +1,11 @@ -import { Component } from '@angular/core'; +import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { FormBuilder, FormGroup, FormArray } from '@angular/forms'; import { trigger, style, transition, animate, state } from '@angular/animations'; @Component({ selector: 'app-edit-pages', templateUrl: './edit-pages.component.html', - styleUrl: './edit-pages.component.scss', + styleUrls: ['./edit-pages.component.scss'], animations: [ trigger('enterState', [ state('void', style({ @@ -18,4 +19,65 @@ import { trigger, style, transition, animate, state } from '@angular/animations' ]) ] }) -export class EditPagesComponent {} +export class EditPagesComponent { + @Input() quiz: { name: string; questions: any[]; modulo: any; celula: any; seniority: any }; + @Output() close = new EventEmitter(); + + isEditing:boolean = false; + selectNameForm: FormGroup; + questionCategory: any; + showButton = false; + constructor(private formBuilder: FormBuilder) { + this.selectNameForm = this.formBuilder.group({ + name: [''] + }); + } + + ngOnInit() { + // this.selectNameForm.patchValue({ + // name: this.quiz.name, + // }); + + this.populateQuestions(this.quiz.questions); + this.questionCategory = { + modulo: this.quiz.modulo || '', + celula: this.quiz.celula || '', + seniority: this.quiz.seniority || '' + }; + } + + private populateQuestions(questions: any[]) { + this.questionCategory.questions = this.formBuilder.array(questions.map(question => { + return this.formBuilder.group({ + text: [question.text], + type: [question.type], + options: this.formBuilder.array(question.options.map(option => this.formBuilder.group({ + text: [option.text], + selected: [option.selected || false] + }))) + }); + })); + } + + get questions(): FormArray { + return this.questionCategory.questions as FormArray; + } + + createQuiz() { + const updatedQuiz = { + ...this.quiz, + name: this.selectNameForm.value.name, + questions: this.questions.value, + modulo: this.questionCategory.modulo, + celula: this.questionCategory.celula, + seniority: this.questionCategory.seniority, + }; + + console.log('Cambios guardados para el quiz:', updatedQuiz); + this.close.emit(); // Emitir evento para cerrar + } + + recibirDatos(event: any) { + console.log('Datos recibidos:', event); + } +} diff --git a/src/app/modules/guards/role.guard.ts b/src/app/modules/guards/role.guard.ts new file mode 100644 index 0000000..a0b84a1 --- /dev/null +++ b/src/app/modules/guards/role.guard.ts @@ -0,0 +1,24 @@ +import { Injectable } from '@angular/core'; +import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; +import { AuthService } from '@auth0/auth0-angular'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; + +@Injectable({ + providedIn: 'root', +}) +export class RoleGuard implements CanActivate { + constructor(private auth: AuthService) {} + + canActivate( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable { + return this.auth.user$.pipe( + map(user => { + const roles = user['https://miaplicacion.com/roles']; + return roles && roles.includes('admin'); + }) + ); + } +} diff --git a/src/app/modules/home/pages/home-page/home-page.component.scss b/src/app/modules/home/pages/home-page/home-page.component.scss index 96b0d81..fbb5c05 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.scss +++ b/src/app/modules/home/pages/home-page/home-page.component.scss @@ -3,20 +3,33 @@ margin: 0; } +.container-fluid { + background-color: #121212; + min-height: 100vh; + display: flex; + /* Asegura que los elementos ocupen el alto completo */ +} + .sidebar-container { - background: #212121; + // background: #212121; box-shadow: 0px 4px 4px 0px #00000040; - height: 95vh; - width: 28vh; + height: 100vh; + width: 250px; /* Ancho fijo para pantallas grandes */ border-radius: 0px 12px 12px 0px; - padding: 24px 8px 8px 8px; + z-index: 9999; + + transition: width 0.3s ease; /* Suaviza la transición */ } -.container-fluid { - background-color: #121212; - min-height: 100vh; - display: flex; - align-items: center; +@media (max-width: 767px) { + .sidebar-container { + width: auto; /* Ancho del sidebar en pantallas pequeñas */ + height: auto; /* Permite que la altura se ajuste al contenido */ + } + + router-outlet { + margin-top: 20px; /* Agrega margen superior si el sidebar se oculta */ + } } diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index b7e6daa..7a97804 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -2,6 +2,20 @@
+ +
+ +
+ + +
+ +
-
- +
+
-
- - -
+ +
-
- +
+
- - - -
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index dffab43..5efa048 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -1,7 +1,7 @@ .active-column, .column-tasks { width: 9vh; - height: 95vh; + height: 100vh; border-radius: 12px; padding: 1.5rem 2rem 2rem 2rem; background-color: #212121; @@ -9,15 +9,16 @@ align-items: start; justify-content: center; gap: 3px; - box-shadow: - 0px 4px 4px 0px #718ee3, - 0px 4px 4px 0px #00000040; + box-shadow: 0px 4px 4px 0px #718ee3, 0px 4px 4px 0px #00000040; + + @media (max-width: 768px) { + width: 20vh; // Ajusta el ancho para pantallas pequeñas + height: auto; // Permite que la altura se ajuste según el contenido + } } .active-column { - box-shadow: - 0px 4px 4px 0px #ff5ea6, - 0px 4px 4px 0px #00000040; + box-shadow: 0px 4px 4px 0px #ff5ea6, 0px 4px 4px 0px #00000040; } .column-btn { @@ -31,9 +32,7 @@ -webkit-text-fill-color: transparent; font-family: 'Poppins', sans-serif; font-weight: 700; - font-style: normal; font-size: 13px; - block-size: 700; position: relative; } @@ -44,7 +43,6 @@ bottom: -3px; width: 100%; height: 3px; - border: 0px 0px 3px 0px solid; background: linear-gradient(to right, #ff5ea6, #446bdb); border-radius: 0 0 10px 10px; } @@ -54,9 +52,13 @@ height: 3rem; border-radius: 8px; padding: 8px; - gap: 8px; background: linear-gradient(to right, #6a5fff80, #ff5ea680); border: none; + + @media (max-width: 768px) { + width: 2.5rem; // Ajusta el tamaño del botón para pantallas pequeñas + height: 2.5rem; + } } .circle { @@ -75,15 +77,21 @@ } .wall { - height: 95vh; - width: 170vh; + height: 100%; + width: 100%; // Cambia a 100% para que se ajuste a la pantalla + display: flex; - /* flex-direction: row-reverse; */ justify-content: space-between; background-image: url('../../../../../assets/layout/images/logo.svg'); background-repeat: no-repeat; background-position: center; background-size: 414px 404px; + + @media (max-width: 768px) { + flex-direction: column; // Cambia la dirección en pantallas pequeñas + align-items: center; // Centra los elementos + height: auto; // Permite que la altura se ajuste según el contenido + } } .order-item { diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index 8dc8cda..71d73c9 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -11,7 +11,7 @@ import { @Component({ selector: 'app-welcome-page', templateUrl: './welcome-page.component.html', - styleUrl: './welcome-page.component.scss', + styleUrls: ['./welcome-page.component.scss'], animations: [ trigger('expandState1', [ state( @@ -33,8 +33,7 @@ import { state( 'collapsed', style({ - width: "0px", - + width: '0px', }) ), state( @@ -66,9 +65,11 @@ import { }) export class WelcomePageComponent { constructor(private router: Router) {} - isExpanded1 = false; - isExpanded2 = false; - isExpanded3 = false; + + isExpanded1 = false; // Controla la expansión de la columna de "Todos" + isExpanded2 = false; // Controla la expansión de la columna de "Nuevo" + isExpanded3 = false; // Controla la expansión de la columna de "Editar" + selectedQuiz: any = null; // Almacena el quiz seleccionado toggleExpand1() { this.isExpanded1 = !this.isExpanded1; @@ -83,17 +84,34 @@ export class WelcomePageComponent { } toggleExpand3() { - this.isExpanded1 = !this.isExpanded3; - this.isExpanded2 = false; - this.isExpanded3 = false; + this.isExpanded3 = !this.isExpanded3; // Cambia el estado de expansión } + + // Navegación existente goToAll() { this.router.navigate(['/all']); } + goToCreate() { this.router.navigate(['/create']); } + goToEdit() { this.router.navigate(['/edit']); } + + // Método para recibir el quiz seleccionado desde 'all-page' + onQuizSelected(quiz: any) { + this.selectedQuiz = quiz; + this.isExpanded3 = true; // Expande la columna de edición + this.isExpanded1 = false; // Colapsa la columna de "Todos" + this.isExpanded2 = false; // Colapsa la columna de "Nuevo" + } + + // Método para cerrar la edición + closeEdit() { + this.isExpanded3 = false; // Colapsa la columna de edición + this.selectedQuiz = null; + this.toggleExpand1(); // Limpia el quiz seleccionado + } } diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index e1f7ff5..c5b6808 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -7,7 +7,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; styleUrl: './header-page.component.scss', }) export class HeaderPageComponent { - @Output() datosParaPadre = new EventEmitter(); + @Output() datosParaPadre = new EventEmitter();// cambie a any public selectHeaderForm: FormGroup; constructor(private formsBuilder: FormBuilder) {} diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index a6975a4..7a0cb7f 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -1,36 +1,48 @@ + + + -
- logo -
+
+
+ logo +
-
-
-
- -
+
+
+
+ +
-
- +
+ +
+ +
+ +
-
+
+
- -
- -
diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss index 1867715..bfb2436 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss @@ -1,46 +1,71 @@ -/* agregado */ +.toggle-sidebar { + position: fixed; + top: 20px; + left: 20px; + background-color: #5f5f5f; + border: none; + border-radius: 5px; + padding: 10px; + color: white; + cursor: pointer; + z-index: 1000; + + i { + font-size: 1.5rem; + } +} + +.sidebar { + width: 250px; // Ancho del sidebar + height: 100%; + background-color: #212121; + position: fixed; + top: 0; + + transition: left 0.5s ease; + + &.active { + left: 0; // Muestra el sidebar + } +} .sidebar-btns-container { display: flex; flex-direction: column; justify-content: space-between; align-items: center; - /* background-color: red; */ height: 75%; } .gestion-btns { - width: 23vh; - height: 17vh; + width: 100%; display: flex; flex-direction: column; justify-content: space-between; } -.config-btn{ - width: 23vh; + +.config-btn { + width: 100%; } .sidebar-btns { background-color: #5f5f5f; - width: 100%; + width: 95%; height: 4.5vh; border-radius: 10px; - padding: 0px 16px 0px 16px; + padding: 0px 16px; gap: 16px; border: solid 1px #333232; display: flex; justify-content: flex-start; align-items: center; + margin: 8px; } .sidebar-font-btn { font-family: 'Poppins', sans-serif; font-weight: 400; - font-style: normal; font-size: 10px; - display: flex; - justify-content: start; - align-items: flex-start; } .sidebar-btns:hover, @@ -48,14 +73,23 @@ background-color: #1b1b1bb2; } -.side-img { +.side-img { height: 88px; - display: flex ; + display: flex; justify-content: center; - } .sidebar-btns i { color: #5974c7; font-size: 11.5px; } + +@media (max-width: 767px) { + .sidebar { + left: -999px; + width: 80%; + } + .sidebar-btns{ + height: 7vh; + } +} diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts index ad164bc..a2cf919 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { AuthService } from '@auth0/auth0-angular'; @Component({ selector: 'app-side-bar', @@ -6,5 +7,20 @@ import { Component } from '@angular/core'; styleUrl: './side-bar.component.scss' }) export class SideBarComponent { + isSidebarOpen = false; + private authService: AuthService; // Add this line -} + constructor(authService: AuthService) { + this.authService = authService; // Initialize the property here + } + + toggleSidebar() { + this.isSidebarOpen = !this.isSidebarOpen; + } + + logout() { + this.authService.logout().subscribe(() => { + window.location.href = ''; // Redirect to the login page + }); + } +} \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 9afbc2e..032001e 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,10 +1,10 @@ export const environment = { production: false, auth: { - domain: "dev-anq6akqu2adna18f.us.auth0.com", - clientId: "39vYLqvEh62Wl28SMo9UfkM3OtHl5iOB", + domain: "dev-hwbroc2d1yqqr04v.us.auth0.com", + clientId: "TTVpH09MQpHbU6oHQjXAVt4I66h9f2Hk", authorizationParams: { - audience: 'https://trainIT', + audience: 'https://api.miaplicacion.com', redirect_uri: 'http://localhost:4200' } } From cf2f50100b853677c8d6c107c56f0ebb69fd1744 Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Fri, 18 Oct 2024 08:52:30 -0300 Subject: [PATCH 095/203] logical correction of view-quiz --- src/app/modules/all/all.module.ts | 11 +++++- .../all/pages/all-page/all-page.component.ts | 8 ++-- .../pages/view-quiz/view-quiz.component.html | 6 +-- .../pages/view-quiz/view-quiz.component.ts | 37 +++++++++++++++++-- 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/src/app/modules/all/all.module.ts b/src/app/modules/all/all.module.ts index 9f8696c..e043e80 100644 --- a/src/app/modules/all/all.module.ts +++ b/src/app/modules/all/all.module.ts @@ -3,9 +3,17 @@ import { CommonModule } from '@angular/common'; import { AllPageComponent } from './pages/all-page/all-page.component'; import { ViewQuizComponent } from './pages/view-quiz/view-quiz.component'; // Asegúrate de importar el componente import { AllRoutingModule } from './all-routing.module'; +import { RouterModule, Routes } from '@angular/router'; import { FormsModule } from '@angular/forms'; import { HeaderFormModule } from 'src/app/shared/components/header-form/header-form.module'; +const routes: Routes = [ + { + path: 'view-quiz/:id', // Define la ruta con el parámetro 'id' + component: ViewQuizComponent + }, +]; + @NgModule({ declarations: [ AllPageComponent, @@ -15,7 +23,8 @@ import { HeaderFormModule } from 'src/app/shared/components/header-form/header-f CommonModule, AllRoutingModule, FormsModule, - HeaderFormModule + HeaderFormModule, + RouterModule.forChild(routes) // Cambia forRoot por forChild ], exports: [ AllPageComponent, diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 179c58d..c1b4995 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -112,11 +112,11 @@ export class AllPageComponent implements OnInit { } } - // Método para ver los detalles de un quiz + viewQuiz(quiz: Quiz) { - this.selectedQuiz = quiz; // Establece el quiz seleccionado - // Redirige a la ruta de visualización si es necesario - this.router.navigate(['/view-quiz', quiz.id]); // Cambia según tu configuración de rutas + this.selectedQuiz = quiz; + + this.router.navigate(['/view-quiz', quiz.id]); } // Método para editar un quiz diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index bdc3a6a..c676c33 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -12,9 +12,9 @@

Detalles del Quiz: {{ quizDetails?.name }}

- {{ question.text }} - + +
diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index bab0153..1a7f55f 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -1,6 +1,29 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +interface User { + first_name: string; +} + +interface Module { + name: string; +} + +interface Cell { + name: string; +} + +interface Quiz { + id: string; + name: string; + seniority: string; + created_at: string; + created_by: User; + module: Module; + cell: Cell; + is_active: boolean; +} + @Component({ selector: 'app-view-quiz', templateUrl: './view-quiz.component.html', @@ -8,7 +31,7 @@ import { ActivatedRoute } from '@angular/router'; }) export class ViewQuizComponent implements OnInit { quizId: string = ''; // Para almacenar el ID del quiz - quizDetails: any; // Aquí se guardarán los detalles del quiz + quizDetails: Quiz | null = null; // Aquí se guardarán los detalles del quiz usando la interfaz constructor(private route: ActivatedRoute) {} @@ -16,17 +39,25 @@ export class ViewQuizComponent implements OnInit { // Obtén el ID del quiz desde la ruta this.quizId = this.route.snapshot.paramMap.get('id') || ''; + // Asegúrate de que el quizId no tenga comillas + this.quizId = this.quizId.replace(/['"]+/g, ''); + + console.log('ID del quiz sin comillas:', this.quizId); // Verifica si el ID es correcto + // Llama al método para obtener detalles del quiz this.fetchQuizDetails(); } async fetchQuizDetails() { try { + console.log(`Realizando solicitud a la API con ID: ${this.quizId}`); // Log para verificar el endpoint const response = await fetch(`https://challenge-be-development-99e1.onrender.com/quiz/${this.quizId}`); if (response.ok) { - this.quizDetails = await response.json(); + const data: Quiz = await response.json(); + this.quizDetails = data; + console.log('Detalles del quiz:', this.quizDetails); // Verifica si los datos son correctos } else { - console.error('Error al obtener detalles del quiz.'); + console.error('Error al obtener detalles del quiz, respuesta no OK.'); } } catch (error) { console.error('Error en la solicitud:', error); From 2650558f8d5bea16113d3e7c432677781fa2c01c Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Fri, 18 Oct 2024 18:19:27 -0300 Subject: [PATCH 096/203] =?UTF-8?q?Correcciones=20view-quiz=20para=20ma?= =?UTF-8?q?=C3=B1ana=20listo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/view-quiz/view-quiz.component.html | 37 ++++++++++++------- .../pages/view-quiz/view-quiz.component.scss | 25 +++++++++++++ .../pages/view-quiz/view-quiz.component.ts | 12 ++++++ 3 files changed, 61 insertions(+), 13 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index c676c33..60697eb 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,21 +1,32 @@
-

Detalles del Quiz: {{ quizDetails?.name }}

+

Detalles del Quiz: {{ quizDetails?.name }}

-
-

Módulo: {{ quizDetails?.cell?.module?.name }}

-

Célula: {{ quizDetails?.cell?.name }}

-

Seniority: {{ quizDetails?.seniority }}

-

Fecha de Creación: {{ quizDetails?.created_at | date:'dd-MM-yyyy' }}

-

Creador: {{ quizDetails?.created_by?.first_name }}

-

Estado: {{ quizDetails?.is_active ? 'Activo' : 'Inactivo' }}

+
+
+

Módulo: {{ quizDetails?.cell?.module?.name }}

+

Célula: {{ quizDetails?.cell?.name }}

+

Seniority: {{ quizDetails?.seniority }}

+
-

Preguntas:

-
    - - +
      +
    • +

      Pregunta: {{ question.question }}

      +

      Opciones:

      +
        +
      • + {{ option }} +
        • +
      +

      Tipo: {{ question.type }}

      +

      Explicación: {{ question.explanation }}

      + +
    + + +

    No hay preguntas disponibles para este quiz.

    +
diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index e69de29..9a4f871 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -0,0 +1,25 @@ +.contenedor{ + width: 100vw; /* 100% del ancho de la ventana */ + height: 100vh; /* 100% del alto de la ventana */ + display: flex; /* Esto es opcional, pero útil si quieres centrar el contenido */ + justify-content: center; /* Centrar horizontalmente */ + align-items: center; /* Centrar verticalmente */ + margin: 0; + padding: 0; + +} +.container-sup{ + width: 38vh; + height: 4.5vh; + background-color: #202020; + border: none; + border-radius: 0.5rem; + display: flex; + justify-content: flex-start; + align-items: center; + padding: 0.2rem 0.2rem 0.2rem 0.7rem; + font-size: 12px; + color: rgb(142, 142, 142); + font-style: Poppins; + font-weight: 400; +} \ No newline at end of file diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index 1a7f55f..6cb81a0 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -22,7 +22,19 @@ interface Quiz { module: Module; cell: Cell; is_active: boolean; + questions: Question[]; } +interface Question { + id: string; + question: string; + options: string[]; + correct_option: number[]; + explanation: string; + link: string; + type: string; + is_active: boolean; +} + @Component({ selector: 'app-view-quiz', From 37a09cf6f0f4a5d8decf3b14dd7201ea12b66bba Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 19 Oct 2024 11:19:19 -0300 Subject: [PATCH 097/203] merge --- .../pages/new-pages/new-pages.component.ts | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index db8cb08..41114db 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -89,7 +89,7 @@ export class NewPagesComponent { } } - async recibirDatos(datos: any) { + recibirDatos(datos: any): void { if ( this.selectNameForm.valid && datos.celula != 'Selecciona la célula' && @@ -98,31 +98,23 @@ export class NewPagesComponent { ) { this.showButton = true; } - - - + /* modulo */ switch (datos.module) { case 'Desarrollo': this.quizData.module = 'ID DE DESARROLLO'; break; - case 'Marketing': - this.quizData.module = 'ID DE MARKETING'; - break; - case 'Sistemas': - this.quizData.module = '84c66f03-c98f-47f1-a461-589cfb3dbf1f'; - break; - } - - /* celula */ - let cell: any = await fetch('https://challenge-be-development-99e1.onrender.com/cells') - cell = await cell.json() - - const findModule = cell.find((element)=>element.name == datos.cell) - console.log(findModule) - this.quizData.cell = findModule.id + case 'Marketing': + this.quizData.module = 'ID DE MARKETING'; + break; + case 'Sistemas': + this.quizData.module = '84c66f03-c98f-47f1-a461-589cfb3dbf1f'; + break; + } -/* switch (datos.cell) { + /* celula */ + + switch (datos.cell) { case 'Diseño-UX-UI': this.quizData.cell = '97928084-2555-405c-b6fa-c8fcbd47c3d5'; break; @@ -144,7 +136,7 @@ export class NewPagesComponent { case 'Fullstack': this.quizData.cell = '6c88f9e9-ee68-423f-bbf9-cb8af183924f'; break; - } */ + } /* seniority */ if (datos.seniority) { From 42a78de30f76f21375876dd5bb3d21d25cbebf48 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 19 Oct 2024 12:35:03 -0300 Subject: [PATCH 098/203] logica --- .../new/pages/new-pages/new-pages.component.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 41114db..2ebae2d 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -89,7 +89,7 @@ export class NewPagesComponent { } } - recibirDatos(datos: any): void { + async recibirDatos(datos: any) { if ( this.selectNameForm.valid && datos.celula != 'Selecciona la célula' && @@ -114,7 +114,15 @@ export class NewPagesComponent { /* celula */ - switch (datos.cell) { + let response: any = await fetch('https://challenge-be-development-99e1.onrender.com/cells') + response = await response.json() + + response = response.find((element)=>datos.cell == element.name) + + + response ? this.quizData.cell = response.id : '' + console.log(this.quizData) +/* switch (datos.cell) { case 'Diseño-UX-UI': this.quizData.cell = '97928084-2555-405c-b6fa-c8fcbd47c3d5'; break; @@ -136,7 +144,7 @@ export class NewPagesComponent { case 'Fullstack': this.quizData.cell = '6c88f9e9-ee68-423f-bbf9-cb8af183924f'; break; - } + } */ /* seniority */ if (datos.seniority) { From f538d05a5c2804e0278cc27fce4c740f2707e725 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Sat, 19 Oct 2024 16:38:44 -0300 Subject: [PATCH 099/203] co --- .../new/pages/new-pages/new-pages.component.ts | 14 +++++++++----- src/environments/environment.ts | 7 ++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 2ebae2d..019c278 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import {environment} from '../../../../../environments/environment' @Component({ selector: 'app-new-pages', @@ -13,6 +14,8 @@ export class NewPagesComponent { description: ['', Validators.required], }); + + isFieldInvalid(field: string): boolean { const control = this.selectNameForm.get(field); return control?.invalid && (control.dirty || control.touched); @@ -114,7 +117,7 @@ export class NewPagesComponent { /* celula */ - let response: any = await fetch('https://challenge-be-development-99e1.onrender.com/cells') + let response: any = await fetch(`${environment.url}/cells`) response = await response.json() response = response.find((element)=>datos.cell == element.name) @@ -150,7 +153,7 @@ export class NewPagesComponent { if (datos.seniority) { this.quizData.seniority = datos.seniority; } - console.log(this.quizData); + } async createQuiz() { try { @@ -171,7 +174,7 @@ export class NewPagesComponent { is_active: true, }; const response = await fetch( - 'https://challenge-be-development-99e1.onrender.com/quiz', + `${environment.url}/quiz`, { method: 'POST', headers: { @@ -228,12 +231,12 @@ export class NewPagesComponent { quiz_id: this.quizID, }; if (this.questions.length <= 10) { - this.questions.push(formSection); + console.log(form.value); /* this.onQuestionTypeChange('otro', 0); */ const response = await fetch( - 'https://challenge-be-development-99e1.onrender.com/question', + `${environment.url}/question`, { method: 'POST', headers: { @@ -249,6 +252,7 @@ export class NewPagesComponent { alert(response.status); throw new Error(`Error: ${response.status}`); } + this.questions.push(formSection); console.log(data); form.reset(); this.options = []; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 032001e..de15ca9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,7 +5,8 @@ export const environment = { clientId: "TTVpH09MQpHbU6oHQjXAVt4I66h9f2Hk", authorizationParams: { audience: 'https://api.miaplicacion.com', - redirect_uri: 'http://localhost:4200' - } - } + redirect_uri: 'http://localhost:4200', + }, + }, + url: 'https://challenge-be-testing.onrender.com/' }; From 91b1b4086afb969a0ffbaf68119756d4bbd8236a Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Sat, 19 Oct 2024 18:15:32 -0300 Subject: [PATCH 100/203] correcciones --- .../pages/new-pages/new-pages.component.ts | 51 ++------- .../header-page/header-page.component.html | 104 +++++++++--------- .../header-page/header-page.component.scss | 7 +- .../header-page/header-page.component.ts | 16 +++ 4 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 019c278..99d4b59 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -104,12 +104,6 @@ export class NewPagesComponent { /* modulo */ switch (datos.module) { - case 'Desarrollo': - this.quizData.module = 'ID DE DESARROLLO'; - break; - case 'Marketing': - this.quizData.module = 'ID DE MARKETING'; - break; case 'Sistemas': this.quizData.module = '84c66f03-c98f-47f1-a461-589cfb3dbf1f'; break; @@ -117,37 +111,17 @@ export class NewPagesComponent { /* celula */ - let response: any = await fetch(`${environment.url}/cells`) + let response: any = await fetch(`${environment.url}cells`) response = await response.json() +console.log(response); - response = response.find((element)=>datos.cell == element.name) + response = response.find((element)=>datos.cell == element.name) + console.log(response) response ? this.quizData.cell = response.id : '' console.log(this.quizData) -/* switch (datos.cell) { - case 'Diseño-UX-UI': - this.quizData.cell = '97928084-2555-405c-b6fa-c8fcbd47c3d5'; - break; - case 'QA-Tester': - this.quizData.cell = '5901518b-f699-49ce-a034-5d0fe2609345'; - break; - case 'Frontend': - this.quizData.cell = '305e2fc8-b898-48f7-b5ea-75fcdb52b17f'; - break; - case 'Backend': - this.quizData.cell = 'fe378504-4a60-4de9-8204-e42ca27167d3'; - break; - case 'PM': - this.quizData.cell = '989d898a-3ca8-453c-ab2e-1cc4f9510b8c'; - break; - case 'Scrum-Master': - this.quizData.cell = 'c4d33b62-b4a4-46b3-ad4f-15471b7fd456'; - break; - case 'Fullstack': - this.quizData.cell = '6c88f9e9-ee68-423f-bbf9-cb8af183924f'; - break; - } */ + /* seniority */ if (datos.seniority) { @@ -157,12 +131,6 @@ export class NewPagesComponent { } async createQuiz() { try { - this.showForm = true; - this.showButton = false; - this.questionCategory.name = this.selectNameForm.value.name; - this.questionCategory.description = this.selectNameForm.value.description; - console.log(this.quizData); - const prueba = { name: this.selectNameForm.value.name, description: this.selectNameForm.value.description, @@ -174,7 +142,7 @@ export class NewPagesComponent { is_active: true, }; const response = await fetch( - `${environment.url}/quiz`, + `${environment.url}quiz`, { method: 'POST', headers: { @@ -186,6 +154,11 @@ export class NewPagesComponent { if (!response.ok) { throw new Error(`Error: ${response.status}`); } + this.showForm = true; + this.showButton = false; + this.questionCategory.name = this.selectNameForm.value.name; + this.questionCategory.description = this.selectNameForm.value.description; + console.log(this.quizData); const data = await response.json(); this.quizID = data.id; /* aca hago global el ID del quiz */ @@ -236,7 +209,7 @@ export class NewPagesComponent { /* this.onQuestionTypeChange('otro', 0); */ const response = await fetch( - `${environment.url}/question`, + `${environment.url}question`, { method: 'POST', headers: { diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index 1ebc034..646fce4 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -1,58 +1,69 @@
-

Módulo

-
- {{questionCategory?.module}} +
+ {{ + questionCategory?.module + }}
- - - + +

Célula

-
- {{questionCategory?.cell}} +
+ {{ + questionCategory?.cell + }}
- - - - - - + + + + + + + + + +
@@ -61,18 +72,13 @@

Célula

Seniority / Nivel

-
+
{{ questionCategory?.seniority }} -
+
- - - - - - - - +
diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index 20c88a8..75a7445 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -137,37 +137,6 @@ h4 { white-space: nowrap; } -.UX-UI { - background-color: #ffcc00; - color: #795f3a; - border-radius: 10px; -} - -.QA { - border-radius: 20px; - background-color: #ff9500; - color: #795f3a; -} -.frontend { - border-radius: 20px; - background-color: #34c759; - color: #795f3a; -} -.backend { - border-radius: 20px; - background-color: #00c7be; - color: #795f3a; -} -.PM { - border-radius: 20px; - background-color: #30b0c7; - color: #795f3a; -} -.scrum { - border-radius: 20px; - background-color: #32ade6; - color: #795f3a; -} .trainee { border-radius: 20px; background-color: #007aff; diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index 4fd18d3..a79b898 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -20,7 +20,7 @@ export class HeaderPageComponent { }); } - + colors: string[] = ['#ffcc00', '#ff9500', '#34c759', '#00c7be', '#30b0c7', '#32ade6', '#007aff']; showModulo: boolean = false; showCelula: boolean = false; showSeniority: boolean = false; @@ -28,22 +28,24 @@ export class HeaderPageComponent { module: 'Selecciona el modulo', cell: 'Selecciona la célula', seniority: 'Seniority', + colorCell: '' }; - options: any = ['',''] - + options: any = [] + async getCells(){ - let response = await fetch(`${environment.url}'cells'`) + let response = await fetch(`${environment.url}/cells`) response = await response.json() - - this.options.push(response) + this.options = response + console.log(response) console.log(this.options); } - pushQuestionCategory(prop: string, val: string, id:string): void { + pushQuestionCategory(prop: string, val: string, colorCell: string): void { this.questionCategory[prop] = val; - this.questionCategory[id] = id; + if(prop=='cell'){ + this.questionCategory.colorCell = colorCell} this.datosParaPadre.emit(this.questionCategory); } @@ -54,8 +56,9 @@ export class HeaderPageComponent { this.showSeniority = false; } isShowCelula() { + console.log(environment.url) - console.log(this.options); + this.getCells() this.showCelula = !this.showCelula; this.showSeniority = false; diff --git a/src/app/shared/components/header-form/pages/header-page/js.js b/src/app/shared/components/header-form/pages/header-page/js.js new file mode 100644 index 0000000..18c1f9c --- /dev/null +++ b/src/app/shared/components/header-form/pages/header-page/js.js @@ -0,0 +1,12 @@ +import { environment } from 'src/environments/environment'; + +async function getCells(){ + let response = await fetch(`${environment.url}'cells'`) + response = await response.json() + + console.log(response) + + + } + + getCells() \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index de15ca9..1e2305f 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,5 +8,5 @@ export const environment = { redirect_uri: 'http://localhost:4200', }, }, - url: 'https://challenge-be-testing.onrender.com/' + url: 'https://challenge-be-testing.onrender.com' }; From 37872118eb17e9497ad96004b0a43cd9802bde97 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Mon, 21 Oct 2024 16:17:01 -0300 Subject: [PATCH 103/203] inputs --- .../header-page/header-page.component.html | 39 ++++++------ .../header-page/header-page.component.ts | 62 ++++++++++++------- 2 files changed, 59 insertions(+), 42 deletions(-) diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index 11111ec..3ea678a 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -8,13 +8,13 @@

Módulo

questionCategory?.module }}
- - + + +
@@ -22,19 +22,20 @@

Módulo

Célula

- {{ - questionCategory?.cell - }} + {{ questionCategory?.cell }}
- - - - + + +
diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index a79b898..ba5f27a 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -8,7 +8,7 @@ import { environment } from 'src/environments/environment'; styleUrl: './header-page.component.scss', }) export class HeaderPageComponent { - @Output() datosParaPadre = new EventEmitter();// cambie a any + @Output() datosParaPadre = new EventEmitter(); // cambie a any public selectHeaderForm: FormGroup; constructor(private formsBuilder: FormBuilder) {} @@ -17,10 +17,23 @@ export class HeaderPageComponent { nombreQuiz: [''], descripcion: [''], modulo: [''], - }); } - colors: string[] = ['#ffcc00', '#ff9500', '#34c759', '#00c7be', '#30b0c7', '#32ade6', '#007aff']; + colorsCells: string[] = [ + '#ffcc00', + '#ff9500', + '#34c759', + '#00c7be', + '#30b0c7', + '#32ade6', + '#007aff', + '#007AFF', + '#ff2d55', + '#af52de', + '#5856d6', + '#007aff', + ]; + colorsSeniority: string[] = ['#ff2d55', '#af52de', '#5856d6', '#007aff']; showModulo: boolean = false; showCelula: boolean = false; showSeniority: boolean = false; @@ -28,46 +41,49 @@ export class HeaderPageComponent { module: 'Selecciona el modulo', cell: 'Selecciona la célula', seniority: 'Seniority', - colorCell: '' + colorCell: '', }; - options: any = [] - - async getCells(){ - let response = await fetch(`${environment.url}/cells`) - response = await response.json() - this.options = response - console.log(response) - console.log(this.options); - + opModules: any = []; + opCells: any = []; + + async getModule() { + let response = await fetch(`${environment.url}/modules`); + response = await response.json(); + this.opModules = response + } + async getCells() { /* no pude reutilizar fn anterior con parametros */ + let response = await fetch(`${environment.url}/cells`); + response = await response.json(); + this.opCells = response } - - pushQuestionCategory(prop: string, val: string, colorCell: string): void { + pushQuestionCategory(prop: string, val: string, color: string): void { this.questionCategory[prop] = val; - if(prop=='cell'){ - this.questionCategory.colorCell = colorCell} - + if (prop == 'cell') { + this.questionCategory.colorCell = color; + } + this.datosParaPadre.emit(this.questionCategory); } isShowModulo() { + this.getModule(); this.showModulo = !this.showModulo; this.showCelula = false; this.showSeniority = false; + console.log(this.opModules); } isShowCelula() { - console.log(environment.url) - - this.getCells() - + this.getCells(); + this.showCelula = !this.showCelula; this.showSeniority = false; this.showModulo = false; + console.log(this.opCells); } isShowSeniority() { this.showSeniority = !this.showSeniority; this.showCelula = false; this.showModulo = false; } - } From 45d185aa5962e2962a42865911daea4fd5ce5aca Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Mon, 21 Oct 2024 20:27:25 -0300 Subject: [PATCH 104/203] Estilos view-quiz --- .../pages/view-quiz/view-quiz.component.html | 2 + .../pages/view-quiz/view-quiz.component.scss | 59 ++++++++++++++----- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 60697eb..3def92e 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,5 +1,7 @@
+

Detalles del Quiz: {{ quizDetails?.name }}

+ Logo
diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index 91f1fad..02d9df6 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -1,28 +1,47 @@ -/* General */ body { - font-family: 'Roboto', sans-serif; + font-family: 'popi'; background-color: #141414; color: #fff; margin: 0; padding: 0; line-height: 1.6; + height: 100vh; + display: flex; + justify-content: center; + align-items: center; } .container { margin: 0 auto; - max-width: 900px; + max-width: 90%; + height: 90%; padding: 20px; border-radius: 10px; box-shadow: 0 0 15px rgba(0, 0, 0, 0.5); + display: flex; + flex-direction: column; + justify-content: space-between; + position: relative; /* Para el logo */ } h2 { color: #fff; - font-size: 26px; + font-size: 28px; margin-bottom: 20px; + text-align: center; +} + +/* Logo centrado */ +.logo-centrado { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 250px; + opacity: 0.1; + z-index: 0; } -/* Card */ .card { background-color: #1d1d1d; border-radius: 8px; @@ -31,35 +50,46 @@ h2 { box-shadow: 0 0 15px rgba(115, 102, 255, 0.2); position: relative; overflow: hidden; + flex-grow: 1; + z-index: 1; /* El contenido está por encima del logo */ +} + +.container-sup { + display: flex; + justify-content: space-between; + gap: 20px; + } -/* Contenedores */ .container-sup p { - margin: 0 0 10px; - font-size: 16px; + margin: 0; + font-size: 18px; + flex: 1; } h4 { color: #f0f0f0; - font-size: 20px; + font-size: 22px; margin-bottom: 10px; + text-align: left; } -/* Listas de preguntas */ ul { list-style-type: none; padding: 0; + margin-top: 10px; } li { background-color: #292929; - padding: 10px; - margin-bottom: 10px; - border-radius: 5px; + padding: 15px; + margin-bottom: 15px; + border-radius: 8px; } li p { margin: 0; + font-size: 16px; } li strong { @@ -77,11 +107,10 @@ li ul li { margin-bottom: 5px; } -/* Estilos adicionales */ .noQuestions { text-align: center; padding: 10px; background-color: #292929; border-radius: 5px; + font-size: 16px; } - From 82daae8031854f0dd51dd41a0bec59198cbb1bc1 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Mon, 21 Oct 2024 21:48:12 -0300 Subject: [PATCH 105/203] add enviroment production --- .env.example | 5 + .gitignore | 3 + pnpm-lock.yaml | 9583 -------------------------- src/environments/environment.prod.ts | 9 + 4 files changed, 17 insertions(+), 9583 deletions(-) create mode 100644 .env.example delete mode 100644 pnpm-lock.yaml diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..fb27620 --- /dev/null +++ b/.env.example @@ -0,0 +1,5 @@ +DOMAIN="" +CLIENT_ID="" +AUDIENCE="" +REDIRECT_URL="" +URL="" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 79883d4..6aef1c0 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ Thumbs.db .nx/cache .nx/workspace-data + +# Enviromenmts +.env \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml deleted file mode 100644 index d247c0b..0000000 --- a/pnpm-lock.yaml +++ /dev/null @@ -1,9583 +0,0 @@ -lockfileVersion: '9.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -importers: - - .: - dependencies: - '@angular/animations': - specifier: ^17.0.5 - version: 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)) - '@angular/cdk': - specifier: ^17.0.2 - version: 17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1) - '@angular/common': - specifier: ^17.0.5 - version: 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1) - '@angular/compiler': - specifier: ^17.0.5 - version: 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)) - '@angular/core': - specifier: ^17.0.5 - version: 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - '@angular/forms': - specifier: ^17.0.5 - version: 17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(rxjs@7.8.1) - '@angular/platform-browser': - specifier: ^17.0.5 - version: 17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)) - '@angular/platform-browser-dynamic': - specifier: ^17.0.5 - version: 17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))) - '@angular/router': - specifier: ^17.0.5 - version: 17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(rxjs@7.8.1) - msw: - specifier: ^2.3.0 - version: 2.3.0(typescript@5.2.2) - primeflex: - specifier: ^3.3.1 - version: 3.3.1 - primeicons: - specifier: 6.0.1 - version: 6.0.1 - primeng: - specifier: 17.2.0 - version: 17.2.0(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/forms@17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(rxjs@7.8.1))(rxjs@7.8.1)(zone.js@0.14.6) - prismjs: - specifier: ^1.29.0 - version: 1.29.0 - rxjs: - specifier: ~7.8.1 - version: 7.8.1 - tslib: - specifier: ^2.5.0 - version: 2.6.2 - zone.js: - specifier: ~0.14.0 - version: 0.14.6 - devDependencies: - '@angular-devkit/build-angular': - specifier: ^17.0.5 - version: 17.3.8(@angular/compiler-cli@17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.2.2))(@types/express@4.17.21)(@types/node@20.12.12)(chokidar@3.6.0)(karma@6.4.3)(typescript@5.2.2) - '@angular-eslint/builder': - specifier: 17.5.1 - version: 17.5.1(eslint@8.57.0)(typescript@5.2.2) - '@angular-eslint/eslint-plugin': - specifier: 17.5.1 - version: 17.5.1(eslint@8.57.0)(typescript@5.2.2) - '@angular-eslint/eslint-plugin-template': - specifier: 17.5.1 - version: 17.5.1(eslint@8.57.0)(typescript@5.2.2) - '@angular-eslint/schematics': - specifier: 17.5.1 - version: 17.5.1(@angular/cli@17.3.8(chokidar@3.6.0))(eslint@8.57.0)(typescript@5.2.2) - '@angular-eslint/template-parser': - specifier: 17.5.1 - version: 17.5.1(eslint@8.57.0)(typescript@5.2.2) - '@angular/cli': - specifier: ^17.0.5 - version: 17.3.8(chokidar@3.6.0) - '@angular/compiler-cli': - specifier: ^17.0.5 - version: 17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.2.2) - '@types/jasmine': - specifier: ~4.3.1 - version: 4.3.6 - '@typescript-eslint/eslint-plugin': - specifier: 7.10.0 - version: 7.10.0(@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.2.2))(eslint@8.57.0)(typescript@5.2.2) - '@typescript-eslint/parser': - specifier: 7.10.0 - version: 7.10.0(eslint@8.57.0)(typescript@5.2.2) - eslint: - specifier: ^8.57.0 - version: 8.57.0 - jasmine-core: - specifier: ~4.6.0 - version: 4.6.1 - karma: - specifier: ~6.4.2 - version: 6.4.3 - karma-chrome-launcher: - specifier: ~3.2.0 - version: 3.2.0 - karma-coverage: - specifier: ~2.2.0 - version: 2.2.1 - karma-jasmine: - specifier: ~5.1.0 - version: 5.1.0(karma@6.4.3) - karma-jasmine-html-reporter: - specifier: ~2.1.0 - version: 2.1.0(jasmine-core@4.6.1)(karma-jasmine@5.1.0(karma@6.4.3))(karma@6.4.3) - prettier: - specifier: ^3.2.5 - version: 3.2.5 - typescript: - specifier: ~5.2.2 - version: 5.2.2 - -packages: - - '@ampproject/remapping@2.3.0': - resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} - engines: {node: '>=6.0.0'} - - '@angular-devkit/architect@0.1703.8': - resolution: {integrity: sha512-lKxwG4/QABXZvJpqeSIn/kAwnY6MM9HdHZUV+o5o3UiTi+vO8rZApG4CCaITH3Bxebm7Nam7Xbk8RuukC5rq6g==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - - '@angular-devkit/build-angular@17.3.8': - resolution: {integrity: sha512-ixsdXggWaFRP7Jvxd0AMukImnePuGflT9Yy7NJ9/y0cL/k//S/3RnkQv5i411KzN+7D4RIbNkRGGTYeqH24zlg==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - peerDependencies: - '@angular/compiler-cli': ^17.0.0 - '@angular/localize': ^17.0.0 - '@angular/platform-server': ^17.0.0 - '@angular/service-worker': ^17.0.0 - '@web/test-runner': ^0.18.0 - browser-sync: ^3.0.2 - jest: ^29.5.0 - jest-environment-jsdom: ^29.5.0 - karma: ^6.3.0 - ng-packagr: ^17.0.0 - protractor: ^7.0.0 - tailwindcss: ^2.0.0 || ^3.0.0 - typescript: '>=5.2 <5.5' - peerDependenciesMeta: - '@angular/localize': - optional: true - '@angular/platform-server': - optional: true - '@angular/service-worker': - optional: true - '@web/test-runner': - optional: true - browser-sync: - optional: true - jest: - optional: true - jest-environment-jsdom: - optional: true - karma: - optional: true - ng-packagr: - optional: true - protractor: - optional: true - tailwindcss: - optional: true - - '@angular-devkit/build-webpack@0.1703.8': - resolution: {integrity: sha512-9u6fl8VVOxcLOEMzrUeaybSvi9hSLSRucHnybneYrabsgreDo32tuy/4G8p6YAHQjpWEj9jvF9Um13ertdni5Q==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - peerDependencies: - webpack: ^5.30.0 - webpack-dev-server: ^4.0.0 - - '@angular-devkit/core@17.3.8': - resolution: {integrity: sha512-Q8q0voCGudbdCgJ7lXdnyaxKHbNQBARH68zPQV72WT8NWy+Gw/tys870i6L58NWbBaCJEUcIj/kb6KoakSRu+Q==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - peerDependencies: - chokidar: ^3.5.2 - peerDependenciesMeta: - chokidar: - optional: true - - '@angular-devkit/schematics@17.3.8': - resolution: {integrity: sha512-QRVEYpIfgkprNHc916JlPuNbLzOgrm9DZalHasnLUz4P6g7pR21olb8YCyM2OTJjombNhya9ZpckcADU5Qyvlg==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - - '@angular-eslint/builder@17.5.1': - resolution: {integrity: sha512-PWnH1t/Tdrdh+JwTJ87iXW//n1DPf3zF2MeKKfw8tiNOKjmCReL09KTabv+1Tbnm5B0ih6eOWCUG1N9VmcCubg==} - peerDependencies: - eslint: ^7.20.0 || ^8.0.0 - typescript: '*' - - '@angular-eslint/bundled-angular-compiler@17.5.1': - resolution: {integrity: sha512-2gYFcWsGcw3BytCzt6DzKNayOHhW1dhMAgttor94lXLYOYN82eLGomC+aZF/U6fqVGBjm5JIEJpWbNF+NawZ7w==} - - '@angular-eslint/eslint-plugin-template@17.5.1': - resolution: {integrity: sha512-OgTN6ogZSA7Fi/9Zfk3EZumr06MZPXyI7Y9A09WzkjgUikCXDNoYwvkT4Bh0jOtwDDhtAAFC9/TehJQj7f4o5A==} - peerDependencies: - eslint: ^7.20.0 || ^8.0.0 - typescript: '*' - - '@angular-eslint/eslint-plugin@17.5.1': - resolution: {integrity: sha512-6/BLBJatp4DK9XtiVIh3UGIkZkikmtnV3tSvxtxG0LR1/zY+iWZIyQlmoJ42jRh3F0L46lmb14Z0iaIsPXuRGQ==} - peerDependencies: - eslint: ^7.20.0 || ^8.0.0 - typescript: '*' - - '@angular-eslint/schematics@17.5.1': - resolution: {integrity: sha512-TvmsY08ViPqjUGAGl4ED477XzQ9qj7NXhZKN2aphIT+gZ8wVnOoBSWy+n2OSicrM6Eb0MSyACLZHnoD06+Z2sQ==} - peerDependencies: - '@angular/cli': '>= 17.0.0 < 18.0.0' - - '@angular-eslint/template-parser@17.5.1': - resolution: {integrity: sha512-DJcYacYEb17uUlQFYIKSjmlzWJEfev5pOMddDewV3h6oVm4T77X1SH/u8n5Oz1Zy13TrLWponwFORCKhg7nOfg==} - peerDependencies: - eslint: ^7.20.0 || ^8.0.0 - typescript: '*' - - '@angular-eslint/utils@17.5.1': - resolution: {integrity: sha512-Rji1fC9OLDzRaeM2Aven0HdEnqaIgLn5cD6JQphTi1o4TzIXAcSrB9g52dVkH3RnqtOGYSIfFpA6+lQfn7wLOA==} - peerDependencies: - eslint: ^7.20.0 || ^8.0.0 - typescript: '*' - - '@angular/animations@17.3.10': - resolution: {integrity: sha512-9fR5snTuG4aM2K54TG/6DXcKXMDKZMovZhjQOxO8l68/oqn6fKrHs8DLzckFs0XGRZ+2OyURH8WggFm1Z828rA==} - engines: {node: ^18.13.0 || >=20.9.0} - peerDependencies: - '@angular/core': 17.3.10 - - '@angular/cdk@17.3.10': - resolution: {integrity: sha512-b1qktT2c1TTTe5nTji/kFAVW92fULK0YhYAvJ+BjZTPKu2FniZNe8o4qqQ0pUuvtMu+ZQxp/QqFYoidIVCjScg==} - peerDependencies: - '@angular/common': ^17.0.0 || ^18.0.0 - '@angular/core': ^17.0.0 || ^18.0.0 - rxjs: ^6.5.3 || ^7.4.0 - - '@angular/cli@17.3.8': - resolution: {integrity: sha512-X5ZOQ6ZTKVHjhIsfl32ZRqbs+FUoeHLbT7x4fh2Os/8ObDDwrUcCJPqxe2b2RB5E2d0vepYigknHeLE7gwzlNQ==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - hasBin: true - - '@angular/common@17.3.10': - resolution: {integrity: sha512-6SfD21M3LujymmZsZQIxAsV8Bj5u6He6ImZ+p2rr7FAhFxpVJyKldK8LCmJcFsBD4srpQcxEZ0iDxXvg+0ihAw==} - engines: {node: ^18.13.0 || >=20.9.0} - peerDependencies: - '@angular/core': 17.3.10 - rxjs: ^6.5.3 || ^7.4.0 - - '@angular/compiler-cli@17.3.10': - resolution: {integrity: sha512-85SBphqRj3szac3FbeYgEZ+I6WaAlo5h7JX06BdjOLLiaoIwlFhLeAuG+jVekseV+95grFUxIsCMphWHi2e6hQ==} - engines: {node: ^18.13.0 || >=20.9.0} - hasBin: true - peerDependencies: - '@angular/compiler': 17.3.10 - typescript: '>=5.2 <5.5' - - '@angular/compiler@17.3.10': - resolution: {integrity: sha512-6Ce4siHyF0fCZBDm/cz+blJByGDu1/hbPkQVGmk5HGZTmCUeKkgyjoM6bZr7ssAsyGDRwxBh2SGHO4Ce31vuPA==} - engines: {node: ^18.13.0 || >=20.9.0} - peerDependencies: - '@angular/core': 17.3.10 - peerDependenciesMeta: - '@angular/core': - optional: true - - '@angular/core@17.3.10': - resolution: {integrity: sha512-ocEKu7X0yFCOvgJn1uZy76qjhsjKvULrO1k/BuIX0nwhp61DTGYTvCqKmwCBLM8/gvcKYH5vMKMHoQKtiSGE0A==} - engines: {node: ^18.13.0 || >=20.9.0} - peerDependencies: - rxjs: ^6.5.3 || ^7.4.0 - zone.js: ~0.14.0 - - '@angular/forms@17.3.10': - resolution: {integrity: sha512-0VZWSXDi2M3DAGJlpdV3lo73Yo/73GPRqmfTOrvIoUIenFg5Dz6oNGzvt/1aRkRn6HKccjix6iMpH91EN65pWA==} - engines: {node: ^18.13.0 || >=20.9.0} - peerDependencies: - '@angular/common': 17.3.10 - '@angular/core': 17.3.10 - '@angular/platform-browser': 17.3.10 - rxjs: ^6.5.3 || ^7.4.0 - - '@angular/platform-browser-dynamic@17.3.10': - resolution: {integrity: sha512-TW6G4+isdHM2ssQTRTobeAKtR2516pJ25BSwRb+9+Jw/ZAEYOOi+KQyofIFYQccaUjb3+LpjRcaZbtZ9m/Ispg==} - engines: {node: ^18.13.0 || >=20.9.0} - peerDependencies: - '@angular/common': 17.3.10 - '@angular/compiler': 17.3.10 - '@angular/core': 17.3.10 - '@angular/platform-browser': 17.3.10 - - '@angular/platform-browser@17.3.10': - resolution: {integrity: sha512-LEhBDOKm2A7nRmZqsafVp6OinRDG1OYZBSqjnT1jZ+f0CRRFIXz6aJ0TMPoU6vq9SLRJ7vrGD9P/eBf2hW00NQ==} - engines: {node: ^18.13.0 || >=20.9.0} - peerDependencies: - '@angular/animations': 17.3.10 - '@angular/common': 17.3.10 - '@angular/core': 17.3.10 - peerDependenciesMeta: - '@angular/animations': - optional: true - - '@angular/router@17.3.10': - resolution: {integrity: sha512-HlZlR9BOLoEKGOSMjmL5EfYL7F7PeDifbFi0dYWNcrG8zFrVKFklB1cuBdJhfPZgYhDEoGms/EToD71tg5wliA==} - engines: {node: ^18.13.0 || >=20.9.0} - peerDependencies: - '@angular/common': 17.3.10 - '@angular/core': 17.3.10 - '@angular/platform-browser': 17.3.10 - rxjs: ^6.5.3 || ^7.4.0 - - '@babel/code-frame@7.24.6': - resolution: {integrity: sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==} - engines: {node: '>=6.9.0'} - - '@babel/compat-data@7.24.6': - resolution: {integrity: sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==} - engines: {node: '>=6.9.0'} - - '@babel/core@7.23.9': - resolution: {integrity: sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==} - engines: {node: '>=6.9.0'} - - '@babel/core@7.24.0': - resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==} - engines: {node: '>=6.9.0'} - - '@babel/core@7.24.6': - resolution: {integrity: sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==} - engines: {node: '>=6.9.0'} - - '@babel/generator@7.23.6': - resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==} - engines: {node: '>=6.9.0'} - - '@babel/generator@7.24.6': - resolution: {integrity: sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-annotate-as-pure@7.22.5': - resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-annotate-as-pure@7.24.6': - resolution: {integrity: sha512-DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-builder-binary-assignment-operator-visitor@7.24.6': - resolution: {integrity: sha512-+wnfqc5uHiMYtvRX7qu80Toef8BXeh4HHR1SPeonGb1SKPniNEd4a/nlaJJMv/OIEYvIVavvo0yR7u10Gqz0Iw==} - engines: {node: '>=6.9.0'} - - '@babel/helper-compilation-targets@7.24.6': - resolution: {integrity: sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-create-class-features-plugin@7.24.6': - resolution: {integrity: sha512-djsosdPJVZE6Vsw3kk7IPRWethP94WHGOhQTc67SNXE0ZzMhHgALw8iGmYS0TD1bbMM0VDROy43od7/hN6WYcA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/helper-create-regexp-features-plugin@7.24.6': - resolution: {integrity: sha512-C875lFBIWWwyv6MHZUG9HmRrlTDgOsLWZfYR0nW69gaKJNe0/Mpxx5r0EID2ZdHQkdUmQo2t0uNckTL08/1BgA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/helper-define-polyfill-provider@0.5.0': - resolution: {integrity: sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==} - peerDependencies: - '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - - '@babel/helper-define-polyfill-provider@0.6.2': - resolution: {integrity: sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==} - peerDependencies: - '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - - '@babel/helper-environment-visitor@7.24.6': - resolution: {integrity: sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==} - engines: {node: '>=6.9.0'} - - '@babel/helper-function-name@7.24.6': - resolution: {integrity: sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==} - engines: {node: '>=6.9.0'} - - '@babel/helper-hoist-variables@7.24.6': - resolution: {integrity: sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-member-expression-to-functions@7.24.6': - resolution: {integrity: sha512-OTsCufZTxDUsv2/eDXanw/mUZHWOxSbEmC3pP8cgjcy5rgeVPWWMStnv274DV60JtHxTk0adT0QrCzC4M9NWGg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-module-imports@7.24.6': - resolution: {integrity: sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==} - engines: {node: '>=6.9.0'} - - '@babel/helper-module-transforms@7.24.6': - resolution: {integrity: sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/helper-optimise-call-expression@7.24.6': - resolution: {integrity: sha512-3SFDJRbx7KuPRl8XDUr8O7GAEB8iGyWPjLKJh/ywP/Iy9WOmEfMrsWbaZpvBu2HSYn4KQygIsz0O7m8y10ncMA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-plugin-utils@7.24.6': - resolution: {integrity: sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-remap-async-to-generator@7.24.6': - resolution: {integrity: sha512-1Qursq9ArRZPAMOZf/nuzVW8HgJLkTB9y9LfP4lW2MVp4e9WkLJDovfKBxoDcCk6VuzIxyqWHyBoaCtSRP10yg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/helper-replace-supers@7.24.6': - resolution: {integrity: sha512-mRhfPwDqDpba8o1F8ESxsEkJMQkUF8ZIWrAc0FtWhxnjfextxMWxr22RtFizxxSYLjVHDeMgVsRq8BBZR2ikJQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/helper-simple-access@7.24.6': - resolution: {integrity: sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==} - engines: {node: '>=6.9.0'} - - '@babel/helper-skip-transparent-expression-wrappers@7.24.6': - resolution: {integrity: sha512-jhbbkK3IUKc4T43WadP96a27oYti9gEf1LdyGSP2rHGH77kwLwfhO7TgwnWvxxQVmke0ImmCSS47vcuxEMGD3Q==} - engines: {node: '>=6.9.0'} - - '@babel/helper-split-export-declaration@7.22.6': - resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} - engines: {node: '>=6.9.0'} - - '@babel/helper-split-export-declaration@7.24.6': - resolution: {integrity: sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==} - engines: {node: '>=6.9.0'} - - '@babel/helper-string-parser@7.24.6': - resolution: {integrity: sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-identifier@7.24.6': - resolution: {integrity: sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-option@7.24.6': - resolution: {integrity: sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==} - engines: {node: '>=6.9.0'} - - '@babel/helper-wrap-function@7.24.6': - resolution: {integrity: sha512-f1JLrlw/jbiNfxvdrfBgio/gRBk3yTAEJWirpAkiJG2Hb22E7cEYKHWo0dFPTv/niPovzIdPdEDetrv6tC6gPQ==} - engines: {node: '>=6.9.0'} - - '@babel/helpers@7.24.6': - resolution: {integrity: sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==} - engines: {node: '>=6.9.0'} - - '@babel/highlight@7.24.6': - resolution: {integrity: sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==} - engines: {node: '>=6.9.0'} - - '@babel/parser@7.24.6': - resolution: {integrity: sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==} - engines: {node: '>=6.0.0'} - hasBin: true - - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.6': - resolution: {integrity: sha512-iVuhb6poq5ikqRq2XWU6OQ+R5o9wF+r/or9CeUyovgptz0UlnK4/seOQ1Istu/XybYjAhQv1FRSSfHHufIku5Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.6': - resolution: {integrity: sha512-c8TER5xMDYzzFcGqOEp9l4hvB7dcbhcGjcLVwxWfe4P5DOafdwjsBJZKsmv+o3aXh7NhopvayQIovHrh2zSRUQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.13.0 - - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.24.6': - resolution: {integrity: sha512-z8zEjYmwBUHN/pCF3NuWBhHQjJCrd33qAi8MgANfMrAvn72k2cImT8VjK9LJFu4ysOLJqhfkYYb3MvwANRUNZQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2': - resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-async-generators@7.8.4': - resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-class-properties@7.12.13': - resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-class-static-block@7.14.5': - resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-dynamic-import@7.8.3': - resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-export-namespace-from@7.8.3': - resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-import-assertions@7.24.6': - resolution: {integrity: sha512-BE6o2BogJKJImTmGpkmOic4V0hlRRxVtzqxiSPa8TIFxyhi4EFjHm08nq1M4STK4RytuLMgnSz0/wfflvGFNOg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-import-attributes@7.24.6': - resolution: {integrity: sha512-D+CfsVZousPXIdudSII7RGy52+dYRtbyKAZcvtQKq/NpsivyMVduepzcLqG5pMBugtMdedxdC8Ramdpcne9ZWQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-import-meta@7.10.4': - resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-json-strings@7.8.3': - resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-logical-assignment-operators@7.10.4': - resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3': - resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-numeric-separator@7.10.4': - resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-object-rest-spread@7.8.3': - resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-optional-catch-binding@7.8.3': - resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-optional-chaining@7.8.3': - resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-private-property-in-object@7.14.5': - resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-top-level-await@7.14.5': - resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-unicode-sets-regex@7.18.6': - resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/plugin-transform-arrow-functions@7.24.6': - resolution: {integrity: sha512-jSSSDt4ZidNMggcLx8SaKsbGNEfIl0PHx/4mFEulorE7bpYLbN0d3pDW3eJ7Y5Z3yPhy3L3NaPCYyTUY7TuugQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-async-generator-functions@7.23.9': - resolution: {integrity: sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-async-to-generator@7.23.3': - resolution: {integrity: sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-block-scoped-functions@7.24.6': - resolution: {integrity: sha512-XNW7jolYHW9CwORrZgA/97tL/k05qe/HL0z/qqJq1mdWhwwCM6D4BJBV7wAz9HgFziN5dTOG31znkVIzwxv+vw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-block-scoping@7.24.6': - resolution: {integrity: sha512-S/t1Xh4ehW7sGA7c1j/hiOBLnEYCp/c2sEG4ZkL8kI1xX9tW2pqJTCHKtdhe/jHKt8nG0pFCrDHUXd4DvjHS9w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-class-properties@7.24.6': - resolution: {integrity: sha512-j6dZ0Z2Z2slWLR3kt9aOmSIrBvnntWjMDN/TVcMPxhXMLmJVqX605CBRlcGI4b32GMbfifTEsdEjGjiE+j/c3A==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-class-static-block@7.24.6': - resolution: {integrity: sha512-1QSRfoPI9RoLRa8Mnakc6v3e0gJxiZQTYrMfLn+mD0sz5+ndSzwymp2hDcYJTyT0MOn0yuWzj8phlIvO72gTHA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.12.0 - - '@babel/plugin-transform-classes@7.24.6': - resolution: {integrity: sha512-+fN+NO2gh8JtRmDSOB6gaCVo36ha8kfCW1nMq2Gc0DABln0VcHN4PrALDvF5/diLzIRKptC7z/d7Lp64zk92Fg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-computed-properties@7.24.6': - resolution: {integrity: sha512-cRzPobcfRP0ZtuIEkA8QzghoUpSB3X3qSH5W2+FzG+VjWbJXExtx0nbRqwumdBN1x/ot2SlTNQLfBCnPdzp6kg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-destructuring@7.24.6': - resolution: {integrity: sha512-YLW6AE5LQpk5npNXL7i/O+U9CE4XsBCuRPgyjl1EICZYKmcitV+ayuuUGMJm2lC1WWjXYszeTnIxF/dq/GhIZQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-dotall-regex@7.24.6': - resolution: {integrity: sha512-rCXPnSEKvkm/EjzOtLoGvKseK+dS4kZwx1HexO3BtRtgL0fQ34awHn34aeSHuXtZY2F8a1X8xqBBPRtOxDVmcA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-duplicate-keys@7.24.6': - resolution: {integrity: sha512-/8Odwp/aVkZwPFJMllSbawhDAO3UJi65foB00HYnK/uXvvCPm0TAXSByjz1mpRmp0q6oX2SIxpkUOpPFHk7FLA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-dynamic-import@7.24.6': - resolution: {integrity: sha512-vpq8SSLRTBLOHUZHSnBqVo0AKX3PBaoPs2vVzYVWslXDTDIpwAcCDtfhUcHSQQoYoUvcFPTdC8TZYXu9ZnLT/w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-exponentiation-operator@7.24.6': - resolution: {integrity: sha512-EemYpHtmz0lHE7hxxxYEuTYOOBZ43WkDgZ4arQ4r+VX9QHuNZC+WH3wUWmRNvR8ECpTRne29aZV6XO22qpOtdA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-export-namespace-from@7.24.6': - resolution: {integrity: sha512-inXaTM1SVrIxCkIJ5gqWiozHfFMStuGbGJAxZFBoHcRRdDP0ySLb3jH6JOwmfiinPwyMZqMBX+7NBDCO4z0NSA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-for-of@7.24.6': - resolution: {integrity: sha512-n3Sf72TnqK4nw/jziSqEl1qaWPbCRw2CziHH+jdRYvw4J6yeCzsj4jdw8hIntOEeDGTmHVe2w4MVL44PN0GMzg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-function-name@7.24.6': - resolution: {integrity: sha512-sOajCu6V0P1KPljWHKiDq6ymgqB+vfo3isUS4McqW1DZtvSVU2v/wuMhmRmkg3sFoq6GMaUUf8W4WtoSLkOV/Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-json-strings@7.24.6': - resolution: {integrity: sha512-Uvgd9p2gUnzYJxVdBLcU0KurF8aVhkmVyMKW4MIY1/BByvs3EBpv45q01o7pRTVmTvtQq5zDlytP3dcUgm7v9w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-literals@7.24.6': - resolution: {integrity: sha512-f2wHfR2HF6yMj+y+/y07+SLqnOSwRp8KYLpQKOzS58XLVlULhXbiYcygfXQxJlMbhII9+yXDwOUFLf60/TL5tw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-logical-assignment-operators@7.24.6': - resolution: {integrity: sha512-EKaWvnezBCMkRIHxMJSIIylzhqK09YpiJtDbr2wsXTwnO0TxyjMUkaw4RlFIZMIS0iDj0KyIg7H7XCguHu/YDA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-member-expression-literals@7.24.6': - resolution: {integrity: sha512-9g8iV146szUo5GWgXpRbq/GALTnY+WnNuRTuRHWWFfWGbP9ukRL0aO/jpu9dmOPikclkxnNsjY8/gsWl6bmZJQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-modules-amd@7.24.6': - resolution: {integrity: sha512-eAGogjZgcwqAxhyFgqghvoHRr+EYRQPFjUXrTYKBRb5qPnAVxOOglaxc4/byHqjvq/bqO2F3/CGwTHsgKJYHhQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-modules-commonjs@7.24.6': - resolution: {integrity: sha512-JEV8l3MHdmmdb7S7Cmx6rbNEjRCgTQMZxllveHO0mx6uiclB0NflCawlQQ6+o5ZrwjUBYPzHm2XoK4wqGVUFuw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-modules-systemjs@7.24.6': - resolution: {integrity: sha512-xg1Z0J5JVYxtpX954XqaaAT6NpAY6LtZXvYFCJmGFJWwtlz2EmJoR8LycFRGNE8dBKizGWkGQZGegtkV8y8s+w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-modules-umd@7.24.6': - resolution: {integrity: sha512-esRCC/KsSEUvrSjv5rFYnjZI6qv4R1e/iHQrqwbZIoRJqk7xCvEUiN7L1XrmW5QSmQe3n1XD88wbgDTWLbVSyg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-named-capturing-groups-regex@7.24.6': - resolution: {integrity: sha512-6DneiCiu91wm3YiNIGDWZsl6GfTTbspuj/toTEqLh9d4cx50UIzSdg+T96p8DuT7aJOBRhFyaE9ZvTHkXrXr6Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/plugin-transform-new-target@7.24.6': - resolution: {integrity: sha512-f8liz9JG2Va8A4J5ZBuaSdwfPqN6axfWRK+y66fjKYbwf9VBLuq4WxtinhJhvp1w6lamKUwLG0slK2RxqFgvHA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-nullish-coalescing-operator@7.24.6': - resolution: {integrity: sha512-+QlAiZBMsBK5NqrBWFXCYeXyiU1y7BQ/OYaiPAcQJMomn5Tyg+r5WuVtyEuvTbpV7L25ZSLfE+2E9ywj4FD48A==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-numeric-separator@7.24.6': - resolution: {integrity: sha512-6voawq8T25Jvvnc4/rXcWZQKKxUNZcKMS8ZNrjxQqoRFernJJKjE3s18Qo6VFaatG5aiX5JV1oPD7DbJhn0a4Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-object-rest-spread@7.24.6': - resolution: {integrity: sha512-OKmi5wiMoRW5Smttne7BwHM8s/fb5JFs+bVGNSeHWzwZkWXWValR1M30jyXo1s/RaqgwwhEC62u4rFH/FBcBPg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-object-super@7.24.6': - resolution: {integrity: sha512-N/C76ihFKlZgKfdkEYKtaRUtXZAgK7sOY4h2qrbVbVTXPrKGIi8aww5WGe/+Wmg8onn8sr2ut6FXlsbu/j6JHg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-optional-catch-binding@7.24.6': - resolution: {integrity: sha512-L5pZ+b3O1mSzJ71HmxSCmTVd03VOT2GXOigug6vDYJzE5awLI7P1g0wFcdmGuwSDSrQ0L2rDOe/hHws8J1rv3w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-optional-chaining@7.24.6': - resolution: {integrity: sha512-cHbqF6l1QP11OkYTYQ+hhVx1E017O5ZcSPXk9oODpqhcAD1htsWG2NpHrrhthEO2qZomLK0FXS+u7NfrkF5aOQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-parameters@7.24.6': - resolution: {integrity: sha512-ST7guE8vLV+vI70wmAxuZpIKzVjvFX9Qs8bl5w6tN/6gOypPWUmMQL2p7LJz5E63vEGrDhAiYetniJFyBH1RkA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-private-methods@7.24.6': - resolution: {integrity: sha512-T9LtDI0BgwXOzyXrvgLTT8DFjCC/XgWLjflczTLXyvxbnSR/gpv0hbmzlHE/kmh9nOvlygbamLKRo6Op4yB6aw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-private-property-in-object@7.24.6': - resolution: {integrity: sha512-Qu/ypFxCY5NkAnEhCF86Mvg3NSabKsh/TPpBVswEdkGl7+FbsYHy1ziRqJpwGH4thBdQHh8zx+z7vMYmcJ7iaQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-property-literals@7.24.6': - resolution: {integrity: sha512-oARaglxhRsN18OYsnPTpb8TcKQWDYNsPNmTnx5++WOAsUJ0cSC/FZVlIJCKvPbU4yn/UXsS0551CFKJhN0CaMw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-regenerator@7.24.6': - resolution: {integrity: sha512-SMDxO95I8WXRtXhTAc8t/NFQUT7VYbIWwJCJgEli9ml4MhqUMh4S6hxgH6SmAC3eAQNWCDJFxcFeEt9w2sDdXg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-reserved-words@7.24.6': - resolution: {integrity: sha512-DcrgFXRRlK64dGE0ZFBPD5egM2uM8mgfrvTMOSB2yKzOtjpGegVYkzh3s1zZg1bBck3nkXiaOamJUqK3Syk+4A==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-runtime@7.24.0': - resolution: {integrity: sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-shorthand-properties@7.24.6': - resolution: {integrity: sha512-xnEUvHSMr9eOWS5Al2YPfc32ten7CXdH7Zwyyk7IqITg4nX61oHj+GxpNvl+y5JHjfN3KXE2IV55wAWowBYMVw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-spread@7.24.6': - resolution: {integrity: sha512-h/2j7oIUDjS+ULsIrNZ6/TKG97FgmEk1PXryk/HQq6op4XUUUwif2f69fJrzK0wza2zjCS1xhXmouACaWV5uPA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-sticky-regex@7.24.6': - resolution: {integrity: sha512-fN8OcTLfGmYv7FnDrsjodYBo1DhPL3Pze/9mIIE2MGCT1KgADYIOD7rEglpLHZj8PZlC/JFX5WcD+85FLAQusw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-template-literals@7.24.6': - resolution: {integrity: sha512-BJbEqJIcKwrqUP+KfUIkxz3q8VzXe2R8Wv8TaNgO1cx+nNavxn/2+H8kp9tgFSOL6wYPPEgFvU6IKS4qoGqhmg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-typeof-symbol@7.24.6': - resolution: {integrity: sha512-IshCXQ+G9JIFJI7bUpxTE/oA2lgVLAIK8q1KdJNoPXOpvRaNjMySGuvLfBw/Xi2/1lLo953uE8hyYSDW3TSYig==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-unicode-escapes@7.24.6': - resolution: {integrity: sha512-bKl3xxcPbkQQo5eX9LjjDpU2xYHeEeNQbOhj0iPvetSzA+Tu9q/o5lujF4Sek60CM6MgYvOS/DJuwGbiEYAnLw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-unicode-property-regex@7.24.6': - resolution: {integrity: sha512-8EIgImzVUxy15cZiPii9GvLZwsy7Vxc+8meSlR3cXFmBIl5W5Tn9LGBf7CDKkHj4uVfNXCJB8RsVfnmY61iedA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-unicode-regex@7.24.6': - resolution: {integrity: sha512-pssN6ExsvxaKU638qcWb81RrvvgZom3jDgU/r5xFZ7TONkZGFf4MhI2ltMb8OcQWhHyxgIavEU+hgqtbKOmsPA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-unicode-sets-regex@7.24.6': - resolution: {integrity: sha512-quiMsb28oXWIDK0gXLALOJRXLgICLiulqdZGOaPPd0vRT7fQp74NtdADAVu+D8s00C+0Xs0MxVP0VKF/sZEUgw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/preset-env@7.24.0': - resolution: {integrity: sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/preset-modules@0.1.6-no-external-plugins': - resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==} - peerDependencies: - '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0 - - '@babel/regjsgen@0.8.0': - resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==} - - '@babel/runtime@7.24.0': - resolution: {integrity: sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==} - engines: {node: '>=6.9.0'} - - '@babel/template@7.24.6': - resolution: {integrity: sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==} - engines: {node: '>=6.9.0'} - - '@babel/traverse@7.24.6': - resolution: {integrity: sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==} - engines: {node: '>=6.9.0'} - - '@babel/types@7.24.6': - resolution: {integrity: sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==} - engines: {node: '>=6.9.0'} - - '@bundled-es-modules/cookie@2.0.0': - resolution: {integrity: sha512-Or6YHg/kamKHpxULAdSqhGqnWFneIXu1NKvvfBBzKGwpVsYuFIQ5aBPHDnnoR3ghW1nvSkALd+EF9iMtY7Vjxw==} - - '@bundled-es-modules/statuses@1.0.1': - resolution: {integrity: sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==} - - '@colors/colors@1.5.0': - resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} - engines: {node: '>=0.1.90'} - - '@discoveryjs/json-ext@0.5.7': - resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==} - engines: {node: '>=10.0.0'} - - '@esbuild/aix-ppc64@0.19.12': - resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - - '@esbuild/aix-ppc64@0.20.1': - resolution: {integrity: sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - - '@esbuild/android-arm64@0.19.12': - resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - - '@esbuild/android-arm64@0.20.1': - resolution: {integrity: sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - - '@esbuild/android-arm@0.19.12': - resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - - '@esbuild/android-arm@0.20.1': - resolution: {integrity: sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - - '@esbuild/android-x64@0.19.12': - resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - - '@esbuild/android-x64@0.20.1': - resolution: {integrity: sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - - '@esbuild/darwin-arm64@0.19.12': - resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - - '@esbuild/darwin-arm64@0.20.1': - resolution: {integrity: sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - - '@esbuild/darwin-x64@0.19.12': - resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - - '@esbuild/darwin-x64@0.20.1': - resolution: {integrity: sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - - '@esbuild/freebsd-arm64@0.19.12': - resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - - '@esbuild/freebsd-arm64@0.20.1': - resolution: {integrity: sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - - '@esbuild/freebsd-x64@0.19.12': - resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - - '@esbuild/freebsd-x64@0.20.1': - resolution: {integrity: sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - - '@esbuild/linux-arm64@0.19.12': - resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - - '@esbuild/linux-arm64@0.20.1': - resolution: {integrity: sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - - '@esbuild/linux-arm@0.19.12': - resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - - '@esbuild/linux-arm@0.20.1': - resolution: {integrity: sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - - '@esbuild/linux-ia32@0.19.12': - resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - - '@esbuild/linux-ia32@0.20.1': - resolution: {integrity: sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - - '@esbuild/linux-loong64@0.19.12': - resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - - '@esbuild/linux-loong64@0.20.1': - resolution: {integrity: sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - - '@esbuild/linux-mips64el@0.19.12': - resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - - '@esbuild/linux-mips64el@0.20.1': - resolution: {integrity: sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - - '@esbuild/linux-ppc64@0.19.12': - resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - - '@esbuild/linux-ppc64@0.20.1': - resolution: {integrity: sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - - '@esbuild/linux-riscv64@0.19.12': - resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - - '@esbuild/linux-riscv64@0.20.1': - resolution: {integrity: sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - - '@esbuild/linux-s390x@0.19.12': - resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - - '@esbuild/linux-s390x@0.20.1': - resolution: {integrity: sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - - '@esbuild/linux-x64@0.19.12': - resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - - '@esbuild/linux-x64@0.20.1': - resolution: {integrity: sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - - '@esbuild/netbsd-x64@0.19.12': - resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - - '@esbuild/netbsd-x64@0.20.1': - resolution: {integrity: sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - - '@esbuild/openbsd-x64@0.19.12': - resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - - '@esbuild/openbsd-x64@0.20.1': - resolution: {integrity: sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - - '@esbuild/sunos-x64@0.19.12': - resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - - '@esbuild/sunos-x64@0.20.1': - resolution: {integrity: sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - - '@esbuild/win32-arm64@0.19.12': - resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - - '@esbuild/win32-arm64@0.20.1': - resolution: {integrity: sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - - '@esbuild/win32-ia32@0.19.12': - resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - - '@esbuild/win32-ia32@0.20.1': - resolution: {integrity: sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - - '@esbuild/win32-x64@0.19.12': - resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - - '@esbuild/win32-x64@0.20.1': - resolution: {integrity: sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - - '@eslint-community/eslint-utils@4.4.0': - resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 - - '@eslint-community/regexpp@4.10.0': - resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} - engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - - '@eslint/eslintrc@2.1.4': - resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - - '@eslint/js@8.57.0': - resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - - '@humanwhocodes/config-array@0.11.14': - resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} - engines: {node: '>=10.10.0'} - - '@humanwhocodes/module-importer@1.0.1': - resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} - engines: {node: '>=12.22'} - - '@humanwhocodes/object-schema@2.0.3': - resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} - - '@inquirer/confirm@3.1.8': - resolution: {integrity: sha512-f3INZ+ca4dQdn+MQiq1yP/mOIR/Oc8BLRYuDh6ciToWd6z4W8yArfzjBCMQ0BPY8PcJKwZxGIt8Z6yNT32eSTw==} - engines: {node: '>=18'} - - '@inquirer/core@8.2.1': - resolution: {integrity: sha512-TIcuQMn2qrtyYe0j136UpHeYpk7AcR/trKeT/7YY0vRgcS9YSfJuQ2+PudPhSofLLsHNnRYAHScQCcVZrJkMqA==} - engines: {node: '>=18'} - - '@inquirer/figures@1.0.2': - resolution: {integrity: sha512-4F1MBwVr3c/m4bAUef6LgkvBfSjzwH+OfldgHqcuacWwSUetFebM2wi58WfG9uk1rR98U6GwLed4asLJbwdV5w==} - engines: {node: '>=18'} - - '@inquirer/type@1.3.2': - resolution: {integrity: sha512-5Frickan9c89QbPkSu6I6y8p+9eR6hZkdPahGmNDsTFX8FHLPAozyzCZMKUeW8FyYwnlCKUjqIEqxY+UctARiw==} - engines: {node: '>=18'} - - '@isaacs/cliui@8.0.2': - resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} - engines: {node: '>=12'} - - '@istanbuljs/load-nyc-config@1.1.0': - resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} - engines: {node: '>=8'} - - '@istanbuljs/schema@0.1.3': - resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==} - engines: {node: '>=8'} - - '@jest/schemas@29.6.3': - resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - - '@jridgewell/gen-mapping@0.3.5': - resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} - engines: {node: '>=6.0.0'} - - '@jridgewell/resolve-uri@3.1.2': - resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} - engines: {node: '>=6.0.0'} - - '@jridgewell/set-array@1.2.1': - resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} - engines: {node: '>=6.0.0'} - - '@jridgewell/source-map@0.3.6': - resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==} - - '@jridgewell/sourcemap-codec@1.4.15': - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - - '@jridgewell/trace-mapping@0.3.25': - resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} - - '@leichtgewicht/ip-codec@2.0.5': - resolution: {integrity: sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==} - - '@ljharb/through@2.3.13': - resolution: {integrity: sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==} - engines: {node: '>= 0.4'} - - '@mswjs/cookies@1.1.0': - resolution: {integrity: sha512-0ZcCVQxifZmhwNBoQIrystCb+2sWBY2Zw8lpfJBPCHGCA/HWqehITeCRVIv4VMy8MPlaHo2w2pTHFV2pFfqKPw==} - engines: {node: '>=18'} - - '@mswjs/interceptors@0.29.1': - resolution: {integrity: sha512-3rDakgJZ77+RiQUuSK69t1F0m8BQKA8Vh5DCS5V0DWvNY67zob2JhhQrhCO0AKLGINTRSFd1tBaHcJTkhefoSw==} - engines: {node: '>=18'} - - '@ngtools/webpack@17.3.8': - resolution: {integrity: sha512-CjSVVa/9fzMpEDQP01SC4colKCbZwj7vUq0H2bivp8jVsmd21x9Fu0gDBH0Y9NdfAIm4eGZvmiZKMII3vIOaYQ==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - peerDependencies: - '@angular/compiler-cli': ^17.0.0 - typescript: '>=5.2 <5.5' - webpack: ^5.54.0 - - '@nodelib/fs.scandir@2.1.5': - resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} - engines: {node: '>= 8'} - - '@nodelib/fs.stat@2.0.5': - resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} - engines: {node: '>= 8'} - - '@nodelib/fs.walk@1.2.8': - resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} - engines: {node: '>= 8'} - - '@npmcli/agent@2.2.2': - resolution: {integrity: sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@npmcli/fs@3.1.1': - resolution: {integrity: sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - '@npmcli/git@5.0.7': - resolution: {integrity: sha512-WaOVvto604d5IpdCRV2KjQu8PzkfE96d50CQGKgywXh2GxXmDeUO5EWcBC4V57uFyrNqx83+MewuJh3WTR3xPA==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@npmcli/installed-package-contents@2.1.0': - resolution: {integrity: sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - hasBin: true - - '@npmcli/node-gyp@3.0.0': - resolution: {integrity: sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - '@npmcli/package-json@5.1.0': - resolution: {integrity: sha512-1aL4TuVrLS9sf8quCLerU3H9J4vtCtgu8VauYozrmEyU57i/EdKleCnsQ7vpnABIH6c9mnTxcH5sFkO3BlV8wQ==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@npmcli/promise-spawn@7.0.2': - resolution: {integrity: sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@npmcli/redact@1.1.0': - resolution: {integrity: sha512-PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@npmcli/run-script@7.0.4': - resolution: {integrity: sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@nrwl/devkit@19.1.0': - resolution: {integrity: sha512-n4YxtAMSdlXAmwcSKcLEX48kpcPGI/sX7lCfDeoSnTKud8Y1tlNeD8rf0YZV3ae+srE6j4lxfoJrRCpWweMcEQ==} - - '@nrwl/tao@19.1.0': - resolution: {integrity: sha512-Mayqkuh2EXkac5prri5fQFd19RBRxBQRjVwTcezk7yTKWI7V+bJzbgZANybtcKGsPCH34cpqrlV4inVwtyaVzw==} - hasBin: true - - '@nx/devkit@19.1.0': - resolution: {integrity: sha512-jn8uNgavpRhYZ1u63YFNWc2lEoAr3YA7bvPK9yaBmV++tFj+Ig+eFKkQxRou4tvOUnIyVPrs/fmi/TBLVQcpQg==} - peerDependencies: - nx: '>= 17 <= 20' - - '@nx/nx-darwin-arm64@19.1.0': - resolution: {integrity: sha512-qUPZmVusnYrgqwhIYKBbabB1RpVQZiTcKfBdW1XiBTk+dXOuIVyWVCsg2ohoBJpHJiENYjtCprxR3RWPaxFs5Q==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - - '@nx/nx-darwin-x64@19.1.0': - resolution: {integrity: sha512-0Gf45EQTq8Q9/inGDzX5SqNY4jXDtqqVsz6wAJ07M9CeyjwDIXOzPe36uoMUhcvXQMbMp3QUH2E/X9poxOOubg==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - - '@nx/nx-freebsd-x64@19.1.0': - resolution: {integrity: sha512-bw3sKpXy1R17OTStOkeRUE4EkPsvXjAEp26qmKX3G7a7bCVjH7cn+UXdgF8jsEyyiqb8WY1LG63abIlbyfecIA==} - engines: {node: '>= 10'} - cpu: [x64] - os: [freebsd] - - '@nx/nx-linux-arm-gnueabihf@19.1.0': - resolution: {integrity: sha512-jJzkPWptqFnl7Q7clTMGvI6OT1x8Jw7JHLCi6JgKBqb2ieF4vUCUsLHkrfS/95l9hCUeIHeBrfHJxEXLZIhOgQ==} - engines: {node: '>= 10'} - cpu: [arm] - os: [linux] - - '@nx/nx-linux-arm64-gnu@19.1.0': - resolution: {integrity: sha512-zycD7+PbVStbjlPsxE3G+bdwFDzXE7LKWtQOrGLvBxG99pXbTr+Oq1GtqL68p2Jp4MEYjIO5qdxWdNt9bBsSwA==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - - '@nx/nx-linux-arm64-musl@19.1.0': - resolution: {integrity: sha512-NBUUbj/3NXHrqgkoLdMTnd8e9qduRVcSoGqpYDha0HBFc+Fspacw5+U26LjnmIuk/BT4yMtMrgFKU29Rq1a56w==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - - '@nx/nx-linux-x64-gnu@19.1.0': - resolution: {integrity: sha512-jaPrd1VIdz/dqcjEKUJ5BnU+ONSZmG1G/g1HrNb+SIl3Ztputrwz8yJ7CwpUryRo+xSwWhZXIiNJ5r7z09kaKw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - - '@nx/nx-linux-x64-musl@19.1.0': - resolution: {integrity: sha512-gj3Bq81s1NWzjtWteyTgczbbd2yq6xmic4H3PGFZkA5THjFAD/MiYiS9b5oQVzPWONyFgtk+gsTWVbiM7dOhew==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - - '@nx/nx-win32-arm64-msvc@19.1.0': - resolution: {integrity: sha512-PIGy+uu8dzhWodIHXC0jbPtYcpi95NdtkghD1yZ32jcoVzAcHOohM07tTMHXbl7WyLqXw+De0XkmZadMJoVNAg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - - '@nx/nx-win32-x64-msvc@19.1.0': - resolution: {integrity: sha512-aTbwZLIpViWgMZqyDl+2fyO5LJjtz0J4a0+0qPpEW46BAZ/kcEuE7Xv33Yoob+KorLr27n6BpzTs+7Wg4dXXFw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - - '@open-draft/deferred-promise@2.2.0': - resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==} - - '@open-draft/logger@0.3.0': - resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==} - - '@open-draft/until@2.1.0': - resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==} - - '@pkgjs/parseargs@0.11.0': - resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} - engines: {node: '>=14'} - - '@rollup/rollup-android-arm-eabi@4.18.0': - resolution: {integrity: sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==} - cpu: [arm] - os: [android] - - '@rollup/rollup-android-arm64@4.18.0': - resolution: {integrity: sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==} - cpu: [arm64] - os: [android] - - '@rollup/rollup-darwin-arm64@4.18.0': - resolution: {integrity: sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==} - cpu: [arm64] - os: [darwin] - - '@rollup/rollup-darwin-x64@4.18.0': - resolution: {integrity: sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==} - cpu: [x64] - os: [darwin] - - '@rollup/rollup-linux-arm-gnueabihf@4.18.0': - resolution: {integrity: sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==} - cpu: [arm] - os: [linux] - - '@rollup/rollup-linux-arm-musleabihf@4.18.0': - resolution: {integrity: sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==} - cpu: [arm] - os: [linux] - - '@rollup/rollup-linux-arm64-gnu@4.18.0': - resolution: {integrity: sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==} - cpu: [arm64] - os: [linux] - - '@rollup/rollup-linux-arm64-musl@4.18.0': - resolution: {integrity: sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==} - cpu: [arm64] - os: [linux] - - '@rollup/rollup-linux-powerpc64le-gnu@4.18.0': - resolution: {integrity: sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==} - cpu: [ppc64] - os: [linux] - - '@rollup/rollup-linux-riscv64-gnu@4.18.0': - resolution: {integrity: sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==} - cpu: [riscv64] - os: [linux] - - '@rollup/rollup-linux-s390x-gnu@4.18.0': - resolution: {integrity: sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==} - cpu: [s390x] - os: [linux] - - '@rollup/rollup-linux-x64-gnu@4.18.0': - resolution: {integrity: sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==} - cpu: [x64] - os: [linux] - - '@rollup/rollup-linux-x64-musl@4.18.0': - resolution: {integrity: sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==} - cpu: [x64] - os: [linux] - - '@rollup/rollup-win32-arm64-msvc@4.18.0': - resolution: {integrity: sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==} - cpu: [arm64] - os: [win32] - - '@rollup/rollup-win32-ia32-msvc@4.18.0': - resolution: {integrity: sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==} - cpu: [ia32] - os: [win32] - - '@rollup/rollup-win32-x64-msvc@4.18.0': - resolution: {integrity: sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==} - cpu: [x64] - os: [win32] - - '@schematics/angular@17.3.8': - resolution: {integrity: sha512-2g4OmSyE9YGq50Uj7fNI26P/TSAFJ7ZuirwTF2O7Xc4XRQ29/tYIIqhezpNlTb6rlYblcQuMcUZBrMfWJHcqJw==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - - '@sigstore/bundle@2.3.2': - resolution: {integrity: sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@sigstore/core@1.1.0': - resolution: {integrity: sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@sigstore/protobuf-specs@0.3.2': - resolution: {integrity: sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@sigstore/sign@2.3.2': - resolution: {integrity: sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@sigstore/tuf@2.3.4': - resolution: {integrity: sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@sigstore/verify@1.2.1': - resolution: {integrity: sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@sinclair/typebox@0.27.8': - resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} - - '@socket.io/component-emitter@3.1.2': - resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==} - - '@tufjs/canonical-json@2.0.0': - resolution: {integrity: sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@tufjs/models@2.0.1': - resolution: {integrity: sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@types/body-parser@1.19.5': - resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==} - - '@types/bonjour@3.5.13': - resolution: {integrity: sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==} - - '@types/connect-history-api-fallback@1.5.4': - resolution: {integrity: sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==} - - '@types/connect@3.4.38': - resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} - - '@types/cookie@0.4.1': - resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==} - - '@types/cookie@0.6.0': - resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} - - '@types/cors@2.8.17': - resolution: {integrity: sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==} - - '@types/eslint-scope@3.7.7': - resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==} - - '@types/eslint@8.56.10': - resolution: {integrity: sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==} - - '@types/estree@1.0.5': - resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} - - '@types/express-serve-static-core@4.19.1': - resolution: {integrity: sha512-ej0phymbFLoCB26dbbq5PGScsf2JAJ4IJHjG10LalgUV36XKTmA4GdA+PVllKvRk0sEKt64X8975qFnkSi0hqA==} - - '@types/express@4.17.21': - resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==} - - '@types/http-errors@2.0.4': - resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==} - - '@types/http-proxy@1.17.14': - resolution: {integrity: sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==} - - '@types/jasmine@4.3.6': - resolution: {integrity: sha512-3N0FpQTeiWjm+Oo1WUYWguUS7E6JLceiGTriFrG8k5PU7zRLJCzLcWURU3wjMbZGS//a2/LgjsnO3QxIlwxt9g==} - - '@types/json-schema@7.0.15': - resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - - '@types/mime@1.3.5': - resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==} - - '@types/mute-stream@0.0.4': - resolution: {integrity: sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==} - - '@types/node-forge@1.3.11': - resolution: {integrity: sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==} - - '@types/node@20.12.12': - resolution: {integrity: sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==} - - '@types/qs@6.9.15': - resolution: {integrity: sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==} - - '@types/range-parser@1.2.7': - resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==} - - '@types/retry@0.12.0': - resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==} - - '@types/send@0.17.4': - resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==} - - '@types/serve-index@1.9.4': - resolution: {integrity: sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==} - - '@types/serve-static@1.15.7': - resolution: {integrity: sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==} - - '@types/sockjs@0.3.36': - resolution: {integrity: sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==} - - '@types/statuses@2.0.5': - resolution: {integrity: sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==} - - '@types/wrap-ansi@3.0.0': - resolution: {integrity: sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==} - - '@types/ws@8.5.10': - resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==} - - '@typescript-eslint/eslint-plugin@7.10.0': - resolution: {integrity: sha512-PzCr+a/KAef5ZawX7nbyNwBDtM1HdLIT53aSA2DDlxmxMngZ43O8SIePOeX8H5S+FHXeI6t97mTt/dDdzY4Fyw==} - engines: {node: ^18.18.0 || >=20.0.0} - peerDependencies: - '@typescript-eslint/parser': ^7.0.0 - eslint: ^8.56.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - - '@typescript-eslint/parser@7.10.0': - resolution: {integrity: sha512-2EjZMA0LUW5V5tGQiaa2Gys+nKdfrn2xiTIBLR4fxmPmVSvgPcKNW+AE/ln9k0A4zDUti0J/GZXMDupQoI+e1w==} - engines: {node: ^18.18.0 || >=20.0.0} - peerDependencies: - eslint: ^8.56.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - - '@typescript-eslint/scope-manager@7.10.0': - resolution: {integrity: sha512-7L01/K8W/VGl7noe2mgH0K7BE29Sq6KAbVmxurj8GGaPDZXPr8EEQ2seOeAS+mEV9DnzxBQB6ax6qQQ5C6P4xg==} - engines: {node: ^18.18.0 || >=20.0.0} - - '@typescript-eslint/type-utils@7.10.0': - resolution: {integrity: sha512-D7tS4WDkJWrVkuzgm90qYw9RdgBcrWmbbRkrLA4d7Pg3w0ttVGDsvYGV19SH8gPR5L7OtcN5J1hTtyenO9xE9g==} - engines: {node: ^18.18.0 || >=20.0.0} - peerDependencies: - eslint: ^8.56.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - - '@typescript-eslint/types@7.10.0': - resolution: {integrity: sha512-7fNj+Ya35aNyhuqrA1E/VayQX9Elwr8NKZ4WueClR3KwJ7Xx9jcCdOrLW04h51de/+gNbyFMs+IDxh5xIwfbNg==} - engines: {node: ^18.18.0 || >=20.0.0} - - '@typescript-eslint/typescript-estree@7.10.0': - resolution: {integrity: sha512-LXFnQJjL9XIcxeVfqmNj60YhatpRLt6UhdlFwAkjNc6jSUlK8zQOl1oktAP8PlWFzPQC1jny/8Bai3/HPuvN5g==} - engines: {node: ^18.18.0 || >=20.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - - '@typescript-eslint/utils@7.10.0': - resolution: {integrity: sha512-olzif1Fuo8R8m/qKkzJqT7qwy16CzPRWBvERS0uvyc+DHd8AKbO4Jb7kpAvVzMmZm8TrHnI7hvjN4I05zow+tg==} - engines: {node: ^18.18.0 || >=20.0.0} - peerDependencies: - eslint: ^8.56.0 - - '@typescript-eslint/visitor-keys@7.10.0': - resolution: {integrity: sha512-9ntIVgsi6gg6FIq9xjEO4VQJvwOqA3jaBFQJ/6TK5AvEup2+cECI6Fh7QiBxmfMHXU0V0J4RyPeOU1VDNzl9cg==} - engines: {node: ^18.18.0 || >=20.0.0} - - '@ungap/structured-clone@1.2.0': - resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} - - '@vitejs/plugin-basic-ssl@1.1.0': - resolution: {integrity: sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==} - engines: {node: '>=14.6.0'} - peerDependencies: - vite: ^3.0.0 || ^4.0.0 || ^5.0.0 - - '@webassemblyjs/ast@1.12.1': - resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==} - - '@webassemblyjs/floating-point-hex-parser@1.11.6': - resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==} - - '@webassemblyjs/helper-api-error@1.11.6': - resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==} - - '@webassemblyjs/helper-buffer@1.12.1': - resolution: {integrity: sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==} - - '@webassemblyjs/helper-numbers@1.11.6': - resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==} - - '@webassemblyjs/helper-wasm-bytecode@1.11.6': - resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==} - - '@webassemblyjs/helper-wasm-section@1.12.1': - resolution: {integrity: sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==} - - '@webassemblyjs/ieee754@1.11.6': - resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==} - - '@webassemblyjs/leb128@1.11.6': - resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==} - - '@webassemblyjs/utf8@1.11.6': - resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==} - - '@webassemblyjs/wasm-edit@1.12.1': - resolution: {integrity: sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==} - - '@webassemblyjs/wasm-gen@1.12.1': - resolution: {integrity: sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==} - - '@webassemblyjs/wasm-opt@1.12.1': - resolution: {integrity: sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==} - - '@webassemblyjs/wasm-parser@1.12.1': - resolution: {integrity: sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==} - - '@webassemblyjs/wast-printer@1.12.1': - resolution: {integrity: sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==} - - '@xtuc/ieee754@1.2.0': - resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} - - '@xtuc/long@4.2.2': - resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} - - '@yarnpkg/lockfile@1.1.0': - resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==} - - '@yarnpkg/parsers@3.0.0-rc.46': - resolution: {integrity: sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==} - engines: {node: '>=14.15.0'} - - '@zkochan/js-yaml@0.0.7': - resolution: {integrity: sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==} - hasBin: true - - abbrev@2.0.0: - resolution: {integrity: sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - accepts@1.3.8: - resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} - engines: {node: '>= 0.6'} - - acorn-import-assertions@1.9.0: - resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} - peerDependencies: - acorn: ^8 - - acorn-jsx@5.3.2: - resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} - peerDependencies: - acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - - acorn@8.11.3: - resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} - engines: {node: '>=0.4.0'} - hasBin: true - - adjust-sourcemap-loader@4.0.0: - resolution: {integrity: sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==} - engines: {node: '>=8.9'} - - agent-base@7.1.1: - resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==} - engines: {node: '>= 14'} - - aggregate-error@3.1.0: - resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} - engines: {node: '>=8'} - - ajv-formats@2.1.1: - resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} - peerDependencies: - ajv: ^8.0.0 - peerDependenciesMeta: - ajv: - optional: true - - ajv-keywords@3.5.2: - resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} - peerDependencies: - ajv: ^6.9.1 - - ajv-keywords@5.1.0: - resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} - peerDependencies: - ajv: ^8.8.2 - - ajv@6.12.6: - resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} - - ajv@8.12.0: - resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==} - - ajv@8.14.0: - resolution: {integrity: sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==} - - ansi-colors@4.1.3: - resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} - engines: {node: '>=6'} - - ansi-escapes@4.3.2: - resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} - engines: {node: '>=8'} - - ansi-html-community@0.0.8: - resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==} - engines: {'0': node >= 0.8.0} - hasBin: true - - ansi-regex@5.0.1: - resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} - engines: {node: '>=8'} - - ansi-regex@6.0.1: - resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} - engines: {node: '>=12'} - - ansi-styles@3.2.1: - resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} - engines: {node: '>=4'} - - ansi-styles@4.3.0: - resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} - engines: {node: '>=8'} - - ansi-styles@5.2.0: - resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} - engines: {node: '>=10'} - - ansi-styles@6.2.1: - resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} - engines: {node: '>=12'} - - anymatch@3.1.3: - resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} - engines: {node: '>= 8'} - - argparse@1.0.10: - resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} - - argparse@2.0.1: - resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - - aria-query@5.3.0: - resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==} - - array-flatten@1.1.1: - resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} - - array-union@2.1.0: - resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} - engines: {node: '>=8'} - - async@3.2.5: - resolution: {integrity: sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==} - - asynckit@0.4.0: - resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - - autoprefixer@10.4.18: - resolution: {integrity: sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==} - engines: {node: ^10 || ^12 || >=14} - hasBin: true - peerDependencies: - postcss: ^8.1.0 - - axios@1.7.2: - resolution: {integrity: sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==} - - axobject-query@4.0.0: - resolution: {integrity: sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==} - - babel-loader@9.1.3: - resolution: {integrity: sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==} - engines: {node: '>= 14.15.0'} - peerDependencies: - '@babel/core': ^7.12.0 - webpack: '>=5' - - babel-plugin-istanbul@6.1.1: - resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==} - engines: {node: '>=8'} - - babel-plugin-polyfill-corejs2@0.4.11: - resolution: {integrity: sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==} - peerDependencies: - '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - - babel-plugin-polyfill-corejs3@0.9.0: - resolution: {integrity: sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==} - peerDependencies: - '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - - babel-plugin-polyfill-regenerator@0.5.5: - resolution: {integrity: sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==} - peerDependencies: - '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - - balanced-match@1.0.2: - resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - - base64-js@1.5.1: - resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - - base64id@2.0.0: - resolution: {integrity: sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==} - engines: {node: ^4.5.0 || >= 5.9} - - batch@0.6.1: - resolution: {integrity: sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==} - - big.js@5.2.2: - resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - - binary-extensions@2.3.0: - resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} - engines: {node: '>=8'} - - bl@4.1.0: - resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} - - body-parser@1.20.2: - resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - - bonjour-service@1.2.1: - resolution: {integrity: sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==} - - boolbase@1.0.0: - resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} - - brace-expansion@1.1.11: - resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} - - brace-expansion@2.0.1: - resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} - - braces@3.0.3: - resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} - engines: {node: '>=8'} - - browserslist@4.23.0: - resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==} - engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true - - buffer-from@1.1.2: - resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} - - buffer@5.7.1: - resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} - - bytes@3.0.0: - resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==} - engines: {node: '>= 0.8'} - - bytes@3.1.2: - resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} - engines: {node: '>= 0.8'} - - cacache@18.0.3: - resolution: {integrity: sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==} - engines: {node: ^16.14.0 || >=18.0.0} - - call-bind@1.0.7: - resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} - engines: {node: '>= 0.4'} - - callsites@3.1.0: - resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} - engines: {node: '>=6'} - - camelcase@5.3.1: - resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==} - engines: {node: '>=6'} - - caniuse-lite@1.0.30001624: - resolution: {integrity: sha512-0dWnQG87UevOCPYaOR49CBcLBwoZLpws+k6W37nLjWUhumP1Isusj0p2u+3KhjNloRWK9OKMgjBBzPujQHw4nA==} - - chalk@2.4.2: - resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} - engines: {node: '>=4'} - - chalk@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} - - chalk@5.3.0: - resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} - engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - - chardet@0.7.0: - resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} - - chokidar@3.6.0: - resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} - engines: {node: '>= 8.10.0'} - - chownr@2.0.0: - resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} - engines: {node: '>=10'} - - chrome-trace-event@1.0.3: - resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} - engines: {node: '>=6.0'} - - clean-stack@2.2.0: - resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} - engines: {node: '>=6'} - - cli-cursor@3.1.0: - resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} - engines: {node: '>=8'} - - cli-spinners@2.6.1: - resolution: {integrity: sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==} - engines: {node: '>=6'} - - cli-spinners@2.9.2: - resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==} - engines: {node: '>=6'} - - cli-width@4.1.0: - resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==} - engines: {node: '>= 12'} - - cliui@7.0.4: - resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} - - cliui@8.0.1: - resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} - engines: {node: '>=12'} - - clone-deep@4.0.1: - resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==} - engines: {node: '>=6'} - - clone@1.0.4: - resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} - engines: {node: '>=0.8'} - - color-convert@1.9.3: - resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} - - color-convert@2.0.1: - resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} - engines: {node: '>=7.0.0'} - - color-name@1.1.3: - resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} - - color-name@1.1.4: - resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - - colorette@2.0.20: - resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} - - combined-stream@1.0.8: - resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} - engines: {node: '>= 0.8'} - - commander@2.20.3: - resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} - - common-path-prefix@3.0.0: - resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} - - compressible@2.0.18: - resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==} - engines: {node: '>= 0.6'} - - compression@1.7.4: - resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==} - engines: {node: '>= 0.8.0'} - - concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - - connect-history-api-fallback@2.0.0: - resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==} - engines: {node: '>=0.8'} - - connect@3.7.0: - resolution: {integrity: sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==} - engines: {node: '>= 0.10.0'} - - content-disposition@0.5.4: - resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} - engines: {node: '>= 0.6'} - - content-type@1.0.5: - resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} - engines: {node: '>= 0.6'} - - convert-source-map@1.9.0: - resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} - - convert-source-map@2.0.0: - resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - - cookie-signature@1.0.6: - resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} - - cookie@0.4.2: - resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==} - engines: {node: '>= 0.6'} - - cookie@0.5.0: - resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} - engines: {node: '>= 0.6'} - - cookie@0.6.0: - resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} - engines: {node: '>= 0.6'} - - copy-anything@2.0.6: - resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==} - - copy-webpack-plugin@11.0.0: - resolution: {integrity: sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==} - engines: {node: '>= 14.15.0'} - peerDependencies: - webpack: ^5.1.0 - - core-js-compat@3.37.1: - resolution: {integrity: sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==} - - core-util-is@1.0.3: - resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - - cors@2.8.5: - resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==} - engines: {node: '>= 0.10'} - - cosmiconfig@9.0.0: - resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} - engines: {node: '>=14'} - peerDependencies: - typescript: '>=4.9.5' - peerDependenciesMeta: - typescript: - optional: true - - critters@0.0.22: - resolution: {integrity: sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==} - - cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} - engines: {node: '>= 8'} - - css-loader@6.10.0: - resolution: {integrity: sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==} - engines: {node: '>= 12.13.0'} - peerDependencies: - '@rspack/core': 0.x || 1.x - webpack: ^5.0.0 - peerDependenciesMeta: - '@rspack/core': - optional: true - webpack: - optional: true - - css-select@5.1.0: - resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==} - - css-what@6.1.0: - resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==} - engines: {node: '>= 6'} - - cssesc@3.0.0: - resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} - engines: {node: '>=4'} - hasBin: true - - custom-event@1.0.1: - resolution: {integrity: sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==} - - date-format@4.0.14: - resolution: {integrity: sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==} - engines: {node: '>=4.0'} - - debug@2.6.9: - resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - - debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - - deep-is@0.1.4: - resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} - - default-gateway@6.0.3: - resolution: {integrity: sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==} - engines: {node: '>= 10'} - - defaults@1.0.4: - resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} - - define-data-property@1.1.4: - resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} - engines: {node: '>= 0.4'} - - define-lazy-prop@2.0.0: - resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} - engines: {node: '>=8'} - - delayed-stream@1.0.0: - resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} - engines: {node: '>=0.4.0'} - - depd@1.1.2: - resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} - engines: {node: '>= 0.6'} - - depd@2.0.0: - resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} - engines: {node: '>= 0.8'} - - dequal@2.0.3: - resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} - engines: {node: '>=6'} - - destroy@1.2.0: - resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - - detect-node@2.1.0: - resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==} - - di@0.0.1: - resolution: {integrity: sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==} - - diff-sequences@29.6.3: - resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - - dir-glob@3.0.1: - resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} - engines: {node: '>=8'} - - dns-packet@5.6.1: - resolution: {integrity: sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==} - engines: {node: '>=6'} - - doctrine@3.0.0: - resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} - engines: {node: '>=6.0.0'} - - dom-serialize@2.2.1: - resolution: {integrity: sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==} - - dom-serializer@2.0.0: - resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} - - domelementtype@2.3.0: - resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} - - domhandler@5.0.3: - resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} - engines: {node: '>= 4'} - - domutils@3.1.0: - resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==} - - dotenv-expand@10.0.0: - resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==} - engines: {node: '>=12'} - - dotenv@16.3.2: - resolution: {integrity: sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==} - engines: {node: '>=12'} - - duplexer@0.1.2: - resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} - - eastasianwidth@0.2.0: - resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} - - ee-first@1.1.1: - resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - - ejs@3.1.10: - resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==} - engines: {node: '>=0.10.0'} - hasBin: true - - electron-to-chromium@1.4.783: - resolution: {integrity: sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==} - - emoji-regex@8.0.0: - resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - - emoji-regex@9.2.2: - resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} - - emojis-list@3.0.0: - resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} - engines: {node: '>= 4'} - - encodeurl@1.0.2: - resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} - engines: {node: '>= 0.8'} - - encoding@0.1.13: - resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==} - - end-of-stream@1.4.4: - resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} - - engine.io-parser@5.2.2: - resolution: {integrity: sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==} - engines: {node: '>=10.0.0'} - - engine.io@6.5.4: - resolution: {integrity: sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==} - engines: {node: '>=10.2.0'} - - enhanced-resolve@5.16.1: - resolution: {integrity: sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==} - engines: {node: '>=10.13.0'} - - enquirer@2.3.6: - resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} - engines: {node: '>=8.6'} - - ent@2.2.0: - resolution: {integrity: sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==} - - entities@4.5.0: - resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} - engines: {node: '>=0.12'} - - env-paths@2.2.1: - resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} - engines: {node: '>=6'} - - err-code@2.0.3: - resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} - - errno@0.1.8: - resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==} - hasBin: true - - error-ex@1.3.2: - resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} - - es-define-property@1.0.0: - resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} - engines: {node: '>= 0.4'} - - es-errors@1.3.0: - resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} - engines: {node: '>= 0.4'} - - es-module-lexer@1.5.3: - resolution: {integrity: sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==} - - esbuild-wasm@0.20.1: - resolution: {integrity: sha512-6v/WJubRsjxBbQdz6izgvx7LsVFvVaGmSdwrFHmEzoVgfXL89hkKPoQHsnVI2ngOkcBUQT9kmAM1hVL1k/Av4A==} - engines: {node: '>=12'} - hasBin: true - - esbuild@0.19.12: - resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} - engines: {node: '>=12'} - hasBin: true - - esbuild@0.20.1: - resolution: {integrity: sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==} - engines: {node: '>=12'} - hasBin: true - - escalade@3.1.2: - resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} - engines: {node: '>=6'} - - escape-html@1.0.3: - resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} - - escape-string-regexp@1.0.5: - resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} - engines: {node: '>=0.8.0'} - - escape-string-regexp@4.0.0: - resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} - engines: {node: '>=10'} - - eslint-scope@5.1.1: - resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} - engines: {node: '>=8.0.0'} - - eslint-scope@7.2.2: - resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - - eslint-scope@8.0.1: - resolution: {integrity: sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - eslint-visitor-keys@3.4.3: - resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - - eslint@8.57.0: - resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - hasBin: true - - espree@9.6.1: - resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - - esprima@4.0.1: - resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} - engines: {node: '>=4'} - hasBin: true - - esquery@1.5.0: - resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==} - engines: {node: '>=0.10'} - - esrecurse@4.3.0: - resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} - engines: {node: '>=4.0'} - - estraverse@4.3.0: - resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} - engines: {node: '>=4.0'} - - estraverse@5.3.0: - resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} - engines: {node: '>=4.0'} - - esutils@2.0.3: - resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} - engines: {node: '>=0.10.0'} - - etag@1.8.1: - resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} - engines: {node: '>= 0.6'} - - eventemitter3@4.0.7: - resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} - - events@3.3.0: - resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} - engines: {node: '>=0.8.x'} - - execa@5.1.1: - resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} - engines: {node: '>=10'} - - exponential-backoff@3.1.1: - resolution: {integrity: sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==} - - express@4.19.2: - resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==} - engines: {node: '>= 0.10.0'} - - extend@3.0.2: - resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} - - external-editor@3.1.0: - resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} - engines: {node: '>=4'} - - fast-deep-equal@3.1.3: - resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - - fast-glob@3.3.2: - resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} - engines: {node: '>=8.6.0'} - - fast-json-stable-stringify@2.1.0: - resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - - fast-levenshtein@2.0.6: - resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} - - fastq@1.17.1: - resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} - - faye-websocket@0.11.4: - resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} - engines: {node: '>=0.8.0'} - - figures@3.2.0: - resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} - engines: {node: '>=8'} - - file-entry-cache@6.0.1: - resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} - engines: {node: ^10.12.0 || >=12.0.0} - - filelist@1.0.4: - resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} - - fill-range@7.1.1: - resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} - engines: {node: '>=8'} - - finalhandler@1.1.2: - resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==} - engines: {node: '>= 0.8'} - - finalhandler@1.2.0: - resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} - engines: {node: '>= 0.8'} - - find-cache-dir@4.0.0: - resolution: {integrity: sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==} - engines: {node: '>=14.16'} - - find-up@4.1.0: - resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} - engines: {node: '>=8'} - - find-up@5.0.0: - resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} - engines: {node: '>=10'} - - find-up@6.3.0: - resolution: {integrity: sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - flat-cache@3.2.0: - resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} - engines: {node: ^10.12.0 || >=12.0.0} - - flat@5.0.2: - resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} - hasBin: true - - flatted@3.3.1: - resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} - - follow-redirects@1.15.6: - resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - - foreground-child@3.1.1: - resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} - engines: {node: '>=14'} - - form-data@4.0.0: - resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} - engines: {node: '>= 6'} - - forwarded@0.2.0: - resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} - engines: {node: '>= 0.6'} - - fraction.js@4.3.7: - resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==} - - fresh@0.5.2: - resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} - engines: {node: '>= 0.6'} - - fs-constants@1.0.0: - resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} - - fs-extra@11.2.0: - resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==} - engines: {node: '>=14.14'} - - fs-extra@8.1.0: - resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} - engines: {node: '>=6 <7 || >=8'} - - fs-minipass@2.1.0: - resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} - engines: {node: '>= 8'} - - fs-minipass@3.0.3: - resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - fs-monkey@1.0.6: - resolution: {integrity: sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==} - - fs.realpath@1.0.0: - resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - - fsevents@2.3.3: - resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - - function-bind@1.1.2: - resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - - gensync@1.0.0-beta.2: - resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} - engines: {node: '>=6.9.0'} - - get-caller-file@2.0.5: - resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} - engines: {node: 6.* || 8.* || >= 10.*} - - get-intrinsic@1.2.4: - resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} - engines: {node: '>= 0.4'} - - get-package-type@0.1.0: - resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} - engines: {node: '>=8.0.0'} - - get-stream@6.0.1: - resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} - engines: {node: '>=10'} - - glob-parent@5.1.2: - resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} - engines: {node: '>= 6'} - - glob-parent@6.0.2: - resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} - engines: {node: '>=10.13.0'} - - glob-to-regexp@0.4.1: - resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} - - glob@10.4.1: - resolution: {integrity: sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==} - engines: {node: '>=16 || 14 >=14.18'} - hasBin: true - - glob@7.2.3: - resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} - deprecated: Glob versions prior to v9 are no longer supported - - globals@11.12.0: - resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} - engines: {node: '>=4'} - - globals@13.24.0: - resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} - engines: {node: '>=8'} - - globby@11.1.0: - resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} - engines: {node: '>=10'} - - globby@13.2.2: - resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - gopd@1.0.1: - resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} - - graceful-fs@4.2.11: - resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - - graphemer@1.4.0: - resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - - graphql@16.8.1: - resolution: {integrity: sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==} - engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} - - handle-thing@2.0.1: - resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==} - - has-flag@3.0.0: - resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} - engines: {node: '>=4'} - - has-flag@4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} - engines: {node: '>=8'} - - has-property-descriptors@1.0.2: - resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - - has-proto@1.0.3: - resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} - engines: {node: '>= 0.4'} - - has-symbols@1.0.3: - resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} - engines: {node: '>= 0.4'} - - hasown@2.0.2: - resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} - engines: {node: '>= 0.4'} - - headers-polyfill@4.0.3: - resolution: {integrity: sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==} - - hosted-git-info@7.0.2: - resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==} - engines: {node: ^16.14.0 || >=18.0.0} - - hpack.js@2.1.6: - resolution: {integrity: sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==} - - html-entities@2.5.2: - resolution: {integrity: sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==} - - html-escaper@2.0.2: - resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} - - htmlparser2@8.0.2: - resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==} - - http-cache-semantics@4.1.1: - resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==} - - http-deceiver@1.2.7: - resolution: {integrity: sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==} - - http-errors@1.6.3: - resolution: {integrity: sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==} - engines: {node: '>= 0.6'} - - http-errors@2.0.0: - resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} - engines: {node: '>= 0.8'} - - http-parser-js@0.5.8: - resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==} - - http-proxy-agent@7.0.2: - resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} - engines: {node: '>= 14'} - - http-proxy-middleware@2.0.6: - resolution: {integrity: sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@types/express': ^4.17.13 - peerDependenciesMeta: - '@types/express': - optional: true - - http-proxy@1.18.1: - resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} - engines: {node: '>=8.0.0'} - - https-proxy-agent@7.0.4: - resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==} - engines: {node: '>= 14'} - - human-signals@2.1.0: - resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} - engines: {node: '>=10.17.0'} - - iconv-lite@0.4.24: - resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} - engines: {node: '>=0.10.0'} - - iconv-lite@0.6.3: - resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} - engines: {node: '>=0.10.0'} - - icss-utils@5.1.0: - resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - - ieee754@1.2.1: - resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} - - ignore-walk@6.0.5: - resolution: {integrity: sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - ignore@5.3.1: - resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} - engines: {node: '>= 4'} - - image-size@0.5.5: - resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==} - engines: {node: '>=0.10.0'} - hasBin: true - - immutable@4.3.6: - resolution: {integrity: sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==} - - import-fresh@3.3.0: - resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} - engines: {node: '>=6'} - - imurmurhash@0.1.4: - resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} - engines: {node: '>=0.8.19'} - - indent-string@4.0.0: - resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} - engines: {node: '>=8'} - - inflight@1.0.6: - resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} - deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful. - - inherits@2.0.3: - resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} - - inherits@2.0.4: - resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - - ini@4.1.2: - resolution: {integrity: sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - inquirer@9.2.15: - resolution: {integrity: sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==} - engines: {node: '>=18'} - - ip-address@9.0.5: - resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==} - engines: {node: '>= 12'} - - ipaddr.js@1.9.1: - resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} - engines: {node: '>= 0.10'} - - ipaddr.js@2.2.0: - resolution: {integrity: sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==} - engines: {node: '>= 10'} - - is-arrayish@0.2.1: - resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} - - is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - - is-core-module@2.13.1: - resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} - - is-docker@2.2.1: - resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} - engines: {node: '>=8'} - hasBin: true - - is-extglob@2.1.1: - resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} - engines: {node: '>=0.10.0'} - - is-fullwidth-code-point@3.0.0: - resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} - engines: {node: '>=8'} - - is-glob@4.0.3: - resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} - engines: {node: '>=0.10.0'} - - is-interactive@1.0.0: - resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==} - engines: {node: '>=8'} - - is-lambda@1.0.1: - resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==} - - is-node-process@1.2.0: - resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==} - - is-number@7.0.0: - resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} - engines: {node: '>=0.12.0'} - - is-path-inside@3.0.3: - resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} - engines: {node: '>=8'} - - is-plain-obj@3.0.0: - resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==} - engines: {node: '>=10'} - - is-plain-object@2.0.4: - resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==} - engines: {node: '>=0.10.0'} - - is-stream@2.0.1: - resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} - engines: {node: '>=8'} - - is-unicode-supported@0.1.0: - resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} - engines: {node: '>=10'} - - is-what@3.14.1: - resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==} - - is-wsl@2.2.0: - resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} - engines: {node: '>=8'} - - isarray@1.0.0: - resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} - - isbinaryfile@4.0.10: - resolution: {integrity: sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==} - engines: {node: '>= 8.0.0'} - - isexe@2.0.0: - resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - - isexe@3.1.1: - resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==} - engines: {node: '>=16'} - - isobject@3.0.1: - resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==} - engines: {node: '>=0.10.0'} - - istanbul-lib-coverage@3.2.2: - resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==} - engines: {node: '>=8'} - - istanbul-lib-instrument@5.2.1: - resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==} - engines: {node: '>=8'} - - istanbul-lib-report@3.0.1: - resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==} - engines: {node: '>=10'} - - istanbul-lib-source-maps@4.0.1: - resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} - engines: {node: '>=10'} - - istanbul-reports@3.1.7: - resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==} - engines: {node: '>=8'} - - jackspeak@3.1.2: - resolution: {integrity: sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==} - engines: {node: '>=14'} - - jake@10.9.1: - resolution: {integrity: sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==} - engines: {node: '>=10'} - hasBin: true - - jasmine-core@4.6.1: - resolution: {integrity: sha512-VYz/BjjmC3klLJlLwA4Kw8ytk0zDSmbbDLNs794VnWmkcCB7I9aAL/D48VNQtmITyPvea2C3jdUMfc3kAoy0PQ==} - - jest-diff@29.7.0: - resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - - jest-get-type@29.6.3: - resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - - jest-worker@27.5.1: - resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} - engines: {node: '>= 10.13.0'} - - jiti@1.21.0: - resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} - hasBin: true - - js-tokens@4.0.0: - resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - - js-yaml@3.14.1: - resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} - hasBin: true - - js-yaml@4.1.0: - resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} - hasBin: true - - jsbn@1.1.0: - resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==} - - jsesc@0.5.0: - resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} - hasBin: true - - jsesc@2.5.2: - resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} - engines: {node: '>=4'} - hasBin: true - - json-buffer@3.0.1: - resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} - - json-parse-even-better-errors@2.3.1: - resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} - - json-parse-even-better-errors@3.0.2: - resolution: {integrity: sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - json-schema-traverse@0.4.1: - resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - - json-schema-traverse@1.0.0: - resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} - - json-stable-stringify-without-jsonify@1.0.1: - resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - - json5@2.2.3: - resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} - engines: {node: '>=6'} - hasBin: true - - jsonc-parser@3.2.0: - resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} - - jsonc-parser@3.2.1: - resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==} - - jsonfile@4.0.0: - resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} - - jsonfile@6.1.0: - resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} - - jsonparse@1.3.1: - resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==} - engines: {'0': node >= 0.2.0} - - karma-chrome-launcher@3.2.0: - resolution: {integrity: sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==} - - karma-coverage@2.2.1: - resolution: {integrity: sha512-yj7hbequkQP2qOSb20GuNSIyE//PgJWHwC2IydLE6XRtsnaflv+/OSGNssPjobYUlhVVagy99TQpqUt3vAUG7A==} - engines: {node: '>=10.0.0'} - - karma-jasmine-html-reporter@2.1.0: - resolution: {integrity: sha512-sPQE1+nlsn6Hwb5t+HHwyy0A1FNCVKuL1192b+XNauMYWThz2kweiBVW1DqloRpVvZIJkIoHVB7XRpK78n1xbQ==} - peerDependencies: - jasmine-core: ^4.0.0 || ^5.0.0 - karma: ^6.0.0 - karma-jasmine: ^5.0.0 - - karma-jasmine@5.1.0: - resolution: {integrity: sha512-i/zQLFrfEpRyQoJF9fsCdTMOF5c2dK7C7OmsuKg2D0YSsuZSfQDiLuaiktbuio6F2wiCsZSnSnieIQ0ant/uzQ==} - engines: {node: '>=12'} - peerDependencies: - karma: ^6.0.0 - - karma-source-map-support@1.4.0: - resolution: {integrity: sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==} - - karma@6.4.3: - resolution: {integrity: sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==} - engines: {node: '>= 10'} - hasBin: true - - keyv@4.5.4: - resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} - - kind-of@6.0.3: - resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} - engines: {node: '>=0.10.0'} - - klona@2.0.6: - resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==} - engines: {node: '>= 8'} - - launch-editor@2.6.1: - resolution: {integrity: sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==} - - less-loader@11.1.0: - resolution: {integrity: sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==} - engines: {node: '>= 14.15.0'} - peerDependencies: - less: ^3.5.0 || ^4.0.0 - webpack: ^5.0.0 - - less@4.2.0: - resolution: {integrity: sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==} - engines: {node: '>=6'} - hasBin: true - - levn@0.4.1: - resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} - engines: {node: '>= 0.8.0'} - - license-webpack-plugin@4.0.2: - resolution: {integrity: sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==} - peerDependencies: - webpack: '*' - peerDependenciesMeta: - webpack: - optional: true - - lines-and-columns@1.2.4: - resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - - lines-and-columns@2.0.4: - resolution: {integrity: sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - loader-runner@4.3.0: - resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} - engines: {node: '>=6.11.5'} - - loader-utils@2.0.4: - resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==} - engines: {node: '>=8.9.0'} - - loader-utils@3.2.1: - resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==} - engines: {node: '>= 12.13.0'} - - locate-path@5.0.0: - resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} - engines: {node: '>=8'} - - locate-path@6.0.0: - resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} - engines: {node: '>=10'} - - locate-path@7.2.0: - resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - lodash.debounce@4.0.8: - resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} - - lodash.merge@4.6.2: - resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} - - lodash@4.17.21: - resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - - log-symbols@4.1.0: - resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} - engines: {node: '>=10'} - - log4js@6.9.1: - resolution: {integrity: sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==} - engines: {node: '>=8.0'} - - lru-cache@10.2.2: - resolution: {integrity: sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==} - engines: {node: 14 || >=16.14} - - lru-cache@5.1.1: - resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} - - lru-cache@6.0.0: - resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} - engines: {node: '>=10'} - - magic-string@0.30.8: - resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} - engines: {node: '>=12'} - - make-dir@2.1.0: - resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==} - engines: {node: '>=6'} - - make-dir@4.0.0: - resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} - engines: {node: '>=10'} - - make-fetch-happen@13.0.1: - resolution: {integrity: sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==} - engines: {node: ^16.14.0 || >=18.0.0} - - media-typer@0.3.0: - resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} - engines: {node: '>= 0.6'} - - memfs@3.5.3: - resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==} - engines: {node: '>= 4.0.0'} - - merge-descriptors@1.0.1: - resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} - - merge-stream@2.0.0: - resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} - - merge2@1.4.1: - resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} - engines: {node: '>= 8'} - - methods@1.1.2: - resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} - engines: {node: '>= 0.6'} - - micromatch@4.0.7: - resolution: {integrity: sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==} - engines: {node: '>=8.6'} - - mime-db@1.52.0: - resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} - engines: {node: '>= 0.6'} - - mime-types@2.1.35: - resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} - engines: {node: '>= 0.6'} - - mime@1.6.0: - resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} - engines: {node: '>=4'} - hasBin: true - - mime@2.6.0: - resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==} - engines: {node: '>=4.0.0'} - hasBin: true - - mimic-fn@2.1.0: - resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} - engines: {node: '>=6'} - - mini-css-extract-plugin@2.8.1: - resolution: {integrity: sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==} - engines: {node: '>= 12.13.0'} - peerDependencies: - webpack: ^5.0.0 - - minimalistic-assert@1.0.1: - resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} - - minimatch@3.1.2: - resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} - - minimatch@5.1.6: - resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} - engines: {node: '>=10'} - - minimatch@9.0.3: - resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} - engines: {node: '>=16 || 14 >=14.17'} - - minimatch@9.0.4: - resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==} - engines: {node: '>=16 || 14 >=14.17'} - - minimist@1.2.8: - resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - - minipass-collect@2.0.1: - resolution: {integrity: sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==} - engines: {node: '>=16 || 14 >=14.17'} - - minipass-fetch@3.0.5: - resolution: {integrity: sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - minipass-flush@1.0.5: - resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==} - engines: {node: '>= 8'} - - minipass-json-stream@1.0.1: - resolution: {integrity: sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==} - - minipass-pipeline@1.2.4: - resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==} - engines: {node: '>=8'} - - minipass-sized@1.0.3: - resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==} - engines: {node: '>=8'} - - minipass@3.3.6: - resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} - engines: {node: '>=8'} - - minipass@5.0.0: - resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} - engines: {node: '>=8'} - - minipass@7.1.2: - resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} - engines: {node: '>=16 || 14 >=14.17'} - - minizlib@2.1.2: - resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} - engines: {node: '>= 8'} - - mkdirp@0.5.6: - resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} - hasBin: true - - mkdirp@1.0.4: - resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} - engines: {node: '>=10'} - hasBin: true - - mrmime@2.0.0: - resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==} - engines: {node: '>=10'} - - ms@2.0.0: - resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} - - ms@2.1.2: - resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - - ms@2.1.3: - resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - - msw@2.3.0: - resolution: {integrity: sha512-cDr1q/QTMzaWhY8n9lpGhceY209k29UZtdTgJ3P8Bzne3TSMchX2EM/ldvn4ATLOktpCefCU2gcEgzHc31GTPw==} - engines: {node: '>=18'} - hasBin: true - peerDependencies: - typescript: '>= 4.7.x' - peerDependenciesMeta: - typescript: - optional: true - - multicast-dns@7.2.5: - resolution: {integrity: sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==} - hasBin: true - - mute-stream@1.0.0: - resolution: {integrity: sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - nanoid@3.3.7: - resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - - natural-compare@1.4.0: - resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} - - needle@3.3.1: - resolution: {integrity: sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==} - engines: {node: '>= 4.4.x'} - hasBin: true - - negotiator@0.6.3: - resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} - engines: {node: '>= 0.6'} - - neo-async@2.6.2: - resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - - nice-napi@1.0.2: - resolution: {integrity: sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==} - os: ['!win32'] - - node-addon-api@3.2.1: - resolution: {integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==} - - node-forge@1.3.1: - resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} - engines: {node: '>= 6.13.0'} - - node-gyp-build@4.8.1: - resolution: {integrity: sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==} - hasBin: true - - node-gyp@10.1.0: - resolution: {integrity: sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==} - engines: {node: ^16.14.0 || >=18.0.0} - hasBin: true - - node-machine-id@1.1.12: - resolution: {integrity: sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==} - - node-releases@2.0.14: - resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} - - nopt@7.2.1: - resolution: {integrity: sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - hasBin: true - - normalize-package-data@6.0.1: - resolution: {integrity: sha512-6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==} - engines: {node: ^16.14.0 || >=18.0.0} - - normalize-path@3.0.0: - resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} - engines: {node: '>=0.10.0'} - - normalize-range@0.1.2: - resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==} - engines: {node: '>=0.10.0'} - - npm-bundled@3.0.1: - resolution: {integrity: sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - npm-install-checks@6.3.0: - resolution: {integrity: sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - npm-normalize-package-bin@3.0.1: - resolution: {integrity: sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - npm-package-arg@11.0.1: - resolution: {integrity: sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==} - engines: {node: ^16.14.0 || >=18.0.0} - - npm-packlist@8.0.2: - resolution: {integrity: sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - npm-pick-manifest@9.0.0: - resolution: {integrity: sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==} - engines: {node: ^16.14.0 || >=18.0.0} - - npm-registry-fetch@16.2.1: - resolution: {integrity: sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==} - engines: {node: ^16.14.0 || >=18.0.0} - - npm-run-path@4.0.1: - resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} - engines: {node: '>=8'} - - nth-check@2.1.1: - resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} - - nx@19.1.0: - resolution: {integrity: sha512-ia9XIL4QWli02WNZ3tLSpWvIYJVOWcikeELJwouZOwHKT7RA9i6vCQjKsIKWSFlUs47WDwiYiLSsMxR5KTqk8Q==} - hasBin: true - peerDependencies: - '@swc-node/register': ^1.8.0 - '@swc/core': ^1.3.85 - peerDependenciesMeta: - '@swc-node/register': - optional: true - '@swc/core': - optional: true - - object-assign@4.1.1: - resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} - engines: {node: '>=0.10.0'} - - object-inspect@1.13.1: - resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} - - obuf@1.1.2: - resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==} - - on-finished@2.3.0: - resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==} - engines: {node: '>= 0.8'} - - on-finished@2.4.1: - resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} - engines: {node: '>= 0.8'} - - on-headers@1.0.2: - resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==} - engines: {node: '>= 0.8'} - - once@1.4.0: - resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} - - onetime@5.1.2: - resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} - engines: {node: '>=6'} - - open@8.4.2: - resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} - engines: {node: '>=12'} - - optionator@0.9.4: - resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} - engines: {node: '>= 0.8.0'} - - ora@5.3.0: - resolution: {integrity: sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==} - engines: {node: '>=10'} - - ora@5.4.1: - resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==} - engines: {node: '>=10'} - - os-tmpdir@1.0.2: - resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} - engines: {node: '>=0.10.0'} - - outvariant@1.4.2: - resolution: {integrity: sha512-Ou3dJ6bA/UJ5GVHxah4LnqDwZRwAmWxrG3wtrHrbGnP4RnLCtA64A4F+ae7Y8ww660JaddSoArUR5HjipWSHAQ==} - - p-limit@2.3.0: - resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} - engines: {node: '>=6'} - - p-limit@3.1.0: - resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} - engines: {node: '>=10'} - - p-limit@4.0.0: - resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - p-locate@4.1.0: - resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} - engines: {node: '>=8'} - - p-locate@5.0.0: - resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} - engines: {node: '>=10'} - - p-locate@6.0.0: - resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - p-map@4.0.0: - resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==} - engines: {node: '>=10'} - - p-retry@4.6.2: - resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==} - engines: {node: '>=8'} - - p-try@2.2.0: - resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} - engines: {node: '>=6'} - - pacote@17.0.6: - resolution: {integrity: sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ==} - engines: {node: ^16.14.0 || >=18.0.0} - hasBin: true - - parent-module@1.0.1: - resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} - engines: {node: '>=6'} - - parse-json@5.2.0: - resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} - engines: {node: '>=8'} - - parse-node-version@1.0.1: - resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==} - engines: {node: '>= 0.10'} - - parse5-html-rewriting-stream@7.0.0: - resolution: {integrity: sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==} - - parse5-sax-parser@7.0.0: - resolution: {integrity: sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==} - - parse5@7.1.2: - resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==} - - parseurl@1.3.3: - resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} - engines: {node: '>= 0.8'} - - path-exists@4.0.0: - resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} - engines: {node: '>=8'} - - path-exists@5.0.0: - resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - path-is-absolute@1.0.1: - resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} - engines: {node: '>=0.10.0'} - - path-key@3.1.1: - resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} - engines: {node: '>=8'} - - path-parse@1.0.7: - resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - - path-scurry@1.11.1: - resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} - engines: {node: '>=16 || 14 >=14.18'} - - path-to-regexp@0.1.7: - resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} - - path-to-regexp@6.2.2: - resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==} - - path-type@4.0.0: - resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} - engines: {node: '>=8'} - - picocolors@1.0.1: - resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} - - picomatch@2.3.1: - resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} - engines: {node: '>=8.6'} - - picomatch@4.0.1: - resolution: {integrity: sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==} - engines: {node: '>=12'} - - pify@4.0.1: - resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} - engines: {node: '>=6'} - - piscina@4.4.0: - resolution: {integrity: sha512-+AQduEJefrOApE4bV7KRmp3N2JnnyErlVqq4P/jmko4FPz9Z877BCccl/iB3FdrWSUkvbGV9Kan/KllJgat3Vg==} - - pkg-dir@7.0.0: - resolution: {integrity: sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==} - engines: {node: '>=14.16'} - - postcss-loader@8.1.1: - resolution: {integrity: sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==} - engines: {node: '>= 18.12.0'} - peerDependencies: - '@rspack/core': 0.x || 1.x - postcss: ^7.0.0 || ^8.0.1 - webpack: ^5.0.0 - peerDependenciesMeta: - '@rspack/core': - optional: true - webpack: - optional: true - - postcss-media-query-parser@0.2.3: - resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==} - - postcss-modules-extract-imports@3.1.0: - resolution: {integrity: sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - - postcss-modules-local-by-default@4.0.5: - resolution: {integrity: sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - - postcss-modules-scope@3.2.0: - resolution: {integrity: sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - - postcss-modules-values@4.0.0: - resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - - postcss-selector-parser@6.1.0: - resolution: {integrity: sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==} - engines: {node: '>=4'} - - postcss-value-parser@4.2.0: - resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - - postcss@8.4.35: - resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} - engines: {node: ^10 || ^12 || >=14} - - prelude-ls@1.2.1: - resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} - engines: {node: '>= 0.8.0'} - - prettier@3.2.5: - resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} - engines: {node: '>=14'} - hasBin: true - - pretty-format@29.7.0: - resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - - primeflex@3.3.1: - resolution: {integrity: sha512-zaOq3YvcOYytbAmKv3zYc+0VNS9Wg5d37dfxZnveKBFPr7vEIwfV5ydrpiouTft8MVW6qNjfkaQphHSnvgQbpQ==} - - primeicons@6.0.1: - resolution: {integrity: sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA==} - - primeng@17.2.0: - resolution: {integrity: sha512-pajexYLeJWE6+pmDy0gHrMiQ/zLq4il54EcRNWC0jTNgJvWhoz/K/7NL9kXf2H4eWexNcrEieLnO9ko5uj3cVg==} - peerDependencies: - '@angular/common': ^17.0.0 - '@angular/core': ^17.0.0 - '@angular/forms': ^17.0.0 - rxjs: ^6.0.0 || ^7.8.1 - zone.js: ~0.14.0 - - prismjs@1.29.0: - resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==} - engines: {node: '>=6'} - - proc-log@3.0.0: - resolution: {integrity: sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - proc-log@4.2.0: - resolution: {integrity: sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - process-nextick-args@2.0.1: - resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} - - promise-inflight@1.0.1: - resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==} - peerDependencies: - bluebird: '*' - peerDependenciesMeta: - bluebird: - optional: true - - promise-retry@2.0.1: - resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==} - engines: {node: '>=10'} - - proxy-addr@2.0.7: - resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} - engines: {node: '>= 0.10'} - - proxy-from-env@1.1.0: - resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - - prr@1.0.1: - resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} - - punycode@2.3.1: - resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} - engines: {node: '>=6'} - - qjobs@1.2.0: - resolution: {integrity: sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==} - engines: {node: '>=0.9'} - - qs@6.11.0: - resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} - engines: {node: '>=0.6'} - - queue-microtask@1.2.3: - resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - - randombytes@2.1.0: - resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} - - range-parser@1.2.1: - resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} - engines: {node: '>= 0.6'} - - raw-body@2.5.2: - resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} - engines: {node: '>= 0.8'} - - react-is@18.3.1: - resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} - - read-package-json-fast@3.0.2: - resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - read-package-json@7.0.1: - resolution: {integrity: sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==} - engines: {node: ^16.14.0 || >=18.0.0} - deprecated: This package is no longer supported. Please use @npmcli/package-json instead. - - readable-stream@2.3.8: - resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} - - readable-stream@3.6.2: - resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} - engines: {node: '>= 6'} - - readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - - reflect-metadata@0.2.2: - resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==} - - regenerate-unicode-properties@10.1.1: - resolution: {integrity: sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==} - engines: {node: '>=4'} - - regenerate@1.4.2: - resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} - - regenerator-runtime@0.14.1: - resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} - - regenerator-transform@0.15.2: - resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==} - - regex-parser@2.3.0: - resolution: {integrity: sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==} - - regexpu-core@5.3.2: - resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==} - engines: {node: '>=4'} - - regjsparser@0.9.1: - resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==} - hasBin: true - - require-directory@2.1.1: - resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} - engines: {node: '>=0.10.0'} - - require-from-string@2.0.2: - resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} - engines: {node: '>=0.10.0'} - - requires-port@1.0.0: - resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} - - resolve-from@4.0.0: - resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} - engines: {node: '>=4'} - - resolve-from@5.0.0: - resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} - engines: {node: '>=8'} - - resolve-url-loader@5.0.0: - resolution: {integrity: sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==} - engines: {node: '>=12'} - - resolve@1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} - hasBin: true - - restore-cursor@3.1.0: - resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==} - engines: {node: '>=8'} - - retry@0.12.0: - resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==} - engines: {node: '>= 4'} - - retry@0.13.1: - resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==} - engines: {node: '>= 4'} - - reusify@1.0.4: - resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} - engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - - rfdc@1.3.1: - resolution: {integrity: sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==} - - rimraf@3.0.2: - resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} - deprecated: Rimraf versions prior to v4 are no longer supported - hasBin: true - - rollup@4.18.0: - resolution: {integrity: sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - - run-async@3.0.0: - resolution: {integrity: sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==} - engines: {node: '>=0.12.0'} - - run-parallel@1.2.0: - resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} - - rxjs@7.8.1: - resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} - - safe-buffer@5.1.2: - resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} - - safe-buffer@5.2.1: - resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} - - safer-buffer@2.1.2: - resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - - sass-loader@14.1.1: - resolution: {integrity: sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==} - engines: {node: '>= 18.12.0'} - peerDependencies: - '@rspack/core': 0.x || 1.x - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 - sass: ^1.3.0 - sass-embedded: '*' - webpack: ^5.0.0 - peerDependenciesMeta: - '@rspack/core': - optional: true - node-sass: - optional: true - sass: - optional: true - sass-embedded: - optional: true - webpack: - optional: true - - sass@1.71.1: - resolution: {integrity: sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==} - engines: {node: '>=14.0.0'} - hasBin: true - - sax@1.4.1: - resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==} - - schema-utils@3.3.0: - resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==} - engines: {node: '>= 10.13.0'} - - schema-utils@4.2.0: - resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==} - engines: {node: '>= 12.13.0'} - - select-hose@2.0.0: - resolution: {integrity: sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==} - - selfsigned@2.4.1: - resolution: {integrity: sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==} - engines: {node: '>=10'} - - semver@5.7.2: - resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} - hasBin: true - - semver@6.3.1: - resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} - hasBin: true - - semver@7.6.0: - resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} - engines: {node: '>=10'} - hasBin: true - - semver@7.6.2: - resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} - engines: {node: '>=10'} - hasBin: true - - send@0.18.0: - resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} - engines: {node: '>= 0.8.0'} - - serialize-javascript@6.0.2: - resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} - - serve-index@1.9.1: - resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==} - engines: {node: '>= 0.8.0'} - - serve-static@1.15.0: - resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} - engines: {node: '>= 0.8.0'} - - set-function-length@1.2.2: - resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} - engines: {node: '>= 0.4'} - - setprototypeof@1.1.0: - resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==} - - setprototypeof@1.2.0: - resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} - - shallow-clone@3.0.1: - resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==} - engines: {node: '>=8'} - - shebang-command@2.0.0: - resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} - engines: {node: '>=8'} - - shebang-regex@3.0.0: - resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} - engines: {node: '>=8'} - - shell-quote@1.8.1: - resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==} - - side-channel@1.0.6: - resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} - engines: {node: '>= 0.4'} - - signal-exit@3.0.7: - resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - - signal-exit@4.1.0: - resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} - engines: {node: '>=14'} - - sigstore@2.3.1: - resolution: {integrity: sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==} - engines: {node: ^16.14.0 || >=18.0.0} - - slash@3.0.0: - resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} - engines: {node: '>=8'} - - slash@4.0.0: - resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==} - engines: {node: '>=12'} - - smart-buffer@4.2.0: - resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} - engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} - - socket.io-adapter@2.5.4: - resolution: {integrity: sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==} - - socket.io-parser@4.2.4: - resolution: {integrity: sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==} - engines: {node: '>=10.0.0'} - - socket.io@4.7.5: - resolution: {integrity: sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==} - engines: {node: '>=10.2.0'} - - sockjs@0.3.24: - resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} - - socks-proxy-agent@8.0.3: - resolution: {integrity: sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==} - engines: {node: '>= 14'} - - socks@2.8.3: - resolution: {integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==} - engines: {node: '>= 10.0.0', npm: '>= 3.0.0'} - - source-map-js@1.2.0: - resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} - engines: {node: '>=0.10.0'} - - source-map-loader@5.0.0: - resolution: {integrity: sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA==} - engines: {node: '>= 18.12.0'} - peerDependencies: - webpack: ^5.72.1 - - source-map-support@0.5.21: - resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} - - source-map@0.6.1: - resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} - engines: {node: '>=0.10.0'} - - source-map@0.7.4: - resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} - engines: {node: '>= 8'} - - spdx-correct@3.2.0: - resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} - - spdx-exceptions@2.5.0: - resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} - - spdx-expression-parse@3.0.1: - resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} - - spdx-license-ids@3.0.18: - resolution: {integrity: sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==} - - spdy-transport@3.0.0: - resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} - - spdy@4.0.2: - resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} - engines: {node: '>=6.0.0'} - - sprintf-js@1.0.3: - resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} - - sprintf-js@1.1.3: - resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==} - - ssri@10.0.6: - resolution: {integrity: sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - statuses@1.5.0: - resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==} - engines: {node: '>= 0.6'} - - statuses@2.0.1: - resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} - engines: {node: '>= 0.8'} - - streamroller@3.1.5: - resolution: {integrity: sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==} - engines: {node: '>=8.0'} - - strict-event-emitter@0.5.1: - resolution: {integrity: sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==} - - string-width@4.2.3: - resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} - engines: {node: '>=8'} - - string-width@5.1.2: - resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} - engines: {node: '>=12'} - - string_decoder@1.1.1: - resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} - - string_decoder@1.3.0: - resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} - - strip-ansi@6.0.1: - resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} - engines: {node: '>=8'} - - strip-ansi@7.1.0: - resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} - engines: {node: '>=12'} - - strip-bom@3.0.0: - resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} - engines: {node: '>=4'} - - strip-final-newline@2.0.0: - resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} - engines: {node: '>=6'} - - strip-json-comments@3.1.1: - resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} - engines: {node: '>=8'} - - strong-log-transformer@2.1.0: - resolution: {integrity: sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==} - engines: {node: '>=4'} - hasBin: true - - supports-color@5.5.0: - resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} - engines: {node: '>=4'} - - supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} - - supports-color@8.1.1: - resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} - engines: {node: '>=10'} - - supports-preserve-symlinks-flag@1.0.0: - resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} - engines: {node: '>= 0.4'} - - symbol-observable@4.0.0: - resolution: {integrity: sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==} - engines: {node: '>=0.10'} - - tapable@2.2.1: - resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} - engines: {node: '>=6'} - - tar-stream@2.2.0: - resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} - engines: {node: '>=6'} - - tar@6.2.1: - resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} - engines: {node: '>=10'} - - terser-webpack-plugin@5.3.10: - resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==} - engines: {node: '>= 10.13.0'} - peerDependencies: - '@swc/core': '*' - esbuild: '*' - uglify-js: '*' - webpack: ^5.1.0 - peerDependenciesMeta: - '@swc/core': - optional: true - esbuild: - optional: true - uglify-js: - optional: true - - terser@5.29.1: - resolution: {integrity: sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==} - engines: {node: '>=10'} - hasBin: true - - test-exclude@6.0.0: - resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} - engines: {node: '>=8'} - - text-table@0.2.0: - resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} - - through@2.3.8: - resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} - - thunky@1.1.0: - resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==} - - tmp@0.0.33: - resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} - engines: {node: '>=0.6.0'} - - tmp@0.2.3: - resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==} - engines: {node: '>=14.14'} - - to-fast-properties@2.0.0: - resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} - engines: {node: '>=4'} - - to-regex-range@5.0.1: - resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} - engines: {node: '>=8.0'} - - toidentifier@1.0.1: - resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} - engines: {node: '>=0.6'} - - tree-kill@1.2.2: - resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} - hasBin: true - - ts-api-utils@1.3.0: - resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} - engines: {node: '>=16'} - peerDependencies: - typescript: '>=4.2.0' - - tsconfig-paths@4.2.0: - resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} - engines: {node: '>=6'} - - tslib@2.6.2: - resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} - - tuf-js@2.2.1: - resolution: {integrity: sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==} - engines: {node: ^16.14.0 || >=18.0.0} - - type-check@0.4.0: - resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} - engines: {node: '>= 0.8.0'} - - type-fest@0.20.2: - resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} - engines: {node: '>=10'} - - type-fest@0.21.3: - resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} - engines: {node: '>=10'} - - type-fest@4.18.3: - resolution: {integrity: sha512-Q08/0IrpvM+NMY9PA2rti9Jb+JejTddwmwmVQGskAlhtcrw1wsRzoR6ode6mR+OAabNa75w/dxedSUY2mlphaQ==} - engines: {node: '>=16'} - - type-is@1.6.18: - resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} - engines: {node: '>= 0.6'} - - typed-assert@1.0.9: - resolution: {integrity: sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==} - - typescript@5.2.2: - resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} - engines: {node: '>=14.17'} - hasBin: true - - ua-parser-js@0.7.37: - resolution: {integrity: sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==} - - undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - - undici@6.11.1: - resolution: {integrity: sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==} - engines: {node: '>=18.0'} - - unicode-canonical-property-names-ecmascript@2.0.0: - resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==} - engines: {node: '>=4'} - - unicode-match-property-ecmascript@2.0.0: - resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==} - engines: {node: '>=4'} - - unicode-match-property-value-ecmascript@2.1.0: - resolution: {integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==} - engines: {node: '>=4'} - - unicode-property-aliases-ecmascript@2.1.0: - resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==} - engines: {node: '>=4'} - - unique-filename@3.0.0: - resolution: {integrity: sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - unique-slug@4.0.0: - resolution: {integrity: sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - universalify@0.1.2: - resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} - engines: {node: '>= 4.0.0'} - - universalify@2.0.1: - resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} - engines: {node: '>= 10.0.0'} - - unpipe@1.0.0: - resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} - engines: {node: '>= 0.8'} - - update-browserslist-db@1.0.16: - resolution: {integrity: sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==} - hasBin: true - peerDependencies: - browserslist: '>= 4.21.0' - - uri-js@4.4.1: - resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} - - util-deprecate@1.0.2: - resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - - utils-merge@1.0.1: - resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} - engines: {node: '>= 0.4.0'} - - uuid@8.3.2: - resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} - hasBin: true - - validate-npm-package-license@3.0.4: - resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} - - validate-npm-package-name@5.0.1: - resolution: {integrity: sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - vary@1.1.2: - resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} - engines: {node: '>= 0.8'} - - vite@5.1.7: - resolution: {integrity: sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - - void-elements@2.0.1: - resolution: {integrity: sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==} - engines: {node: '>=0.10.0'} - - watchpack@2.4.0: - resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==} - engines: {node: '>=10.13.0'} - - wbuf@1.7.3: - resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==} - - wcwidth@1.0.1: - resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} - - webpack-dev-middleware@5.3.4: - resolution: {integrity: sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==} - engines: {node: '>= 12.13.0'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - - webpack-dev-middleware@6.1.2: - resolution: {integrity: sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==} - engines: {node: '>= 14.15.0'} - peerDependencies: - webpack: ^5.0.0 - peerDependenciesMeta: - webpack: - optional: true - - webpack-dev-server@4.15.1: - resolution: {integrity: sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==} - engines: {node: '>= 12.13.0'} - hasBin: true - peerDependencies: - webpack: ^4.37.0 || ^5.0.0 - webpack-cli: '*' - peerDependenciesMeta: - webpack: - optional: true - webpack-cli: - optional: true - - webpack-merge@5.10.0: - resolution: {integrity: sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==} - engines: {node: '>=10.0.0'} - - webpack-sources@3.2.3: - resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} - engines: {node: '>=10.13.0'} - - webpack-subresource-integrity@5.1.0: - resolution: {integrity: sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==} - engines: {node: '>= 12'} - peerDependencies: - html-webpack-plugin: '>= 5.0.0-beta.1 < 6' - webpack: ^5.12.0 - peerDependenciesMeta: - html-webpack-plugin: - optional: true - - webpack@5.90.3: - resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==} - engines: {node: '>=10.13.0'} - hasBin: true - peerDependencies: - webpack-cli: '*' - peerDependenciesMeta: - webpack-cli: - optional: true - - websocket-driver@0.7.4: - resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} - engines: {node: '>=0.8.0'} - - websocket-extensions@0.1.4: - resolution: {integrity: sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==} - engines: {node: '>=0.8.0'} - - which@1.3.1: - resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} - hasBin: true - - which@2.0.2: - resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} - engines: {node: '>= 8'} - hasBin: true - - which@4.0.0: - resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==} - engines: {node: ^16.13.0 || >=18.0.0} - hasBin: true - - wildcard@2.0.1: - resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==} - - word-wrap@1.2.5: - resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} - engines: {node: '>=0.10.0'} - - wrap-ansi@6.2.0: - resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} - engines: {node: '>=8'} - - wrap-ansi@7.0.0: - resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} - engines: {node: '>=10'} - - wrap-ansi@8.1.0: - resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} - engines: {node: '>=12'} - - wrappy@1.0.2: - resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - - ws@8.11.0: - resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==} - engines: {node: '>=10.0.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - - ws@8.17.0: - resolution: {integrity: sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==} - engines: {node: '>=10.0.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: '>=5.0.2' - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - - y18n@5.0.8: - resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} - engines: {node: '>=10'} - - yallist@3.1.1: - resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} - - yallist@4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - - yargs-parser@20.2.9: - resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} - engines: {node: '>=10'} - - yargs-parser@21.1.1: - resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} - engines: {node: '>=12'} - - yargs@16.2.0: - resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} - engines: {node: '>=10'} - - yargs@17.7.2: - resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} - engines: {node: '>=12'} - - yocto-queue@0.1.0: - resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} - engines: {node: '>=10'} - - yocto-queue@1.0.0: - resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} - engines: {node: '>=12.20'} - - zone.js@0.14.6: - resolution: {integrity: sha512-vyRNFqofdaHVdWAy7v3Bzmn84a1JHWSjpuTZROT/uYn8I3p2cmo7Ro9twFmYRQDPhiYOV7QLk0hhY4JJQVqS6Q==} - -snapshots: - - '@ampproject/remapping@2.3.0': - dependencies: - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - - '@angular-devkit/architect@0.1703.8(chokidar@3.6.0)': - dependencies: - '@angular-devkit/core': 17.3.8(chokidar@3.6.0) - rxjs: 7.8.1 - transitivePeerDependencies: - - chokidar - - '@angular-devkit/build-angular@17.3.8(@angular/compiler-cli@17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.2.2))(@types/express@4.17.21)(@types/node@20.12.12)(chokidar@3.6.0)(karma@6.4.3)(typescript@5.2.2)': - dependencies: - '@ampproject/remapping': 2.3.0 - '@angular-devkit/architect': 0.1703.8(chokidar@3.6.0) - '@angular-devkit/build-webpack': 0.1703.8(chokidar@3.6.0)(webpack-dev-server@4.15.1(webpack@5.90.3(esbuild@0.20.1)))(webpack@5.90.3(esbuild@0.20.1)) - '@angular-devkit/core': 17.3.8(chokidar@3.6.0) - '@angular/compiler-cli': 17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.2.2) - '@babel/core': 7.24.0 - '@babel/generator': 7.23.6 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-split-export-declaration': 7.22.6 - '@babel/plugin-transform-async-generator-functions': 7.23.9(@babel/core@7.24.0) - '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.24.0) - '@babel/plugin-transform-runtime': 7.24.0(@babel/core@7.24.0) - '@babel/preset-env': 7.24.0(@babel/core@7.24.0) - '@babel/runtime': 7.24.0 - '@discoveryjs/json-ext': 0.5.7 - '@ngtools/webpack': 17.3.8(@angular/compiler-cli@17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.2.2))(typescript@5.2.2)(webpack@5.90.3(esbuild@0.20.1)) - '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.1.7(@types/node@20.12.12)(less@4.2.0)(sass@1.71.1)(terser@5.29.1)) - ansi-colors: 4.1.3 - autoprefixer: 10.4.18(postcss@8.4.35) - babel-loader: 9.1.3(@babel/core@7.24.0)(webpack@5.90.3(esbuild@0.20.1)) - babel-plugin-istanbul: 6.1.1 - browserslist: 4.23.0 - copy-webpack-plugin: 11.0.0(webpack@5.90.3(esbuild@0.20.1)) - critters: 0.0.22 - css-loader: 6.10.0(webpack@5.90.3(esbuild@0.20.1)) - esbuild-wasm: 0.20.1 - fast-glob: 3.3.2 - http-proxy-middleware: 2.0.6(@types/express@4.17.21) - https-proxy-agent: 7.0.4 - inquirer: 9.2.15 - jsonc-parser: 3.2.1 - karma-source-map-support: 1.4.0 - less: 4.2.0 - less-loader: 11.1.0(less@4.2.0)(webpack@5.90.3(esbuild@0.20.1)) - license-webpack-plugin: 4.0.2(webpack@5.90.3(esbuild@0.20.1)) - loader-utils: 3.2.1 - magic-string: 0.30.8 - mini-css-extract-plugin: 2.8.1(webpack@5.90.3(esbuild@0.20.1)) - mrmime: 2.0.0 - open: 8.4.2 - ora: 5.4.1 - parse5-html-rewriting-stream: 7.0.0 - picomatch: 4.0.1 - piscina: 4.4.0 - postcss: 8.4.35 - postcss-loader: 8.1.1(postcss@8.4.35)(typescript@5.2.2)(webpack@5.90.3(esbuild@0.20.1)) - resolve-url-loader: 5.0.0 - rxjs: 7.8.1 - sass: 1.71.1 - sass-loader: 14.1.1(sass@1.71.1)(webpack@5.90.3(esbuild@0.20.1)) - semver: 7.6.0 - source-map-loader: 5.0.0(webpack@5.90.3(esbuild@0.20.1)) - source-map-support: 0.5.21 - terser: 5.29.1 - tree-kill: 1.2.2 - tslib: 2.6.2 - typescript: 5.2.2 - undici: 6.11.1 - vite: 5.1.7(@types/node@20.12.12)(less@4.2.0)(sass@1.71.1)(terser@5.29.1) - watchpack: 2.4.0 - webpack: 5.90.3(esbuild@0.20.1) - webpack-dev-middleware: 6.1.2(webpack@5.90.3(esbuild@0.20.1)) - webpack-dev-server: 4.15.1(webpack@5.90.3(esbuild@0.20.1)) - webpack-merge: 5.10.0 - webpack-subresource-integrity: 5.1.0(webpack@5.90.3(esbuild@0.20.1)) - optionalDependencies: - esbuild: 0.20.1 - karma: 6.4.3 - transitivePeerDependencies: - - '@rspack/core' - - '@swc/core' - - '@types/express' - - '@types/node' - - bufferutil - - chokidar - - debug - - html-webpack-plugin - - lightningcss - - node-sass - - sass-embedded - - stylus - - sugarss - - supports-color - - uglify-js - - utf-8-validate - - webpack-cli - - '@angular-devkit/build-webpack@0.1703.8(chokidar@3.6.0)(webpack-dev-server@4.15.1(webpack@5.90.3(esbuild@0.20.1)))(webpack@5.90.3(esbuild@0.20.1))': - dependencies: - '@angular-devkit/architect': 0.1703.8(chokidar@3.6.0) - rxjs: 7.8.1 - webpack: 5.90.3(esbuild@0.20.1) - webpack-dev-server: 4.15.1(webpack@5.90.3(esbuild@0.20.1)) - transitivePeerDependencies: - - chokidar - - '@angular-devkit/core@17.3.8(chokidar@3.6.0)': - dependencies: - ajv: 8.12.0 - ajv-formats: 2.1.1(ajv@8.12.0) - jsonc-parser: 3.2.1 - picomatch: 4.0.1 - rxjs: 7.8.1 - source-map: 0.7.4 - optionalDependencies: - chokidar: 3.6.0 - - '@angular-devkit/schematics@17.3.8(chokidar@3.6.0)': - dependencies: - '@angular-devkit/core': 17.3.8(chokidar@3.6.0) - jsonc-parser: 3.2.1 - magic-string: 0.30.8 - ora: 5.4.1 - rxjs: 7.8.1 - transitivePeerDependencies: - - chokidar - - '@angular-eslint/builder@17.5.1(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@nx/devkit': 19.1.0(nx@19.1.0) - eslint: 8.57.0 - nx: 19.1.0 - typescript: 5.2.2 - transitivePeerDependencies: - - '@swc-node/register' - - '@swc/core' - - debug - - '@angular-eslint/bundled-angular-compiler@17.5.1': {} - - '@angular-eslint/eslint-plugin-template@17.5.1(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@angular-eslint/bundled-angular-compiler': 17.5.1 - '@angular-eslint/utils': 17.5.1(eslint@8.57.0)(typescript@5.2.2) - '@typescript-eslint/type-utils': 7.10.0(eslint@8.57.0)(typescript@5.2.2) - '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.2.2) - aria-query: 5.3.0 - axobject-query: 4.0.0 - eslint: 8.57.0 - typescript: 5.2.2 - transitivePeerDependencies: - - supports-color - - '@angular-eslint/eslint-plugin@17.5.1(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@angular-eslint/bundled-angular-compiler': 17.5.1 - '@angular-eslint/utils': 17.5.1(eslint@8.57.0)(typescript@5.2.2) - '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.2.2) - eslint: 8.57.0 - typescript: 5.2.2 - transitivePeerDependencies: - - supports-color - - '@angular-eslint/schematics@17.5.1(@angular/cli@17.3.8(chokidar@3.6.0))(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@angular-eslint/eslint-plugin': 17.5.1(eslint@8.57.0)(typescript@5.2.2) - '@angular-eslint/eslint-plugin-template': 17.5.1(eslint@8.57.0)(typescript@5.2.2) - '@angular/cli': 17.3.8(chokidar@3.6.0) - '@nx/devkit': 19.1.0(nx@19.1.0) - ignore: 5.3.1 - nx: 19.1.0 - strip-json-comments: 3.1.1 - tmp: 0.2.3 - transitivePeerDependencies: - - '@swc-node/register' - - '@swc/core' - - debug - - eslint - - supports-color - - typescript - - '@angular-eslint/template-parser@17.5.1(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@angular-eslint/bundled-angular-compiler': 17.5.1 - eslint: 8.57.0 - eslint-scope: 8.0.1 - typescript: 5.2.2 - - '@angular-eslint/utils@17.5.1(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@angular-eslint/bundled-angular-compiler': 17.5.1 - '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.2.2) - eslint: 8.57.0 - typescript: 5.2.2 - transitivePeerDependencies: - - supports-color - - '@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))': - dependencies: - '@angular/core': 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - tslib: 2.6.2 - - '@angular/cdk@17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1)': - dependencies: - '@angular/common': 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1) - '@angular/core': 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - rxjs: 7.8.1 - tslib: 2.6.2 - optionalDependencies: - parse5: 7.1.2 - - '@angular/cli@17.3.8(chokidar@3.6.0)': - dependencies: - '@angular-devkit/architect': 0.1703.8(chokidar@3.6.0) - '@angular-devkit/core': 17.3.8(chokidar@3.6.0) - '@angular-devkit/schematics': 17.3.8(chokidar@3.6.0) - '@schematics/angular': 17.3.8(chokidar@3.6.0) - '@yarnpkg/lockfile': 1.1.0 - ansi-colors: 4.1.3 - ini: 4.1.2 - inquirer: 9.2.15 - jsonc-parser: 3.2.1 - npm-package-arg: 11.0.1 - npm-pick-manifest: 9.0.0 - open: 8.4.2 - ora: 5.4.1 - pacote: 17.0.6 - resolve: 1.22.8 - semver: 7.6.0 - symbol-observable: 4.0.0 - yargs: 17.7.2 - transitivePeerDependencies: - - bluebird - - chokidar - - supports-color - - '@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1)': - dependencies: - '@angular/core': 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - rxjs: 7.8.1 - tslib: 2.6.2 - - '@angular/compiler-cli@17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.2.2)': - dependencies: - '@angular/compiler': 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)) - '@babel/core': 7.23.9 - '@jridgewell/sourcemap-codec': 1.4.15 - chokidar: 3.6.0 - convert-source-map: 1.9.0 - reflect-metadata: 0.2.2 - semver: 7.6.2 - tslib: 2.6.2 - typescript: 5.2.2 - yargs: 17.7.2 - transitivePeerDependencies: - - supports-color - - '@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))': - dependencies: - tslib: 2.6.2 - optionalDependencies: - '@angular/core': 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - - '@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)': - dependencies: - rxjs: 7.8.1 - tslib: 2.6.2 - zone.js: 0.14.6 - - '@angular/forms@17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(rxjs@7.8.1)': - dependencies: - '@angular/common': 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1) - '@angular/core': 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - '@angular/platform-browser': 17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)) - rxjs: 7.8.1 - tslib: 2.6.2 - - '@angular/platform-browser-dynamic@17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))': - dependencies: - '@angular/common': 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1) - '@angular/compiler': 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)) - '@angular/core': 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - '@angular/platform-browser': 17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)) - tslib: 2.6.2 - - '@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))': - dependencies: - '@angular/common': 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1) - '@angular/core': 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - tslib: 2.6.2 - optionalDependencies: - '@angular/animations': 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)) - - '@angular/router@17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(rxjs@7.8.1)': - dependencies: - '@angular/common': 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1) - '@angular/core': 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - '@angular/platform-browser': 17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)) - rxjs: 7.8.1 - tslib: 2.6.2 - - '@babel/code-frame@7.24.6': - dependencies: - '@babel/highlight': 7.24.6 - picocolors: 1.0.1 - - '@babel/compat-data@7.24.6': {} - - '@babel/core@7.23.9': - dependencies: - '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.6 - '@babel/generator': 7.24.6 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-module-transforms': 7.24.6(@babel/core@7.23.9) - '@babel/helpers': 7.24.6 - '@babel/parser': 7.24.6 - '@babel/template': 7.24.6 - '@babel/traverse': 7.24.6 - '@babel/types': 7.24.6 - convert-source-map: 2.0.0 - debug: 4.3.4 - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - - '@babel/core@7.24.0': - dependencies: - '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.6 - '@babel/generator': 7.23.6 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-module-transforms': 7.24.6(@babel/core@7.24.0) - '@babel/helpers': 7.24.6 - '@babel/parser': 7.24.6 - '@babel/template': 7.24.6 - '@babel/traverse': 7.24.6 - '@babel/types': 7.24.6 - convert-source-map: 2.0.0 - debug: 4.3.4 - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - - '@babel/core@7.24.6': - dependencies: - '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.6 - '@babel/generator': 7.24.6 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-module-transforms': 7.24.6(@babel/core@7.24.6) - '@babel/helpers': 7.24.6 - '@babel/parser': 7.24.6 - '@babel/template': 7.24.6 - '@babel/traverse': 7.24.6 - '@babel/types': 7.24.6 - convert-source-map: 2.0.0 - debug: 4.3.4 - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - - '@babel/generator@7.23.6': - dependencies: - '@babel/types': 7.24.6 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 2.5.2 - - '@babel/generator@7.24.6': - dependencies: - '@babel/types': 7.24.6 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 2.5.2 - - '@babel/helper-annotate-as-pure@7.22.5': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-annotate-as-pure@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-builder-binary-assignment-operator-visitor@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-compilation-targets@7.24.6': - dependencies: - '@babel/compat-data': 7.24.6 - '@babel/helper-validator-option': 7.24.6 - browserslist: 4.23.0 - lru-cache: 5.1.1 - semver: 6.3.1 - - '@babel/helper-create-class-features-plugin@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-annotate-as-pure': 7.24.6 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-function-name': 7.24.6 - '@babel/helper-member-expression-to-functions': 7.24.6 - '@babel/helper-optimise-call-expression': 7.24.6 - '@babel/helper-replace-supers': 7.24.6(@babel/core@7.24.0) - '@babel/helper-skip-transparent-expression-wrappers': 7.24.6 - '@babel/helper-split-export-declaration': 7.24.6 - semver: 6.3.1 - - '@babel/helper-create-regexp-features-plugin@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-annotate-as-pure': 7.24.6 - regexpu-core: 5.3.2 - semver: 6.3.1 - - '@babel/helper-define-polyfill-provider@0.5.0(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - debug: 4.3.4 - lodash.debounce: 4.0.8 - resolve: 1.22.8 - transitivePeerDependencies: - - supports-color - - '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - debug: 4.3.4 - lodash.debounce: 4.0.8 - resolve: 1.22.8 - transitivePeerDependencies: - - supports-color - - '@babel/helper-environment-visitor@7.24.6': {} - - '@babel/helper-function-name@7.24.6': - dependencies: - '@babel/template': 7.24.6 - '@babel/types': 7.24.6 - - '@babel/helper-hoist-variables@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-member-expression-to-functions@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-module-imports@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-module-transforms@7.24.6(@babel/core@7.23.9)': - dependencies: - '@babel/core': 7.23.9 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-module-imports': 7.24.6 - '@babel/helper-simple-access': 7.24.6 - '@babel/helper-split-export-declaration': 7.24.6 - '@babel/helper-validator-identifier': 7.24.6 - - '@babel/helper-module-transforms@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-module-imports': 7.24.6 - '@babel/helper-simple-access': 7.24.6 - '@babel/helper-split-export-declaration': 7.24.6 - '@babel/helper-validator-identifier': 7.24.6 - - '@babel/helper-module-transforms@7.24.6(@babel/core@7.24.6)': - dependencies: - '@babel/core': 7.24.6 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-module-imports': 7.24.6 - '@babel/helper-simple-access': 7.24.6 - '@babel/helper-split-export-declaration': 7.24.6 - '@babel/helper-validator-identifier': 7.24.6 - - '@babel/helper-optimise-call-expression@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-plugin-utils@7.24.6': {} - - '@babel/helper-remap-async-to-generator@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-annotate-as-pure': 7.24.6 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-wrap-function': 7.24.6 - - '@babel/helper-replace-supers@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-member-expression-to-functions': 7.24.6 - '@babel/helper-optimise-call-expression': 7.24.6 - - '@babel/helper-simple-access@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-skip-transparent-expression-wrappers@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-split-export-declaration@7.22.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-split-export-declaration@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/helper-string-parser@7.24.6': {} - - '@babel/helper-validator-identifier@7.24.6': {} - - '@babel/helper-validator-option@7.24.6': {} - - '@babel/helper-wrap-function@7.24.6': - dependencies: - '@babel/helper-function-name': 7.24.6 - '@babel/template': 7.24.6 - '@babel/types': 7.24.6 - - '@babel/helpers@7.24.6': - dependencies: - '@babel/template': 7.24.6 - '@babel/types': 7.24.6 - - '@babel/highlight@7.24.6': - dependencies: - '@babel/helper-validator-identifier': 7.24.6 - chalk: 2.4.2 - js-tokens: 4.0.0 - picocolors: 1.0.1 - - '@babel/parser@7.24.6': - dependencies: - '@babel/types': 7.24.6 - - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-skip-transparent-expression-wrappers': 7.24.6 - '@babel/plugin-transform-optional-chaining': 7.24.6(@babel/core@7.24.0) - - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - - '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-import-assertions@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-import-attributes@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-create-regexp-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-arrow-functions@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-async-generator-functions@7.23.9(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-remap-async-to-generator': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0) - - '@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-module-imports': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-remap-async-to-generator': 7.24.6(@babel/core@7.24.0) - - '@babel/plugin-transform-block-scoped-functions@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-block-scoping@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-class-properties@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-create-class-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-class-static-block@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-create-class-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0) - - '@babel/plugin-transform-classes@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-annotate-as-pure': 7.24.6 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-function-name': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-replace-supers': 7.24.6(@babel/core@7.24.0) - '@babel/helper-split-export-declaration': 7.24.6 - globals: 11.12.0 - - '@babel/plugin-transform-computed-properties@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/template': 7.24.6 - - '@babel/plugin-transform-destructuring@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-dotall-regex@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-create-regexp-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-duplicate-keys@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-dynamic-import@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0) - - '@babel/plugin-transform-exponentiation-operator@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-builder-binary-assignment-operator-visitor': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-export-namespace-from@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0) - - '@babel/plugin-transform-for-of@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-skip-transparent-expression-wrappers': 7.24.6 - - '@babel/plugin-transform-function-name@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-function-name': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-json-strings@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0) - - '@babel/plugin-transform-literals@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-logical-assignment-operators@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0) - - '@babel/plugin-transform-member-expression-literals@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-modules-amd@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-module-transforms': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-modules-commonjs@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-module-transforms': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-simple-access': 7.24.6 - - '@babel/plugin-transform-modules-systemjs@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-hoist-variables': 7.24.6 - '@babel/helper-module-transforms': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-validator-identifier': 7.24.6 - - '@babel/plugin-transform-modules-umd@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-module-transforms': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-named-capturing-groups-regex@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-create-regexp-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-new-target@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-nullish-coalescing-operator@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0) - - '@babel/plugin-transform-numeric-separator@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0) - - '@babel/plugin-transform-object-rest-spread@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0) - '@babel/plugin-transform-parameters': 7.24.6(@babel/core@7.24.0) - - '@babel/plugin-transform-object-super@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-replace-supers': 7.24.6(@babel/core@7.24.0) - - '@babel/plugin-transform-optional-catch-binding@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0) - - '@babel/plugin-transform-optional-chaining@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-skip-transparent-expression-wrappers': 7.24.6 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0) - - '@babel/plugin-transform-parameters@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-private-methods@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-create-class-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-private-property-in-object@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-annotate-as-pure': 7.24.6 - '@babel/helper-create-class-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.0) - - '@babel/plugin-transform-property-literals@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-regenerator@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - regenerator-transform: 0.15.2 - - '@babel/plugin-transform-reserved-words@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-runtime@7.24.0(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-module-imports': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.24.0) - babel-plugin-polyfill-corejs3: 0.9.0(@babel/core@7.24.0) - babel-plugin-polyfill-regenerator: 0.5.5(@babel/core@7.24.0) - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-shorthand-properties@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-spread@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-skip-transparent-expression-wrappers': 7.24.6 - - '@babel/plugin-transform-sticky-regex@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-template-literals@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-typeof-symbol@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-unicode-escapes@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-unicode-property-regex@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-create-regexp-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-unicode-regex@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-create-regexp-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/plugin-transform-unicode-sets-regex@7.24.6(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-create-regexp-features-plugin': 7.24.6(@babel/core@7.24.0) - '@babel/helper-plugin-utils': 7.24.6 - - '@babel/preset-env@7.24.0(@babel/core@7.24.0)': - dependencies: - '@babel/compat-data': 7.24.6 - '@babel/core': 7.24.0 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/helper-validator-option': 7.24.6 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.0) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.0) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0) - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0) - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0) - '@babel/plugin-syntax-import-assertions': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-syntax-import-attributes': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.0) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.0) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.0) - '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.24.0) - '@babel/plugin-transform-arrow-functions': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-async-generator-functions': 7.23.9(@babel/core@7.24.0) - '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.24.0) - '@babel/plugin-transform-block-scoped-functions': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-block-scoping': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-class-properties': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-class-static-block': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-classes': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-computed-properties': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-destructuring': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-dotall-regex': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-duplicate-keys': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-dynamic-import': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-exponentiation-operator': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-export-namespace-from': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-for-of': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-function-name': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-json-strings': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-literals': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-logical-assignment-operators': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-member-expression-literals': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-modules-amd': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-modules-commonjs': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-modules-systemjs': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-modules-umd': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-named-capturing-groups-regex': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-new-target': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-nullish-coalescing-operator': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-numeric-separator': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-object-rest-spread': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-object-super': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-optional-catch-binding': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-optional-chaining': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-parameters': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-private-methods': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-private-property-in-object': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-property-literals': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-regenerator': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-reserved-words': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-shorthand-properties': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-spread': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-sticky-regex': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-template-literals': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-typeof-symbol': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-unicode-escapes': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-unicode-property-regex': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-unicode-regex': 7.24.6(@babel/core@7.24.0) - '@babel/plugin-transform-unicode-sets-regex': 7.24.6(@babel/core@7.24.0) - '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.24.0) - babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.24.0) - babel-plugin-polyfill-corejs3: 0.9.0(@babel/core@7.24.0) - babel-plugin-polyfill-regenerator: 0.5.5(@babel/core@7.24.0) - core-js-compat: 3.37.1 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - - '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.0)': - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-plugin-utils': 7.24.6 - '@babel/types': 7.24.6 - esutils: 2.0.3 - - '@babel/regjsgen@0.8.0': {} - - '@babel/runtime@7.24.0': - dependencies: - regenerator-runtime: 0.14.1 - - '@babel/template@7.24.6': - dependencies: - '@babel/code-frame': 7.24.6 - '@babel/parser': 7.24.6 - '@babel/types': 7.24.6 - - '@babel/traverse@7.24.6': - dependencies: - '@babel/code-frame': 7.24.6 - '@babel/generator': 7.24.6 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-function-name': 7.24.6 - '@babel/helper-hoist-variables': 7.24.6 - '@babel/helper-split-export-declaration': 7.24.6 - '@babel/parser': 7.24.6 - '@babel/types': 7.24.6 - debug: 4.3.4 - globals: 11.12.0 - transitivePeerDependencies: - - supports-color - - '@babel/types@7.24.6': - dependencies: - '@babel/helper-string-parser': 7.24.6 - '@babel/helper-validator-identifier': 7.24.6 - to-fast-properties: 2.0.0 - - '@bundled-es-modules/cookie@2.0.0': - dependencies: - cookie: 0.5.0 - - '@bundled-es-modules/statuses@1.0.1': - dependencies: - statuses: 2.0.1 - - '@colors/colors@1.5.0': {} - - '@discoveryjs/json-ext@0.5.7': {} - - '@esbuild/aix-ppc64@0.19.12': - optional: true - - '@esbuild/aix-ppc64@0.20.1': - optional: true - - '@esbuild/android-arm64@0.19.12': - optional: true - - '@esbuild/android-arm64@0.20.1': - optional: true - - '@esbuild/android-arm@0.19.12': - optional: true - - '@esbuild/android-arm@0.20.1': - optional: true - - '@esbuild/android-x64@0.19.12': - optional: true - - '@esbuild/android-x64@0.20.1': - optional: true - - '@esbuild/darwin-arm64@0.19.12': - optional: true - - '@esbuild/darwin-arm64@0.20.1': - optional: true - - '@esbuild/darwin-x64@0.19.12': - optional: true - - '@esbuild/darwin-x64@0.20.1': - optional: true - - '@esbuild/freebsd-arm64@0.19.12': - optional: true - - '@esbuild/freebsd-arm64@0.20.1': - optional: true - - '@esbuild/freebsd-x64@0.19.12': - optional: true - - '@esbuild/freebsd-x64@0.20.1': - optional: true - - '@esbuild/linux-arm64@0.19.12': - optional: true - - '@esbuild/linux-arm64@0.20.1': - optional: true - - '@esbuild/linux-arm@0.19.12': - optional: true - - '@esbuild/linux-arm@0.20.1': - optional: true - - '@esbuild/linux-ia32@0.19.12': - optional: true - - '@esbuild/linux-ia32@0.20.1': - optional: true - - '@esbuild/linux-loong64@0.19.12': - optional: true - - '@esbuild/linux-loong64@0.20.1': - optional: true - - '@esbuild/linux-mips64el@0.19.12': - optional: true - - '@esbuild/linux-mips64el@0.20.1': - optional: true - - '@esbuild/linux-ppc64@0.19.12': - optional: true - - '@esbuild/linux-ppc64@0.20.1': - optional: true - - '@esbuild/linux-riscv64@0.19.12': - optional: true - - '@esbuild/linux-riscv64@0.20.1': - optional: true - - '@esbuild/linux-s390x@0.19.12': - optional: true - - '@esbuild/linux-s390x@0.20.1': - optional: true - - '@esbuild/linux-x64@0.19.12': - optional: true - - '@esbuild/linux-x64@0.20.1': - optional: true - - '@esbuild/netbsd-x64@0.19.12': - optional: true - - '@esbuild/netbsd-x64@0.20.1': - optional: true - - '@esbuild/openbsd-x64@0.19.12': - optional: true - - '@esbuild/openbsd-x64@0.20.1': - optional: true - - '@esbuild/sunos-x64@0.19.12': - optional: true - - '@esbuild/sunos-x64@0.20.1': - optional: true - - '@esbuild/win32-arm64@0.19.12': - optional: true - - '@esbuild/win32-arm64@0.20.1': - optional: true - - '@esbuild/win32-ia32@0.19.12': - optional: true - - '@esbuild/win32-ia32@0.20.1': - optional: true - - '@esbuild/win32-x64@0.19.12': - optional: true - - '@esbuild/win32-x64@0.20.1': - optional: true - - '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)': - dependencies: - eslint: 8.57.0 - eslint-visitor-keys: 3.4.3 - - '@eslint-community/regexpp@4.10.0': {} - - '@eslint/eslintrc@2.1.4': - dependencies: - ajv: 6.12.6 - debug: 4.3.4 - espree: 9.6.1 - globals: 13.24.0 - ignore: 5.3.1 - import-fresh: 3.3.0 - js-yaml: 4.1.0 - minimatch: 3.1.2 - strip-json-comments: 3.1.1 - transitivePeerDependencies: - - supports-color - - '@eslint/js@8.57.0': {} - - '@humanwhocodes/config-array@0.11.14': - dependencies: - '@humanwhocodes/object-schema': 2.0.3 - debug: 4.3.4 - minimatch: 3.1.2 - transitivePeerDependencies: - - supports-color - - '@humanwhocodes/module-importer@1.0.1': {} - - '@humanwhocodes/object-schema@2.0.3': {} - - '@inquirer/confirm@3.1.8': - dependencies: - '@inquirer/core': 8.2.1 - '@inquirer/type': 1.3.2 - - '@inquirer/core@8.2.1': - dependencies: - '@inquirer/figures': 1.0.2 - '@inquirer/type': 1.3.2 - '@types/mute-stream': 0.0.4 - '@types/node': 20.12.12 - '@types/wrap-ansi': 3.0.0 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - cli-spinners: 2.9.2 - cli-width: 4.1.0 - mute-stream: 1.0.0 - signal-exit: 4.1.0 - strip-ansi: 6.0.1 - wrap-ansi: 6.2.0 - - '@inquirer/figures@1.0.2': {} - - '@inquirer/type@1.3.2': {} - - '@isaacs/cliui@8.0.2': - dependencies: - string-width: 5.1.2 - string-width-cjs: string-width@4.2.3 - strip-ansi: 7.1.0 - strip-ansi-cjs: strip-ansi@6.0.1 - wrap-ansi: 8.1.0 - wrap-ansi-cjs: wrap-ansi@7.0.0 - - '@istanbuljs/load-nyc-config@1.1.0': - dependencies: - camelcase: 5.3.1 - find-up: 4.1.0 - get-package-type: 0.1.0 - js-yaml: 3.14.1 - resolve-from: 5.0.0 - - '@istanbuljs/schema@0.1.3': {} - - '@jest/schemas@29.6.3': - dependencies: - '@sinclair/typebox': 0.27.8 - - '@jridgewell/gen-mapping@0.3.5': - dependencies: - '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.25 - - '@jridgewell/resolve-uri@3.1.2': {} - - '@jridgewell/set-array@1.2.1': {} - - '@jridgewell/source-map@0.3.6': - dependencies: - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - - '@jridgewell/sourcemap-codec@1.4.15': {} - - '@jridgewell/trace-mapping@0.3.25': - dependencies: - '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 - - '@leichtgewicht/ip-codec@2.0.5': {} - - '@ljharb/through@2.3.13': - dependencies: - call-bind: 1.0.7 - - '@mswjs/cookies@1.1.0': {} - - '@mswjs/interceptors@0.29.1': - dependencies: - '@open-draft/deferred-promise': 2.2.0 - '@open-draft/logger': 0.3.0 - '@open-draft/until': 2.1.0 - is-node-process: 1.2.0 - outvariant: 1.4.2 - strict-event-emitter: 0.5.1 - - '@ngtools/webpack@17.3.8(@angular/compiler-cli@17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.2.2))(typescript@5.2.2)(webpack@5.90.3(esbuild@0.20.1))': - dependencies: - '@angular/compiler-cli': 17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.2.2) - typescript: 5.2.2 - webpack: 5.90.3(esbuild@0.20.1) - - '@nodelib/fs.scandir@2.1.5': - dependencies: - '@nodelib/fs.stat': 2.0.5 - run-parallel: 1.2.0 - - '@nodelib/fs.stat@2.0.5': {} - - '@nodelib/fs.walk@1.2.8': - dependencies: - '@nodelib/fs.scandir': 2.1.5 - fastq: 1.17.1 - - '@npmcli/agent@2.2.2': - dependencies: - agent-base: 7.1.1 - http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.4 - lru-cache: 10.2.2 - socks-proxy-agent: 8.0.3 - transitivePeerDependencies: - - supports-color - - '@npmcli/fs@3.1.1': - dependencies: - semver: 7.6.0 - - '@npmcli/git@5.0.7': - dependencies: - '@npmcli/promise-spawn': 7.0.2 - lru-cache: 10.2.2 - npm-pick-manifest: 9.0.0 - proc-log: 4.2.0 - promise-inflight: 1.0.1 - promise-retry: 2.0.1 - semver: 7.6.0 - which: 4.0.0 - transitivePeerDependencies: - - bluebird - - '@npmcli/installed-package-contents@2.1.0': - dependencies: - npm-bundled: 3.0.1 - npm-normalize-package-bin: 3.0.1 - - '@npmcli/node-gyp@3.0.0': {} - - '@npmcli/package-json@5.1.0': - dependencies: - '@npmcli/git': 5.0.7 - glob: 10.4.1 - hosted-git-info: 7.0.2 - json-parse-even-better-errors: 3.0.2 - normalize-package-data: 6.0.1 - proc-log: 4.2.0 - semver: 7.6.0 - transitivePeerDependencies: - - bluebird - - '@npmcli/promise-spawn@7.0.2': - dependencies: - which: 4.0.0 - - '@npmcli/redact@1.1.0': {} - - '@npmcli/run-script@7.0.4': - dependencies: - '@npmcli/node-gyp': 3.0.0 - '@npmcli/package-json': 5.1.0 - '@npmcli/promise-spawn': 7.0.2 - node-gyp: 10.1.0 - which: 4.0.0 - transitivePeerDependencies: - - bluebird - - supports-color - - '@nrwl/devkit@19.1.0(nx@19.1.0)': - dependencies: - '@nx/devkit': 19.1.0(nx@19.1.0) - transitivePeerDependencies: - - nx - - '@nrwl/tao@19.1.0': - dependencies: - nx: 19.1.0 - tslib: 2.6.2 - transitivePeerDependencies: - - '@swc-node/register' - - '@swc/core' - - debug - - '@nx/devkit@19.1.0(nx@19.1.0)': - dependencies: - '@nrwl/devkit': 19.1.0(nx@19.1.0) - ejs: 3.1.10 - enquirer: 2.3.6 - ignore: 5.3.1 - minimatch: 9.0.3 - nx: 19.1.0 - semver: 7.6.2 - tmp: 0.2.3 - tslib: 2.6.2 - yargs-parser: 21.1.1 - - '@nx/nx-darwin-arm64@19.1.0': - optional: true - - '@nx/nx-darwin-x64@19.1.0': - optional: true - - '@nx/nx-freebsd-x64@19.1.0': - optional: true - - '@nx/nx-linux-arm-gnueabihf@19.1.0': - optional: true - - '@nx/nx-linux-arm64-gnu@19.1.0': - optional: true - - '@nx/nx-linux-arm64-musl@19.1.0': - optional: true - - '@nx/nx-linux-x64-gnu@19.1.0': - optional: true - - '@nx/nx-linux-x64-musl@19.1.0': - optional: true - - '@nx/nx-win32-arm64-msvc@19.1.0': - optional: true - - '@nx/nx-win32-x64-msvc@19.1.0': - optional: true - - '@open-draft/deferred-promise@2.2.0': {} - - '@open-draft/logger@0.3.0': - dependencies: - is-node-process: 1.2.0 - outvariant: 1.4.2 - - '@open-draft/until@2.1.0': {} - - '@pkgjs/parseargs@0.11.0': - optional: true - - '@rollup/rollup-android-arm-eabi@4.18.0': - optional: true - - '@rollup/rollup-android-arm64@4.18.0': - optional: true - - '@rollup/rollup-darwin-arm64@4.18.0': - optional: true - - '@rollup/rollup-darwin-x64@4.18.0': - optional: true - - '@rollup/rollup-linux-arm-gnueabihf@4.18.0': - optional: true - - '@rollup/rollup-linux-arm-musleabihf@4.18.0': - optional: true - - '@rollup/rollup-linux-arm64-gnu@4.18.0': - optional: true - - '@rollup/rollup-linux-arm64-musl@4.18.0': - optional: true - - '@rollup/rollup-linux-powerpc64le-gnu@4.18.0': - optional: true - - '@rollup/rollup-linux-riscv64-gnu@4.18.0': - optional: true - - '@rollup/rollup-linux-s390x-gnu@4.18.0': - optional: true - - '@rollup/rollup-linux-x64-gnu@4.18.0': - optional: true - - '@rollup/rollup-linux-x64-musl@4.18.0': - optional: true - - '@rollup/rollup-win32-arm64-msvc@4.18.0': - optional: true - - '@rollup/rollup-win32-ia32-msvc@4.18.0': - optional: true - - '@rollup/rollup-win32-x64-msvc@4.18.0': - optional: true - - '@schematics/angular@17.3.8(chokidar@3.6.0)': - dependencies: - '@angular-devkit/core': 17.3.8(chokidar@3.6.0) - '@angular-devkit/schematics': 17.3.8(chokidar@3.6.0) - jsonc-parser: 3.2.1 - transitivePeerDependencies: - - chokidar - - '@sigstore/bundle@2.3.2': - dependencies: - '@sigstore/protobuf-specs': 0.3.2 - - '@sigstore/core@1.1.0': {} - - '@sigstore/protobuf-specs@0.3.2': {} - - '@sigstore/sign@2.3.2': - dependencies: - '@sigstore/bundle': 2.3.2 - '@sigstore/core': 1.1.0 - '@sigstore/protobuf-specs': 0.3.2 - make-fetch-happen: 13.0.1 - proc-log: 4.2.0 - promise-retry: 2.0.1 - transitivePeerDependencies: - - supports-color - - '@sigstore/tuf@2.3.4': - dependencies: - '@sigstore/protobuf-specs': 0.3.2 - tuf-js: 2.2.1 - transitivePeerDependencies: - - supports-color - - '@sigstore/verify@1.2.1': - dependencies: - '@sigstore/bundle': 2.3.2 - '@sigstore/core': 1.1.0 - '@sigstore/protobuf-specs': 0.3.2 - - '@sinclair/typebox@0.27.8': {} - - '@socket.io/component-emitter@3.1.2': {} - - '@tufjs/canonical-json@2.0.0': {} - - '@tufjs/models@2.0.1': - dependencies: - '@tufjs/canonical-json': 2.0.0 - minimatch: 9.0.4 - - '@types/body-parser@1.19.5': - dependencies: - '@types/connect': 3.4.38 - '@types/node': 20.12.12 - - '@types/bonjour@3.5.13': - dependencies: - '@types/node': 20.12.12 - - '@types/connect-history-api-fallback@1.5.4': - dependencies: - '@types/express-serve-static-core': 4.19.1 - '@types/node': 20.12.12 - - '@types/connect@3.4.38': - dependencies: - '@types/node': 20.12.12 - - '@types/cookie@0.4.1': {} - - '@types/cookie@0.6.0': {} - - '@types/cors@2.8.17': - dependencies: - '@types/node': 20.12.12 - - '@types/eslint-scope@3.7.7': - dependencies: - '@types/eslint': 8.56.10 - '@types/estree': 1.0.5 - - '@types/eslint@8.56.10': - dependencies: - '@types/estree': 1.0.5 - '@types/json-schema': 7.0.15 - - '@types/estree@1.0.5': {} - - '@types/express-serve-static-core@4.19.1': - dependencies: - '@types/node': 20.12.12 - '@types/qs': 6.9.15 - '@types/range-parser': 1.2.7 - '@types/send': 0.17.4 - - '@types/express@4.17.21': - dependencies: - '@types/body-parser': 1.19.5 - '@types/express-serve-static-core': 4.19.1 - '@types/qs': 6.9.15 - '@types/serve-static': 1.15.7 - - '@types/http-errors@2.0.4': {} - - '@types/http-proxy@1.17.14': - dependencies: - '@types/node': 20.12.12 - - '@types/jasmine@4.3.6': {} - - '@types/json-schema@7.0.15': {} - - '@types/mime@1.3.5': {} - - '@types/mute-stream@0.0.4': - dependencies: - '@types/node': 20.12.12 - - '@types/node-forge@1.3.11': - dependencies: - '@types/node': 20.12.12 - - '@types/node@20.12.12': - dependencies: - undici-types: 5.26.5 - - '@types/qs@6.9.15': {} - - '@types/range-parser@1.2.7': {} - - '@types/retry@0.12.0': {} - - '@types/send@0.17.4': - dependencies: - '@types/mime': 1.3.5 - '@types/node': 20.12.12 - - '@types/serve-index@1.9.4': - dependencies: - '@types/express': 4.17.21 - - '@types/serve-static@1.15.7': - dependencies: - '@types/http-errors': 2.0.4 - '@types/node': 20.12.12 - '@types/send': 0.17.4 - - '@types/sockjs@0.3.36': - dependencies: - '@types/node': 20.12.12 - - '@types/statuses@2.0.5': {} - - '@types/wrap-ansi@3.0.0': {} - - '@types/ws@8.5.10': - dependencies: - '@types/node': 20.12.12 - - '@typescript-eslint/eslint-plugin@7.10.0(@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.2.2))(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.10.0(eslint@8.57.0)(typescript@5.2.2) - '@typescript-eslint/scope-manager': 7.10.0 - '@typescript-eslint/type-utils': 7.10.0(eslint@8.57.0)(typescript@5.2.2) - '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.2.2) - '@typescript-eslint/visitor-keys': 7.10.0 - eslint: 8.57.0 - graphemer: 1.4.0 - ignore: 5.3.1 - natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@5.2.2) - optionalDependencies: - typescript: 5.2.2 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@typescript-eslint/scope-manager': 7.10.0 - '@typescript-eslint/types': 7.10.0 - '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.2.2) - '@typescript-eslint/visitor-keys': 7.10.0 - debug: 4.3.4 - eslint: 8.57.0 - optionalDependencies: - typescript: 5.2.2 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/scope-manager@7.10.0': - dependencies: - '@typescript-eslint/types': 7.10.0 - '@typescript-eslint/visitor-keys': 7.10.0 - - '@typescript-eslint/type-utils@7.10.0(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.2.2) - '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.2.2) - debug: 4.3.4 - eslint: 8.57.0 - ts-api-utils: 1.3.0(typescript@5.2.2) - optionalDependencies: - typescript: 5.2.2 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/types@7.10.0': {} - - '@typescript-eslint/typescript-estree@7.10.0(typescript@5.2.2)': - dependencies: - '@typescript-eslint/types': 7.10.0 - '@typescript-eslint/visitor-keys': 7.10.0 - debug: 4.3.4 - globby: 11.1.0 - is-glob: 4.0.3 - minimatch: 9.0.4 - semver: 7.6.2 - ts-api-utils: 1.3.0(typescript@5.2.2) - optionalDependencies: - typescript: 5.2.2 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/utils@7.10.0(eslint@8.57.0)(typescript@5.2.2)': - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@typescript-eslint/scope-manager': 7.10.0 - '@typescript-eslint/types': 7.10.0 - '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.2.2) - eslint: 8.57.0 - transitivePeerDependencies: - - supports-color - - typescript - - '@typescript-eslint/visitor-keys@7.10.0': - dependencies: - '@typescript-eslint/types': 7.10.0 - eslint-visitor-keys: 3.4.3 - - '@ungap/structured-clone@1.2.0': {} - - '@vitejs/plugin-basic-ssl@1.1.0(vite@5.1.7(@types/node@20.12.12)(less@4.2.0)(sass@1.71.1)(terser@5.29.1))': - dependencies: - vite: 5.1.7(@types/node@20.12.12)(less@4.2.0)(sass@1.71.1)(terser@5.29.1) - - '@webassemblyjs/ast@1.12.1': - dependencies: - '@webassemblyjs/helper-numbers': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - - '@webassemblyjs/floating-point-hex-parser@1.11.6': {} - - '@webassemblyjs/helper-api-error@1.11.6': {} - - '@webassemblyjs/helper-buffer@1.12.1': {} - - '@webassemblyjs/helper-numbers@1.11.6': - dependencies: - '@webassemblyjs/floating-point-hex-parser': 1.11.6 - '@webassemblyjs/helper-api-error': 1.11.6 - '@xtuc/long': 4.2.2 - - '@webassemblyjs/helper-wasm-bytecode@1.11.6': {} - - '@webassemblyjs/helper-wasm-section@1.12.1': - dependencies: - '@webassemblyjs/ast': 1.12.1 - '@webassemblyjs/helper-buffer': 1.12.1 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/wasm-gen': 1.12.1 - - '@webassemblyjs/ieee754@1.11.6': - dependencies: - '@xtuc/ieee754': 1.2.0 - - '@webassemblyjs/leb128@1.11.6': - dependencies: - '@xtuc/long': 4.2.2 - - '@webassemblyjs/utf8@1.11.6': {} - - '@webassemblyjs/wasm-edit@1.12.1': - dependencies: - '@webassemblyjs/ast': 1.12.1 - '@webassemblyjs/helper-buffer': 1.12.1 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/helper-wasm-section': 1.12.1 - '@webassemblyjs/wasm-gen': 1.12.1 - '@webassemblyjs/wasm-opt': 1.12.1 - '@webassemblyjs/wasm-parser': 1.12.1 - '@webassemblyjs/wast-printer': 1.12.1 - - '@webassemblyjs/wasm-gen@1.12.1': - dependencies: - '@webassemblyjs/ast': 1.12.1 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/ieee754': 1.11.6 - '@webassemblyjs/leb128': 1.11.6 - '@webassemblyjs/utf8': 1.11.6 - - '@webassemblyjs/wasm-opt@1.12.1': - dependencies: - '@webassemblyjs/ast': 1.12.1 - '@webassemblyjs/helper-buffer': 1.12.1 - '@webassemblyjs/wasm-gen': 1.12.1 - '@webassemblyjs/wasm-parser': 1.12.1 - - '@webassemblyjs/wasm-parser@1.12.1': - dependencies: - '@webassemblyjs/ast': 1.12.1 - '@webassemblyjs/helper-api-error': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/ieee754': 1.11.6 - '@webassemblyjs/leb128': 1.11.6 - '@webassemblyjs/utf8': 1.11.6 - - '@webassemblyjs/wast-printer@1.12.1': - dependencies: - '@webassemblyjs/ast': 1.12.1 - '@xtuc/long': 4.2.2 - - '@xtuc/ieee754@1.2.0': {} - - '@xtuc/long@4.2.2': {} - - '@yarnpkg/lockfile@1.1.0': {} - - '@yarnpkg/parsers@3.0.0-rc.46': - dependencies: - js-yaml: 3.14.1 - tslib: 2.6.2 - - '@zkochan/js-yaml@0.0.7': - dependencies: - argparse: 2.0.1 - - abbrev@2.0.0: {} - - accepts@1.3.8: - dependencies: - mime-types: 2.1.35 - negotiator: 0.6.3 - - acorn-import-assertions@1.9.0(acorn@8.11.3): - dependencies: - acorn: 8.11.3 - - acorn-jsx@5.3.2(acorn@8.11.3): - dependencies: - acorn: 8.11.3 - - acorn@8.11.3: {} - - adjust-sourcemap-loader@4.0.0: - dependencies: - loader-utils: 2.0.4 - regex-parser: 2.3.0 - - agent-base@7.1.1: - dependencies: - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - - aggregate-error@3.1.0: - dependencies: - clean-stack: 2.2.0 - indent-string: 4.0.0 - - ajv-formats@2.1.1(ajv@8.12.0): - optionalDependencies: - ajv: 8.12.0 - - ajv-formats@2.1.1(ajv@8.14.0): - optionalDependencies: - ajv: 8.14.0 - - ajv-keywords@3.5.2(ajv@6.12.6): - dependencies: - ajv: 6.12.6 - - ajv-keywords@5.1.0(ajv@8.14.0): - dependencies: - ajv: 8.14.0 - fast-deep-equal: 3.1.3 - - ajv@6.12.6: - dependencies: - fast-deep-equal: 3.1.3 - fast-json-stable-stringify: 2.1.0 - json-schema-traverse: 0.4.1 - uri-js: 4.4.1 - - ajv@8.12.0: - dependencies: - fast-deep-equal: 3.1.3 - json-schema-traverse: 1.0.0 - require-from-string: 2.0.2 - uri-js: 4.4.1 - - ajv@8.14.0: - dependencies: - fast-deep-equal: 3.1.3 - json-schema-traverse: 1.0.0 - require-from-string: 2.0.2 - uri-js: 4.4.1 - - ansi-colors@4.1.3: {} - - ansi-escapes@4.3.2: - dependencies: - type-fest: 0.21.3 - - ansi-html-community@0.0.8: {} - - ansi-regex@5.0.1: {} - - ansi-regex@6.0.1: {} - - ansi-styles@3.2.1: - dependencies: - color-convert: 1.9.3 - - ansi-styles@4.3.0: - dependencies: - color-convert: 2.0.1 - - ansi-styles@5.2.0: {} - - ansi-styles@6.2.1: {} - - anymatch@3.1.3: - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.1 - - argparse@1.0.10: - dependencies: - sprintf-js: 1.0.3 - - argparse@2.0.1: {} - - aria-query@5.3.0: - dependencies: - dequal: 2.0.3 - - array-flatten@1.1.1: {} - - array-union@2.1.0: {} - - async@3.2.5: {} - - asynckit@0.4.0: {} - - autoprefixer@10.4.18(postcss@8.4.35): - dependencies: - browserslist: 4.23.0 - caniuse-lite: 1.0.30001624 - fraction.js: 4.3.7 - normalize-range: 0.1.2 - picocolors: 1.0.1 - postcss: 8.4.35 - postcss-value-parser: 4.2.0 - - axios@1.7.2: - dependencies: - follow-redirects: 1.15.6 - form-data: 4.0.0 - proxy-from-env: 1.1.0 - transitivePeerDependencies: - - debug - - axobject-query@4.0.0: - dependencies: - dequal: 2.0.3 - - babel-loader@9.1.3(@babel/core@7.24.0)(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - '@babel/core': 7.24.0 - find-cache-dir: 4.0.0 - schema-utils: 4.2.0 - webpack: 5.90.3(esbuild@0.20.1) - - babel-plugin-istanbul@6.1.1: - dependencies: - '@babel/helper-plugin-utils': 7.24.6 - '@istanbuljs/load-nyc-config': 1.1.0 - '@istanbuljs/schema': 0.1.3 - istanbul-lib-instrument: 5.2.1 - test-exclude: 6.0.0 - transitivePeerDependencies: - - supports-color - - babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.24.0): - dependencies: - '@babel/compat-data': 7.24.6 - '@babel/core': 7.24.0 - '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.24.0) - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - - babel-plugin-polyfill-corejs3@0.9.0(@babel/core@7.24.0): - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0) - core-js-compat: 3.37.1 - transitivePeerDependencies: - - supports-color - - babel-plugin-polyfill-regenerator@0.5.5(@babel/core@7.24.0): - dependencies: - '@babel/core': 7.24.0 - '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0) - transitivePeerDependencies: - - supports-color - - balanced-match@1.0.2: {} - - base64-js@1.5.1: {} - - base64id@2.0.0: {} - - batch@0.6.1: {} - - big.js@5.2.2: {} - - binary-extensions@2.3.0: {} - - bl@4.1.0: - dependencies: - buffer: 5.7.1 - inherits: 2.0.4 - readable-stream: 3.6.2 - - body-parser@1.20.2: - dependencies: - bytes: 3.1.2 - content-type: 1.0.5 - debug: 2.6.9 - depd: 2.0.0 - destroy: 1.2.0 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - on-finished: 2.4.1 - qs: 6.11.0 - raw-body: 2.5.2 - type-is: 1.6.18 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - - bonjour-service@1.2.1: - dependencies: - fast-deep-equal: 3.1.3 - multicast-dns: 7.2.5 - - boolbase@1.0.0: {} - - brace-expansion@1.1.11: - dependencies: - balanced-match: 1.0.2 - concat-map: 0.0.1 - - brace-expansion@2.0.1: - dependencies: - balanced-match: 1.0.2 - - braces@3.0.3: - dependencies: - fill-range: 7.1.1 - - browserslist@4.23.0: - dependencies: - caniuse-lite: 1.0.30001624 - electron-to-chromium: 1.4.783 - node-releases: 2.0.14 - update-browserslist-db: 1.0.16(browserslist@4.23.0) - - buffer-from@1.1.2: {} - - buffer@5.7.1: - dependencies: - base64-js: 1.5.1 - ieee754: 1.2.1 - - bytes@3.0.0: {} - - bytes@3.1.2: {} - - cacache@18.0.3: - dependencies: - '@npmcli/fs': 3.1.1 - fs-minipass: 3.0.3 - glob: 10.4.1 - lru-cache: 10.2.2 - minipass: 7.1.2 - minipass-collect: 2.0.1 - minipass-flush: 1.0.5 - minipass-pipeline: 1.2.4 - p-map: 4.0.0 - ssri: 10.0.6 - tar: 6.2.1 - unique-filename: 3.0.0 - - call-bind@1.0.7: - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - set-function-length: 1.2.2 - - callsites@3.1.0: {} - - camelcase@5.3.1: {} - - caniuse-lite@1.0.30001624: {} - - chalk@2.4.2: - dependencies: - ansi-styles: 3.2.1 - escape-string-regexp: 1.0.5 - supports-color: 5.5.0 - - chalk@4.1.2: - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - - chalk@5.3.0: {} - - chardet@0.7.0: {} - - chokidar@3.6.0: - dependencies: - anymatch: 3.1.3 - braces: 3.0.3 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - - chownr@2.0.0: {} - - chrome-trace-event@1.0.3: {} - - clean-stack@2.2.0: {} - - cli-cursor@3.1.0: - dependencies: - restore-cursor: 3.1.0 - - cli-spinners@2.6.1: {} - - cli-spinners@2.9.2: {} - - cli-width@4.1.0: {} - - cliui@7.0.4: - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 7.0.0 - - cliui@8.0.1: - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 7.0.0 - - clone-deep@4.0.1: - dependencies: - is-plain-object: 2.0.4 - kind-of: 6.0.3 - shallow-clone: 3.0.1 - - clone@1.0.4: {} - - color-convert@1.9.3: - dependencies: - color-name: 1.1.3 - - color-convert@2.0.1: - dependencies: - color-name: 1.1.4 - - color-name@1.1.3: {} - - color-name@1.1.4: {} - - colorette@2.0.20: {} - - combined-stream@1.0.8: - dependencies: - delayed-stream: 1.0.0 - - commander@2.20.3: {} - - common-path-prefix@3.0.0: {} - - compressible@2.0.18: - dependencies: - mime-db: 1.52.0 - - compression@1.7.4: - dependencies: - accepts: 1.3.8 - bytes: 3.0.0 - compressible: 2.0.18 - debug: 2.6.9 - on-headers: 1.0.2 - safe-buffer: 5.1.2 - vary: 1.1.2 - transitivePeerDependencies: - - supports-color - - concat-map@0.0.1: {} - - connect-history-api-fallback@2.0.0: {} - - connect@3.7.0: - dependencies: - debug: 2.6.9 - finalhandler: 1.1.2 - parseurl: 1.3.3 - utils-merge: 1.0.1 - transitivePeerDependencies: - - supports-color - - content-disposition@0.5.4: - dependencies: - safe-buffer: 5.2.1 - - content-type@1.0.5: {} - - convert-source-map@1.9.0: {} - - convert-source-map@2.0.0: {} - - cookie-signature@1.0.6: {} - - cookie@0.4.2: {} - - cookie@0.5.0: {} - - cookie@0.6.0: {} - - copy-anything@2.0.6: - dependencies: - is-what: 3.14.1 - - copy-webpack-plugin@11.0.0(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - fast-glob: 3.3.2 - glob-parent: 6.0.2 - globby: 13.2.2 - normalize-path: 3.0.0 - schema-utils: 4.2.0 - serialize-javascript: 6.0.2 - webpack: 5.90.3(esbuild@0.20.1) - - core-js-compat@3.37.1: - dependencies: - browserslist: 4.23.0 - - core-util-is@1.0.3: {} - - cors@2.8.5: - dependencies: - object-assign: 4.1.1 - vary: 1.1.2 - - cosmiconfig@9.0.0(typescript@5.2.2): - dependencies: - env-paths: 2.2.1 - import-fresh: 3.3.0 - js-yaml: 4.1.0 - parse-json: 5.2.0 - optionalDependencies: - typescript: 5.2.2 - - critters@0.0.22: - dependencies: - chalk: 4.1.2 - css-select: 5.1.0 - dom-serializer: 2.0.0 - domhandler: 5.0.3 - htmlparser2: 8.0.2 - postcss: 8.4.35 - postcss-media-query-parser: 0.2.3 - - cross-spawn@7.0.3: - dependencies: - path-key: 3.1.1 - shebang-command: 2.0.0 - which: 2.0.2 - - css-loader@6.10.0(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - icss-utils: 5.1.0(postcss@8.4.35) - postcss: 8.4.35 - postcss-modules-extract-imports: 3.1.0(postcss@8.4.35) - postcss-modules-local-by-default: 4.0.5(postcss@8.4.35) - postcss-modules-scope: 3.2.0(postcss@8.4.35) - postcss-modules-values: 4.0.0(postcss@8.4.35) - postcss-value-parser: 4.2.0 - semver: 7.6.0 - optionalDependencies: - webpack: 5.90.3(esbuild@0.20.1) - - css-select@5.1.0: - dependencies: - boolbase: 1.0.0 - css-what: 6.1.0 - domhandler: 5.0.3 - domutils: 3.1.0 - nth-check: 2.1.1 - - css-what@6.1.0: {} - - cssesc@3.0.0: {} - - custom-event@1.0.1: {} - - date-format@4.0.14: {} - - debug@2.6.9: - dependencies: - ms: 2.0.0 - - debug@4.3.4: - dependencies: - ms: 2.1.2 - - deep-is@0.1.4: {} - - default-gateway@6.0.3: - dependencies: - execa: 5.1.1 - - defaults@1.0.4: - dependencies: - clone: 1.0.4 - - define-data-property@1.1.4: - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - gopd: 1.0.1 - - define-lazy-prop@2.0.0: {} - - delayed-stream@1.0.0: {} - - depd@1.1.2: {} - - depd@2.0.0: {} - - dequal@2.0.3: {} - - destroy@1.2.0: {} - - detect-node@2.1.0: {} - - di@0.0.1: {} - - diff-sequences@29.6.3: {} - - dir-glob@3.0.1: - dependencies: - path-type: 4.0.0 - - dns-packet@5.6.1: - dependencies: - '@leichtgewicht/ip-codec': 2.0.5 - - doctrine@3.0.0: - dependencies: - esutils: 2.0.3 - - dom-serialize@2.2.1: - dependencies: - custom-event: 1.0.1 - ent: 2.2.0 - extend: 3.0.2 - void-elements: 2.0.1 - - dom-serializer@2.0.0: - dependencies: - domelementtype: 2.3.0 - domhandler: 5.0.3 - entities: 4.5.0 - - domelementtype@2.3.0: {} - - domhandler@5.0.3: - dependencies: - domelementtype: 2.3.0 - - domutils@3.1.0: - dependencies: - dom-serializer: 2.0.0 - domelementtype: 2.3.0 - domhandler: 5.0.3 - - dotenv-expand@10.0.0: {} - - dotenv@16.3.2: {} - - duplexer@0.1.2: {} - - eastasianwidth@0.2.0: {} - - ee-first@1.1.1: {} - - ejs@3.1.10: - dependencies: - jake: 10.9.1 - - electron-to-chromium@1.4.783: {} - - emoji-regex@8.0.0: {} - - emoji-regex@9.2.2: {} - - emojis-list@3.0.0: {} - - encodeurl@1.0.2: {} - - encoding@0.1.13: - dependencies: - iconv-lite: 0.6.3 - optional: true - - end-of-stream@1.4.4: - dependencies: - once: 1.4.0 - - engine.io-parser@5.2.2: {} - - engine.io@6.5.4: - dependencies: - '@types/cookie': 0.4.1 - '@types/cors': 2.8.17 - '@types/node': 20.12.12 - accepts: 1.3.8 - base64id: 2.0.0 - cookie: 0.4.2 - cors: 2.8.5 - debug: 4.3.4 - engine.io-parser: 5.2.2 - ws: 8.11.0 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - - enhanced-resolve@5.16.1: - dependencies: - graceful-fs: 4.2.11 - tapable: 2.2.1 - - enquirer@2.3.6: - dependencies: - ansi-colors: 4.1.3 - - ent@2.2.0: {} - - entities@4.5.0: {} - - env-paths@2.2.1: {} - - err-code@2.0.3: {} - - errno@0.1.8: - dependencies: - prr: 1.0.1 - optional: true - - error-ex@1.3.2: - dependencies: - is-arrayish: 0.2.1 - - es-define-property@1.0.0: - dependencies: - get-intrinsic: 1.2.4 - - es-errors@1.3.0: {} - - es-module-lexer@1.5.3: {} - - esbuild-wasm@0.20.1: {} - - esbuild@0.19.12: - optionalDependencies: - '@esbuild/aix-ppc64': 0.19.12 - '@esbuild/android-arm': 0.19.12 - '@esbuild/android-arm64': 0.19.12 - '@esbuild/android-x64': 0.19.12 - '@esbuild/darwin-arm64': 0.19.12 - '@esbuild/darwin-x64': 0.19.12 - '@esbuild/freebsd-arm64': 0.19.12 - '@esbuild/freebsd-x64': 0.19.12 - '@esbuild/linux-arm': 0.19.12 - '@esbuild/linux-arm64': 0.19.12 - '@esbuild/linux-ia32': 0.19.12 - '@esbuild/linux-loong64': 0.19.12 - '@esbuild/linux-mips64el': 0.19.12 - '@esbuild/linux-ppc64': 0.19.12 - '@esbuild/linux-riscv64': 0.19.12 - '@esbuild/linux-s390x': 0.19.12 - '@esbuild/linux-x64': 0.19.12 - '@esbuild/netbsd-x64': 0.19.12 - '@esbuild/openbsd-x64': 0.19.12 - '@esbuild/sunos-x64': 0.19.12 - '@esbuild/win32-arm64': 0.19.12 - '@esbuild/win32-ia32': 0.19.12 - '@esbuild/win32-x64': 0.19.12 - - esbuild@0.20.1: - optionalDependencies: - '@esbuild/aix-ppc64': 0.20.1 - '@esbuild/android-arm': 0.20.1 - '@esbuild/android-arm64': 0.20.1 - '@esbuild/android-x64': 0.20.1 - '@esbuild/darwin-arm64': 0.20.1 - '@esbuild/darwin-x64': 0.20.1 - '@esbuild/freebsd-arm64': 0.20.1 - '@esbuild/freebsd-x64': 0.20.1 - '@esbuild/linux-arm': 0.20.1 - '@esbuild/linux-arm64': 0.20.1 - '@esbuild/linux-ia32': 0.20.1 - '@esbuild/linux-loong64': 0.20.1 - '@esbuild/linux-mips64el': 0.20.1 - '@esbuild/linux-ppc64': 0.20.1 - '@esbuild/linux-riscv64': 0.20.1 - '@esbuild/linux-s390x': 0.20.1 - '@esbuild/linux-x64': 0.20.1 - '@esbuild/netbsd-x64': 0.20.1 - '@esbuild/openbsd-x64': 0.20.1 - '@esbuild/sunos-x64': 0.20.1 - '@esbuild/win32-arm64': 0.20.1 - '@esbuild/win32-ia32': 0.20.1 - '@esbuild/win32-x64': 0.20.1 - optional: true - - escalade@3.1.2: {} - - escape-html@1.0.3: {} - - escape-string-regexp@1.0.5: {} - - escape-string-regexp@4.0.0: {} - - eslint-scope@5.1.1: - dependencies: - esrecurse: 4.3.0 - estraverse: 4.3.0 - - eslint-scope@7.2.2: - dependencies: - esrecurse: 4.3.0 - estraverse: 5.3.0 - - eslint-scope@8.0.1: - dependencies: - esrecurse: 4.3.0 - estraverse: 5.3.0 - - eslint-visitor-keys@3.4.3: {} - - eslint@8.57.0: - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@eslint-community/regexpp': 4.10.0 - '@eslint/eslintrc': 2.1.4 - '@eslint/js': 8.57.0 - '@humanwhocodes/config-array': 0.11.14 - '@humanwhocodes/module-importer': 1.0.1 - '@nodelib/fs.walk': 1.2.8 - '@ungap/structured-clone': 1.2.0 - ajv: 6.12.6 - chalk: 4.1.2 - cross-spawn: 7.0.3 - debug: 4.3.4 - doctrine: 3.0.0 - escape-string-regexp: 4.0.0 - eslint-scope: 7.2.2 - eslint-visitor-keys: 3.4.3 - espree: 9.6.1 - esquery: 1.5.0 - esutils: 2.0.3 - fast-deep-equal: 3.1.3 - file-entry-cache: 6.0.1 - find-up: 5.0.0 - glob-parent: 6.0.2 - globals: 13.24.0 - graphemer: 1.4.0 - ignore: 5.3.1 - imurmurhash: 0.1.4 - is-glob: 4.0.3 - is-path-inside: 3.0.3 - js-yaml: 4.1.0 - json-stable-stringify-without-jsonify: 1.0.1 - levn: 0.4.1 - lodash.merge: 4.6.2 - minimatch: 3.1.2 - natural-compare: 1.4.0 - optionator: 0.9.4 - strip-ansi: 6.0.1 - text-table: 0.2.0 - transitivePeerDependencies: - - supports-color - - espree@9.6.1: - dependencies: - acorn: 8.11.3 - acorn-jsx: 5.3.2(acorn@8.11.3) - eslint-visitor-keys: 3.4.3 - - esprima@4.0.1: {} - - esquery@1.5.0: - dependencies: - estraverse: 5.3.0 - - esrecurse@4.3.0: - dependencies: - estraverse: 5.3.0 - - estraverse@4.3.0: {} - - estraverse@5.3.0: {} - - esutils@2.0.3: {} - - etag@1.8.1: {} - - eventemitter3@4.0.7: {} - - events@3.3.0: {} - - execa@5.1.1: - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 2.1.0 - is-stream: 2.0.1 - merge-stream: 2.0.0 - npm-run-path: 4.0.1 - onetime: 5.1.2 - signal-exit: 3.0.7 - strip-final-newline: 2.0.0 - - exponential-backoff@3.1.1: {} - - express@4.19.2: - dependencies: - accepts: 1.3.8 - array-flatten: 1.1.1 - body-parser: 1.20.2 - content-disposition: 0.5.4 - content-type: 1.0.5 - cookie: 0.6.0 - cookie-signature: 1.0.6 - debug: 2.6.9 - depd: 2.0.0 - encodeurl: 1.0.2 - escape-html: 1.0.3 - etag: 1.8.1 - finalhandler: 1.2.0 - fresh: 0.5.2 - http-errors: 2.0.0 - merge-descriptors: 1.0.1 - methods: 1.1.2 - on-finished: 2.4.1 - parseurl: 1.3.3 - path-to-regexp: 0.1.7 - proxy-addr: 2.0.7 - qs: 6.11.0 - range-parser: 1.2.1 - safe-buffer: 5.2.1 - send: 0.18.0 - serve-static: 1.15.0 - setprototypeof: 1.2.0 - statuses: 2.0.1 - type-is: 1.6.18 - utils-merge: 1.0.1 - vary: 1.1.2 - transitivePeerDependencies: - - supports-color - - extend@3.0.2: {} - - external-editor@3.1.0: - dependencies: - chardet: 0.7.0 - iconv-lite: 0.4.24 - tmp: 0.0.33 - - fast-deep-equal@3.1.3: {} - - fast-glob@3.3.2: - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.7 - - fast-json-stable-stringify@2.1.0: {} - - fast-levenshtein@2.0.6: {} - - fastq@1.17.1: - dependencies: - reusify: 1.0.4 - - faye-websocket@0.11.4: - dependencies: - websocket-driver: 0.7.4 - - figures@3.2.0: - dependencies: - escape-string-regexp: 1.0.5 - - file-entry-cache@6.0.1: - dependencies: - flat-cache: 3.2.0 - - filelist@1.0.4: - dependencies: - minimatch: 5.1.6 - - fill-range@7.1.1: - dependencies: - to-regex-range: 5.0.1 - - finalhandler@1.1.2: - dependencies: - debug: 2.6.9 - encodeurl: 1.0.2 - escape-html: 1.0.3 - on-finished: 2.3.0 - parseurl: 1.3.3 - statuses: 1.5.0 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - - finalhandler@1.2.0: - dependencies: - debug: 2.6.9 - encodeurl: 1.0.2 - escape-html: 1.0.3 - on-finished: 2.4.1 - parseurl: 1.3.3 - statuses: 2.0.1 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - - find-cache-dir@4.0.0: - dependencies: - common-path-prefix: 3.0.0 - pkg-dir: 7.0.0 - - find-up@4.1.0: - dependencies: - locate-path: 5.0.0 - path-exists: 4.0.0 - - find-up@5.0.0: - dependencies: - locate-path: 6.0.0 - path-exists: 4.0.0 - - find-up@6.3.0: - dependencies: - locate-path: 7.2.0 - path-exists: 5.0.0 - - flat-cache@3.2.0: - dependencies: - flatted: 3.3.1 - keyv: 4.5.4 - rimraf: 3.0.2 - - flat@5.0.2: {} - - flatted@3.3.1: {} - - follow-redirects@1.15.6: {} - - foreground-child@3.1.1: - dependencies: - cross-spawn: 7.0.3 - signal-exit: 4.1.0 - - form-data@4.0.0: - dependencies: - asynckit: 0.4.0 - combined-stream: 1.0.8 - mime-types: 2.1.35 - - forwarded@0.2.0: {} - - fraction.js@4.3.7: {} - - fresh@0.5.2: {} - - fs-constants@1.0.0: {} - - fs-extra@11.2.0: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.1.0 - universalify: 2.0.1 - - fs-extra@8.1.0: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 4.0.0 - universalify: 0.1.2 - - fs-minipass@2.1.0: - dependencies: - minipass: 3.3.6 - - fs-minipass@3.0.3: - dependencies: - minipass: 7.1.2 - - fs-monkey@1.0.6: {} - - fs.realpath@1.0.0: {} - - fsevents@2.3.3: - optional: true - - function-bind@1.1.2: {} - - gensync@1.0.0-beta.2: {} - - get-caller-file@2.0.5: {} - - get-intrinsic@1.2.4: - dependencies: - es-errors: 1.3.0 - function-bind: 1.1.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - - get-package-type@0.1.0: {} - - get-stream@6.0.1: {} - - glob-parent@5.1.2: - dependencies: - is-glob: 4.0.3 - - glob-parent@6.0.2: - dependencies: - is-glob: 4.0.3 - - glob-to-regexp@0.4.1: {} - - glob@10.4.1: - dependencies: - foreground-child: 3.1.1 - jackspeak: 3.1.2 - minimatch: 9.0.4 - minipass: 7.1.2 - path-scurry: 1.11.1 - - glob@7.2.3: - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 - - globals@11.12.0: {} - - globals@13.24.0: - dependencies: - type-fest: 0.20.2 - - globby@11.1.0: - dependencies: - array-union: 2.1.0 - dir-glob: 3.0.1 - fast-glob: 3.3.2 - ignore: 5.3.1 - merge2: 1.4.1 - slash: 3.0.0 - - globby@13.2.2: - dependencies: - dir-glob: 3.0.1 - fast-glob: 3.3.2 - ignore: 5.3.1 - merge2: 1.4.1 - slash: 4.0.0 - - gopd@1.0.1: - dependencies: - get-intrinsic: 1.2.4 - - graceful-fs@4.2.11: {} - - graphemer@1.4.0: {} - - graphql@16.8.1: {} - - handle-thing@2.0.1: {} - - has-flag@3.0.0: {} - - has-flag@4.0.0: {} - - has-property-descriptors@1.0.2: - dependencies: - es-define-property: 1.0.0 - - has-proto@1.0.3: {} - - has-symbols@1.0.3: {} - - hasown@2.0.2: - dependencies: - function-bind: 1.1.2 - - headers-polyfill@4.0.3: {} - - hosted-git-info@7.0.2: - dependencies: - lru-cache: 10.2.2 - - hpack.js@2.1.6: - dependencies: - inherits: 2.0.4 - obuf: 1.1.2 - readable-stream: 2.3.8 - wbuf: 1.7.3 - - html-entities@2.5.2: {} - - html-escaper@2.0.2: {} - - htmlparser2@8.0.2: - dependencies: - domelementtype: 2.3.0 - domhandler: 5.0.3 - domutils: 3.1.0 - entities: 4.5.0 - - http-cache-semantics@4.1.1: {} - - http-deceiver@1.2.7: {} - - http-errors@1.6.3: - dependencies: - depd: 1.1.2 - inherits: 2.0.3 - setprototypeof: 1.1.0 - statuses: 1.5.0 - - http-errors@2.0.0: - dependencies: - depd: 2.0.0 - inherits: 2.0.4 - setprototypeof: 1.2.0 - statuses: 2.0.1 - toidentifier: 1.0.1 - - http-parser-js@0.5.8: {} - - http-proxy-agent@7.0.2: - dependencies: - agent-base: 7.1.1 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - - http-proxy-middleware@2.0.6(@types/express@4.17.21): - dependencies: - '@types/http-proxy': 1.17.14 - http-proxy: 1.18.1 - is-glob: 4.0.3 - is-plain-obj: 3.0.0 - micromatch: 4.0.7 - optionalDependencies: - '@types/express': 4.17.21 - transitivePeerDependencies: - - debug - - http-proxy@1.18.1: - dependencies: - eventemitter3: 4.0.7 - follow-redirects: 1.15.6 - requires-port: 1.0.0 - transitivePeerDependencies: - - debug - - https-proxy-agent@7.0.4: - dependencies: - agent-base: 7.1.1 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - - human-signals@2.1.0: {} - - iconv-lite@0.4.24: - dependencies: - safer-buffer: 2.1.2 - - iconv-lite@0.6.3: - dependencies: - safer-buffer: 2.1.2 - - icss-utils@5.1.0(postcss@8.4.35): - dependencies: - postcss: 8.4.35 - - ieee754@1.2.1: {} - - ignore-walk@6.0.5: - dependencies: - minimatch: 9.0.4 - - ignore@5.3.1: {} - - image-size@0.5.5: - optional: true - - immutable@4.3.6: {} - - import-fresh@3.3.0: - dependencies: - parent-module: 1.0.1 - resolve-from: 4.0.0 - - imurmurhash@0.1.4: {} - - indent-string@4.0.0: {} - - inflight@1.0.6: - dependencies: - once: 1.4.0 - wrappy: 1.0.2 - - inherits@2.0.3: {} - - inherits@2.0.4: {} - - ini@4.1.2: {} - - inquirer@9.2.15: - dependencies: - '@ljharb/through': 2.3.13 - ansi-escapes: 4.3.2 - chalk: 5.3.0 - cli-cursor: 3.1.0 - cli-width: 4.1.0 - external-editor: 3.1.0 - figures: 3.2.0 - lodash: 4.17.21 - mute-stream: 1.0.0 - ora: 5.4.1 - run-async: 3.0.0 - rxjs: 7.8.1 - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 6.2.0 - - ip-address@9.0.5: - dependencies: - jsbn: 1.1.0 - sprintf-js: 1.1.3 - - ipaddr.js@1.9.1: {} - - ipaddr.js@2.2.0: {} - - is-arrayish@0.2.1: {} - - is-binary-path@2.1.0: - dependencies: - binary-extensions: 2.3.0 - - is-core-module@2.13.1: - dependencies: - hasown: 2.0.2 - - is-docker@2.2.1: {} - - is-extglob@2.1.1: {} - - is-fullwidth-code-point@3.0.0: {} - - is-glob@4.0.3: - dependencies: - is-extglob: 2.1.1 - - is-interactive@1.0.0: {} - - is-lambda@1.0.1: {} - - is-node-process@1.2.0: {} - - is-number@7.0.0: {} - - is-path-inside@3.0.3: {} - - is-plain-obj@3.0.0: {} - - is-plain-object@2.0.4: - dependencies: - isobject: 3.0.1 - - is-stream@2.0.1: {} - - is-unicode-supported@0.1.0: {} - - is-what@3.14.1: {} - - is-wsl@2.2.0: - dependencies: - is-docker: 2.2.1 - - isarray@1.0.0: {} - - isbinaryfile@4.0.10: {} - - isexe@2.0.0: {} - - isexe@3.1.1: {} - - isobject@3.0.1: {} - - istanbul-lib-coverage@3.2.2: {} - - istanbul-lib-instrument@5.2.1: - dependencies: - '@babel/core': 7.24.6 - '@babel/parser': 7.24.6 - '@istanbuljs/schema': 0.1.3 - istanbul-lib-coverage: 3.2.2 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - - istanbul-lib-report@3.0.1: - dependencies: - istanbul-lib-coverage: 3.2.2 - make-dir: 4.0.0 - supports-color: 7.2.0 - - istanbul-lib-source-maps@4.0.1: - dependencies: - debug: 4.3.4 - istanbul-lib-coverage: 3.2.2 - source-map: 0.6.1 - transitivePeerDependencies: - - supports-color - - istanbul-reports@3.1.7: - dependencies: - html-escaper: 2.0.2 - istanbul-lib-report: 3.0.1 - - jackspeak@3.1.2: - dependencies: - '@isaacs/cliui': 8.0.2 - optionalDependencies: - '@pkgjs/parseargs': 0.11.0 - - jake@10.9.1: - dependencies: - async: 3.2.5 - chalk: 4.1.2 - filelist: 1.0.4 - minimatch: 3.1.2 - - jasmine-core@4.6.1: {} - - jest-diff@29.7.0: - dependencies: - chalk: 4.1.2 - diff-sequences: 29.6.3 - jest-get-type: 29.6.3 - pretty-format: 29.7.0 - - jest-get-type@29.6.3: {} - - jest-worker@27.5.1: - dependencies: - '@types/node': 20.12.12 - merge-stream: 2.0.0 - supports-color: 8.1.1 - - jiti@1.21.0: {} - - js-tokens@4.0.0: {} - - js-yaml@3.14.1: - dependencies: - argparse: 1.0.10 - esprima: 4.0.1 - - js-yaml@4.1.0: - dependencies: - argparse: 2.0.1 - - jsbn@1.1.0: {} - - jsesc@0.5.0: {} - - jsesc@2.5.2: {} - - json-buffer@3.0.1: {} - - json-parse-even-better-errors@2.3.1: {} - - json-parse-even-better-errors@3.0.2: {} - - json-schema-traverse@0.4.1: {} - - json-schema-traverse@1.0.0: {} - - json-stable-stringify-without-jsonify@1.0.1: {} - - json5@2.2.3: {} - - jsonc-parser@3.2.0: {} - - jsonc-parser@3.2.1: {} - - jsonfile@4.0.0: - optionalDependencies: - graceful-fs: 4.2.11 - - jsonfile@6.1.0: - dependencies: - universalify: 2.0.1 - optionalDependencies: - graceful-fs: 4.2.11 - - jsonparse@1.3.1: {} - - karma-chrome-launcher@3.2.0: - dependencies: - which: 1.3.1 - - karma-coverage@2.2.1: - dependencies: - istanbul-lib-coverage: 3.2.2 - istanbul-lib-instrument: 5.2.1 - istanbul-lib-report: 3.0.1 - istanbul-lib-source-maps: 4.0.1 - istanbul-reports: 3.1.7 - minimatch: 3.1.2 - transitivePeerDependencies: - - supports-color - - karma-jasmine-html-reporter@2.1.0(jasmine-core@4.6.1)(karma-jasmine@5.1.0(karma@6.4.3))(karma@6.4.3): - dependencies: - jasmine-core: 4.6.1 - karma: 6.4.3 - karma-jasmine: 5.1.0(karma@6.4.3) - - karma-jasmine@5.1.0(karma@6.4.3): - dependencies: - jasmine-core: 4.6.1 - karma: 6.4.3 - - karma-source-map-support@1.4.0: - dependencies: - source-map-support: 0.5.21 - - karma@6.4.3: - dependencies: - '@colors/colors': 1.5.0 - body-parser: 1.20.2 - braces: 3.0.3 - chokidar: 3.6.0 - connect: 3.7.0 - di: 0.0.1 - dom-serialize: 2.2.1 - glob: 7.2.3 - graceful-fs: 4.2.11 - http-proxy: 1.18.1 - isbinaryfile: 4.0.10 - lodash: 4.17.21 - log4js: 6.9.1 - mime: 2.6.0 - minimatch: 3.1.2 - mkdirp: 0.5.6 - qjobs: 1.2.0 - range-parser: 1.2.1 - rimraf: 3.0.2 - socket.io: 4.7.5 - source-map: 0.6.1 - tmp: 0.2.3 - ua-parser-js: 0.7.37 - yargs: 16.2.0 - transitivePeerDependencies: - - bufferutil - - debug - - supports-color - - utf-8-validate - - keyv@4.5.4: - dependencies: - json-buffer: 3.0.1 - - kind-of@6.0.3: {} - - klona@2.0.6: {} - - launch-editor@2.6.1: - dependencies: - picocolors: 1.0.1 - shell-quote: 1.8.1 - - less-loader@11.1.0(less@4.2.0)(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - klona: 2.0.6 - less: 4.2.0 - webpack: 5.90.3(esbuild@0.20.1) - - less@4.2.0: - dependencies: - copy-anything: 2.0.6 - parse-node-version: 1.0.1 - tslib: 2.6.2 - optionalDependencies: - errno: 0.1.8 - graceful-fs: 4.2.11 - image-size: 0.5.5 - make-dir: 2.1.0 - mime: 1.6.0 - needle: 3.3.1 - source-map: 0.6.1 - - levn@0.4.1: - dependencies: - prelude-ls: 1.2.1 - type-check: 0.4.0 - - license-webpack-plugin@4.0.2(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - webpack-sources: 3.2.3 - optionalDependencies: - webpack: 5.90.3(esbuild@0.20.1) - - lines-and-columns@1.2.4: {} - - lines-and-columns@2.0.4: {} - - loader-runner@4.3.0: {} - - loader-utils@2.0.4: - dependencies: - big.js: 5.2.2 - emojis-list: 3.0.0 - json5: 2.2.3 - - loader-utils@3.2.1: {} - - locate-path@5.0.0: - dependencies: - p-locate: 4.1.0 - - locate-path@6.0.0: - dependencies: - p-locate: 5.0.0 - - locate-path@7.2.0: - dependencies: - p-locate: 6.0.0 - - lodash.debounce@4.0.8: {} - - lodash.merge@4.6.2: {} - - lodash@4.17.21: {} - - log-symbols@4.1.0: - dependencies: - chalk: 4.1.2 - is-unicode-supported: 0.1.0 - - log4js@6.9.1: - dependencies: - date-format: 4.0.14 - debug: 4.3.4 - flatted: 3.3.1 - rfdc: 1.3.1 - streamroller: 3.1.5 - transitivePeerDependencies: - - supports-color - - lru-cache@10.2.2: {} - - lru-cache@5.1.1: - dependencies: - yallist: 3.1.1 - - lru-cache@6.0.0: - dependencies: - yallist: 4.0.0 - - magic-string@0.30.8: - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - - make-dir@2.1.0: - dependencies: - pify: 4.0.1 - semver: 5.7.2 - optional: true - - make-dir@4.0.0: - dependencies: - semver: 7.6.2 - - make-fetch-happen@13.0.1: - dependencies: - '@npmcli/agent': 2.2.2 - cacache: 18.0.3 - http-cache-semantics: 4.1.1 - is-lambda: 1.0.1 - minipass: 7.1.2 - minipass-fetch: 3.0.5 - minipass-flush: 1.0.5 - minipass-pipeline: 1.2.4 - negotiator: 0.6.3 - proc-log: 4.2.0 - promise-retry: 2.0.1 - ssri: 10.0.6 - transitivePeerDependencies: - - supports-color - - media-typer@0.3.0: {} - - memfs@3.5.3: - dependencies: - fs-monkey: 1.0.6 - - merge-descriptors@1.0.1: {} - - merge-stream@2.0.0: {} - - merge2@1.4.1: {} - - methods@1.1.2: {} - - micromatch@4.0.7: - dependencies: - braces: 3.0.3 - picomatch: 2.3.1 - - mime-db@1.52.0: {} - - mime-types@2.1.35: - dependencies: - mime-db: 1.52.0 - - mime@1.6.0: {} - - mime@2.6.0: {} - - mimic-fn@2.1.0: {} - - mini-css-extract-plugin@2.8.1(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - schema-utils: 4.2.0 - tapable: 2.2.1 - webpack: 5.90.3(esbuild@0.20.1) - - minimalistic-assert@1.0.1: {} - - minimatch@3.1.2: - dependencies: - brace-expansion: 1.1.11 - - minimatch@5.1.6: - dependencies: - brace-expansion: 2.0.1 - - minimatch@9.0.3: - dependencies: - brace-expansion: 2.0.1 - - minimatch@9.0.4: - dependencies: - brace-expansion: 2.0.1 - - minimist@1.2.8: {} - - minipass-collect@2.0.1: - dependencies: - minipass: 7.1.2 - - minipass-fetch@3.0.5: - dependencies: - minipass: 7.1.2 - minipass-sized: 1.0.3 - minizlib: 2.1.2 - optionalDependencies: - encoding: 0.1.13 - - minipass-flush@1.0.5: - dependencies: - minipass: 3.3.6 - - minipass-json-stream@1.0.1: - dependencies: - jsonparse: 1.3.1 - minipass: 3.3.6 - - minipass-pipeline@1.2.4: - dependencies: - minipass: 3.3.6 - - minipass-sized@1.0.3: - dependencies: - minipass: 3.3.6 - - minipass@3.3.6: - dependencies: - yallist: 4.0.0 - - minipass@5.0.0: {} - - minipass@7.1.2: {} - - minizlib@2.1.2: - dependencies: - minipass: 3.3.6 - yallist: 4.0.0 - - mkdirp@0.5.6: - dependencies: - minimist: 1.2.8 - - mkdirp@1.0.4: {} - - mrmime@2.0.0: {} - - ms@2.0.0: {} - - ms@2.1.2: {} - - ms@2.1.3: {} - - msw@2.3.0(typescript@5.2.2): - dependencies: - '@bundled-es-modules/cookie': 2.0.0 - '@bundled-es-modules/statuses': 1.0.1 - '@inquirer/confirm': 3.1.8 - '@mswjs/cookies': 1.1.0 - '@mswjs/interceptors': 0.29.1 - '@open-draft/until': 2.1.0 - '@types/cookie': 0.6.0 - '@types/statuses': 2.0.5 - chalk: 4.1.2 - graphql: 16.8.1 - headers-polyfill: 4.0.3 - is-node-process: 1.2.0 - outvariant: 1.4.2 - path-to-regexp: 6.2.2 - strict-event-emitter: 0.5.1 - type-fest: 4.18.3 - yargs: 17.7.2 - optionalDependencies: - typescript: 5.2.2 - - multicast-dns@7.2.5: - dependencies: - dns-packet: 5.6.1 - thunky: 1.1.0 - - mute-stream@1.0.0: {} - - nanoid@3.3.7: {} - - natural-compare@1.4.0: {} - - needle@3.3.1: - dependencies: - iconv-lite: 0.6.3 - sax: 1.4.1 - optional: true - - negotiator@0.6.3: {} - - neo-async@2.6.2: {} - - nice-napi@1.0.2: - dependencies: - node-addon-api: 3.2.1 - node-gyp-build: 4.8.1 - optional: true - - node-addon-api@3.2.1: - optional: true - - node-forge@1.3.1: {} - - node-gyp-build@4.8.1: - optional: true - - node-gyp@10.1.0: - dependencies: - env-paths: 2.2.1 - exponential-backoff: 3.1.1 - glob: 10.4.1 - graceful-fs: 4.2.11 - make-fetch-happen: 13.0.1 - nopt: 7.2.1 - proc-log: 3.0.0 - semver: 7.6.0 - tar: 6.2.1 - which: 4.0.0 - transitivePeerDependencies: - - supports-color - - node-machine-id@1.1.12: {} - - node-releases@2.0.14: {} - - nopt@7.2.1: - dependencies: - abbrev: 2.0.0 - - normalize-package-data@6.0.1: - dependencies: - hosted-git-info: 7.0.2 - is-core-module: 2.13.1 - semver: 7.6.0 - validate-npm-package-license: 3.0.4 - - normalize-path@3.0.0: {} - - normalize-range@0.1.2: {} - - npm-bundled@3.0.1: - dependencies: - npm-normalize-package-bin: 3.0.1 - - npm-install-checks@6.3.0: - dependencies: - semver: 7.6.0 - - npm-normalize-package-bin@3.0.1: {} - - npm-package-arg@11.0.1: - dependencies: - hosted-git-info: 7.0.2 - proc-log: 3.0.0 - semver: 7.6.0 - validate-npm-package-name: 5.0.1 - - npm-packlist@8.0.2: - dependencies: - ignore-walk: 6.0.5 - - npm-pick-manifest@9.0.0: - dependencies: - npm-install-checks: 6.3.0 - npm-normalize-package-bin: 3.0.1 - npm-package-arg: 11.0.1 - semver: 7.6.0 - - npm-registry-fetch@16.2.1: - dependencies: - '@npmcli/redact': 1.1.0 - make-fetch-happen: 13.0.1 - minipass: 7.1.2 - minipass-fetch: 3.0.5 - minipass-json-stream: 1.0.1 - minizlib: 2.1.2 - npm-package-arg: 11.0.1 - proc-log: 4.2.0 - transitivePeerDependencies: - - supports-color - - npm-run-path@4.0.1: - dependencies: - path-key: 3.1.1 - - nth-check@2.1.1: - dependencies: - boolbase: 1.0.0 - - nx@19.1.0: - dependencies: - '@nrwl/tao': 19.1.0 - '@yarnpkg/lockfile': 1.1.0 - '@yarnpkg/parsers': 3.0.0-rc.46 - '@zkochan/js-yaml': 0.0.7 - axios: 1.7.2 - chalk: 4.1.2 - cli-cursor: 3.1.0 - cli-spinners: 2.6.1 - cliui: 8.0.1 - dotenv: 16.3.2 - dotenv-expand: 10.0.0 - enquirer: 2.3.6 - figures: 3.2.0 - flat: 5.0.2 - fs-extra: 11.2.0 - ignore: 5.3.1 - jest-diff: 29.7.0 - jsonc-parser: 3.2.0 - lines-and-columns: 2.0.4 - minimatch: 9.0.3 - node-machine-id: 1.1.12 - npm-run-path: 4.0.1 - open: 8.4.2 - ora: 5.3.0 - semver: 7.6.2 - string-width: 4.2.3 - strong-log-transformer: 2.1.0 - tar-stream: 2.2.0 - tmp: 0.2.3 - tsconfig-paths: 4.2.0 - tslib: 2.6.2 - yargs: 17.7.2 - yargs-parser: 21.1.1 - optionalDependencies: - '@nx/nx-darwin-arm64': 19.1.0 - '@nx/nx-darwin-x64': 19.1.0 - '@nx/nx-freebsd-x64': 19.1.0 - '@nx/nx-linux-arm-gnueabihf': 19.1.0 - '@nx/nx-linux-arm64-gnu': 19.1.0 - '@nx/nx-linux-arm64-musl': 19.1.0 - '@nx/nx-linux-x64-gnu': 19.1.0 - '@nx/nx-linux-x64-musl': 19.1.0 - '@nx/nx-win32-arm64-msvc': 19.1.0 - '@nx/nx-win32-x64-msvc': 19.1.0 - transitivePeerDependencies: - - debug - - object-assign@4.1.1: {} - - object-inspect@1.13.1: {} - - obuf@1.1.2: {} - - on-finished@2.3.0: - dependencies: - ee-first: 1.1.1 - - on-finished@2.4.1: - dependencies: - ee-first: 1.1.1 - - on-headers@1.0.2: {} - - once@1.4.0: - dependencies: - wrappy: 1.0.2 - - onetime@5.1.2: - dependencies: - mimic-fn: 2.1.0 - - open@8.4.2: - dependencies: - define-lazy-prop: 2.0.0 - is-docker: 2.2.1 - is-wsl: 2.2.0 - - optionator@0.9.4: - dependencies: - deep-is: 0.1.4 - fast-levenshtein: 2.0.6 - levn: 0.4.1 - prelude-ls: 1.2.1 - type-check: 0.4.0 - word-wrap: 1.2.5 - - ora@5.3.0: - dependencies: - bl: 4.1.0 - chalk: 4.1.2 - cli-cursor: 3.1.0 - cli-spinners: 2.9.2 - is-interactive: 1.0.0 - log-symbols: 4.1.0 - strip-ansi: 6.0.1 - wcwidth: 1.0.1 - - ora@5.4.1: - dependencies: - bl: 4.1.0 - chalk: 4.1.2 - cli-cursor: 3.1.0 - cli-spinners: 2.9.2 - is-interactive: 1.0.0 - is-unicode-supported: 0.1.0 - log-symbols: 4.1.0 - strip-ansi: 6.0.1 - wcwidth: 1.0.1 - - os-tmpdir@1.0.2: {} - - outvariant@1.4.2: {} - - p-limit@2.3.0: - dependencies: - p-try: 2.2.0 - - p-limit@3.1.0: - dependencies: - yocto-queue: 0.1.0 - - p-limit@4.0.0: - dependencies: - yocto-queue: 1.0.0 - - p-locate@4.1.0: - dependencies: - p-limit: 2.3.0 - - p-locate@5.0.0: - dependencies: - p-limit: 3.1.0 - - p-locate@6.0.0: - dependencies: - p-limit: 4.0.0 - - p-map@4.0.0: - dependencies: - aggregate-error: 3.1.0 - - p-retry@4.6.2: - dependencies: - '@types/retry': 0.12.0 - retry: 0.13.1 - - p-try@2.2.0: {} - - pacote@17.0.6: - dependencies: - '@npmcli/git': 5.0.7 - '@npmcli/installed-package-contents': 2.1.0 - '@npmcli/promise-spawn': 7.0.2 - '@npmcli/run-script': 7.0.4 - cacache: 18.0.3 - fs-minipass: 3.0.3 - minipass: 7.1.2 - npm-package-arg: 11.0.1 - npm-packlist: 8.0.2 - npm-pick-manifest: 9.0.0 - npm-registry-fetch: 16.2.1 - proc-log: 3.0.0 - promise-retry: 2.0.1 - read-package-json: 7.0.1 - read-package-json-fast: 3.0.2 - sigstore: 2.3.1 - ssri: 10.0.6 - tar: 6.2.1 - transitivePeerDependencies: - - bluebird - - supports-color - - parent-module@1.0.1: - dependencies: - callsites: 3.1.0 - - parse-json@5.2.0: - dependencies: - '@babel/code-frame': 7.24.6 - error-ex: 1.3.2 - json-parse-even-better-errors: 2.3.1 - lines-and-columns: 1.2.4 - - parse-node-version@1.0.1: {} - - parse5-html-rewriting-stream@7.0.0: - dependencies: - entities: 4.5.0 - parse5: 7.1.2 - parse5-sax-parser: 7.0.0 - - parse5-sax-parser@7.0.0: - dependencies: - parse5: 7.1.2 - - parse5@7.1.2: - dependencies: - entities: 4.5.0 - - parseurl@1.3.3: {} - - path-exists@4.0.0: {} - - path-exists@5.0.0: {} - - path-is-absolute@1.0.1: {} - - path-key@3.1.1: {} - - path-parse@1.0.7: {} - - path-scurry@1.11.1: - dependencies: - lru-cache: 10.2.2 - minipass: 7.1.2 - - path-to-regexp@0.1.7: {} - - path-to-regexp@6.2.2: {} - - path-type@4.0.0: {} - - picocolors@1.0.1: {} - - picomatch@2.3.1: {} - - picomatch@4.0.1: {} - - pify@4.0.1: - optional: true - - piscina@4.4.0: - optionalDependencies: - nice-napi: 1.0.2 - - pkg-dir@7.0.0: - dependencies: - find-up: 6.3.0 - - postcss-loader@8.1.1(postcss@8.4.35)(typescript@5.2.2)(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - cosmiconfig: 9.0.0(typescript@5.2.2) - jiti: 1.21.0 - postcss: 8.4.35 - semver: 7.6.0 - optionalDependencies: - webpack: 5.90.3(esbuild@0.20.1) - transitivePeerDependencies: - - typescript - - postcss-media-query-parser@0.2.3: {} - - postcss-modules-extract-imports@3.1.0(postcss@8.4.35): - dependencies: - postcss: 8.4.35 - - postcss-modules-local-by-default@4.0.5(postcss@8.4.35): - dependencies: - icss-utils: 5.1.0(postcss@8.4.35) - postcss: 8.4.35 - postcss-selector-parser: 6.1.0 - postcss-value-parser: 4.2.0 - - postcss-modules-scope@3.2.0(postcss@8.4.35): - dependencies: - postcss: 8.4.35 - postcss-selector-parser: 6.1.0 - - postcss-modules-values@4.0.0(postcss@8.4.35): - dependencies: - icss-utils: 5.1.0(postcss@8.4.35) - postcss: 8.4.35 - - postcss-selector-parser@6.1.0: - dependencies: - cssesc: 3.0.0 - util-deprecate: 1.0.2 - - postcss-value-parser@4.2.0: {} - - postcss@8.4.35: - dependencies: - nanoid: 3.3.7 - picocolors: 1.0.1 - source-map-js: 1.2.0 - - prelude-ls@1.2.1: {} - - prettier@3.2.5: {} - - pretty-format@29.7.0: - dependencies: - '@jest/schemas': 29.6.3 - ansi-styles: 5.2.0 - react-is: 18.3.1 - - primeflex@3.3.1: {} - - primeicons@6.0.1: {} - - primeng@17.2.0(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/forms@17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(rxjs@7.8.1))(rxjs@7.8.1)(zone.js@0.14.6): - dependencies: - '@angular/common': 17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1) - '@angular/core': 17.3.10(rxjs@7.8.1)(zone.js@0.14.6) - '@angular/forms': 17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(rxjs@7.8.1) - rxjs: 7.8.1 - tslib: 2.6.2 - zone.js: 0.14.6 - - prismjs@1.29.0: {} - - proc-log@3.0.0: {} - - proc-log@4.2.0: {} - - process-nextick-args@2.0.1: {} - - promise-inflight@1.0.1: {} - - promise-retry@2.0.1: - dependencies: - err-code: 2.0.3 - retry: 0.12.0 - - proxy-addr@2.0.7: - dependencies: - forwarded: 0.2.0 - ipaddr.js: 1.9.1 - - proxy-from-env@1.1.0: {} - - prr@1.0.1: - optional: true - - punycode@2.3.1: {} - - qjobs@1.2.0: {} - - qs@6.11.0: - dependencies: - side-channel: 1.0.6 - - queue-microtask@1.2.3: {} - - randombytes@2.1.0: - dependencies: - safe-buffer: 5.2.1 - - range-parser@1.2.1: {} - - raw-body@2.5.2: - dependencies: - bytes: 3.1.2 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - unpipe: 1.0.0 - - react-is@18.3.1: {} - - read-package-json-fast@3.0.2: - dependencies: - json-parse-even-better-errors: 3.0.2 - npm-normalize-package-bin: 3.0.1 - - read-package-json@7.0.1: - dependencies: - glob: 10.4.1 - json-parse-even-better-errors: 3.0.2 - normalize-package-data: 6.0.1 - npm-normalize-package-bin: 3.0.1 - - readable-stream@2.3.8: - dependencies: - core-util-is: 1.0.3 - inherits: 2.0.4 - isarray: 1.0.0 - process-nextick-args: 2.0.1 - safe-buffer: 5.1.2 - string_decoder: 1.1.1 - util-deprecate: 1.0.2 - - readable-stream@3.6.2: - dependencies: - inherits: 2.0.4 - string_decoder: 1.3.0 - util-deprecate: 1.0.2 - - readdirp@3.6.0: - dependencies: - picomatch: 2.3.1 - - reflect-metadata@0.2.2: {} - - regenerate-unicode-properties@10.1.1: - dependencies: - regenerate: 1.4.2 - - regenerate@1.4.2: {} - - regenerator-runtime@0.14.1: {} - - regenerator-transform@0.15.2: - dependencies: - '@babel/runtime': 7.24.0 - - regex-parser@2.3.0: {} - - regexpu-core@5.3.2: - dependencies: - '@babel/regjsgen': 0.8.0 - regenerate: 1.4.2 - regenerate-unicode-properties: 10.1.1 - regjsparser: 0.9.1 - unicode-match-property-ecmascript: 2.0.0 - unicode-match-property-value-ecmascript: 2.1.0 - - regjsparser@0.9.1: - dependencies: - jsesc: 0.5.0 - - require-directory@2.1.1: {} - - require-from-string@2.0.2: {} - - requires-port@1.0.0: {} - - resolve-from@4.0.0: {} - - resolve-from@5.0.0: {} - - resolve-url-loader@5.0.0: - dependencies: - adjust-sourcemap-loader: 4.0.0 - convert-source-map: 1.9.0 - loader-utils: 2.0.4 - postcss: 8.4.35 - source-map: 0.6.1 - - resolve@1.22.8: - dependencies: - is-core-module: 2.13.1 - path-parse: 1.0.7 - supports-preserve-symlinks-flag: 1.0.0 - - restore-cursor@3.1.0: - dependencies: - onetime: 5.1.2 - signal-exit: 3.0.7 - - retry@0.12.0: {} - - retry@0.13.1: {} - - reusify@1.0.4: {} - - rfdc@1.3.1: {} - - rimraf@3.0.2: - dependencies: - glob: 7.2.3 - - rollup@4.18.0: - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.18.0 - '@rollup/rollup-android-arm64': 4.18.0 - '@rollup/rollup-darwin-arm64': 4.18.0 - '@rollup/rollup-darwin-x64': 4.18.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.18.0 - '@rollup/rollup-linux-arm-musleabihf': 4.18.0 - '@rollup/rollup-linux-arm64-gnu': 4.18.0 - '@rollup/rollup-linux-arm64-musl': 4.18.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.18.0 - '@rollup/rollup-linux-riscv64-gnu': 4.18.0 - '@rollup/rollup-linux-s390x-gnu': 4.18.0 - '@rollup/rollup-linux-x64-gnu': 4.18.0 - '@rollup/rollup-linux-x64-musl': 4.18.0 - '@rollup/rollup-win32-arm64-msvc': 4.18.0 - '@rollup/rollup-win32-ia32-msvc': 4.18.0 - '@rollup/rollup-win32-x64-msvc': 4.18.0 - fsevents: 2.3.3 - - run-async@3.0.0: {} - - run-parallel@1.2.0: - dependencies: - queue-microtask: 1.2.3 - - rxjs@7.8.1: - dependencies: - tslib: 2.6.2 - - safe-buffer@5.1.2: {} - - safe-buffer@5.2.1: {} - - safer-buffer@2.1.2: {} - - sass-loader@14.1.1(sass@1.71.1)(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - neo-async: 2.6.2 - optionalDependencies: - sass: 1.71.1 - webpack: 5.90.3(esbuild@0.20.1) - - sass@1.71.1: - dependencies: - chokidar: 3.6.0 - immutable: 4.3.6 - source-map-js: 1.2.0 - - sax@1.4.1: - optional: true - - schema-utils@3.3.0: - dependencies: - '@types/json-schema': 7.0.15 - ajv: 6.12.6 - ajv-keywords: 3.5.2(ajv@6.12.6) - - schema-utils@4.2.0: - dependencies: - '@types/json-schema': 7.0.15 - ajv: 8.14.0 - ajv-formats: 2.1.1(ajv@8.14.0) - ajv-keywords: 5.1.0(ajv@8.14.0) - - select-hose@2.0.0: {} - - selfsigned@2.4.1: - dependencies: - '@types/node-forge': 1.3.11 - node-forge: 1.3.1 - - semver@5.7.2: - optional: true - - semver@6.3.1: {} - - semver@7.6.0: - dependencies: - lru-cache: 6.0.0 - - semver@7.6.2: {} - - send@0.18.0: - dependencies: - debug: 2.6.9 - depd: 2.0.0 - destroy: 1.2.0 - encodeurl: 1.0.2 - escape-html: 1.0.3 - etag: 1.8.1 - fresh: 0.5.2 - http-errors: 2.0.0 - mime: 1.6.0 - ms: 2.1.3 - on-finished: 2.4.1 - range-parser: 1.2.1 - statuses: 2.0.1 - transitivePeerDependencies: - - supports-color - - serialize-javascript@6.0.2: - dependencies: - randombytes: 2.1.0 - - serve-index@1.9.1: - dependencies: - accepts: 1.3.8 - batch: 0.6.1 - debug: 2.6.9 - escape-html: 1.0.3 - http-errors: 1.6.3 - mime-types: 2.1.35 - parseurl: 1.3.3 - transitivePeerDependencies: - - supports-color - - serve-static@1.15.0: - dependencies: - encodeurl: 1.0.2 - escape-html: 1.0.3 - parseurl: 1.3.3 - send: 0.18.0 - transitivePeerDependencies: - - supports-color - - set-function-length@1.2.2: - dependencies: - define-data-property: 1.1.4 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - - setprototypeof@1.1.0: {} - - setprototypeof@1.2.0: {} - - shallow-clone@3.0.1: - dependencies: - kind-of: 6.0.3 - - shebang-command@2.0.0: - dependencies: - shebang-regex: 3.0.0 - - shebang-regex@3.0.0: {} - - shell-quote@1.8.1: {} - - side-channel@1.0.6: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - object-inspect: 1.13.1 - - signal-exit@3.0.7: {} - - signal-exit@4.1.0: {} - - sigstore@2.3.1: - dependencies: - '@sigstore/bundle': 2.3.2 - '@sigstore/core': 1.1.0 - '@sigstore/protobuf-specs': 0.3.2 - '@sigstore/sign': 2.3.2 - '@sigstore/tuf': 2.3.4 - '@sigstore/verify': 1.2.1 - transitivePeerDependencies: - - supports-color - - slash@3.0.0: {} - - slash@4.0.0: {} - - smart-buffer@4.2.0: {} - - socket.io-adapter@2.5.4: - dependencies: - debug: 4.3.4 - ws: 8.11.0 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - - socket.io-parser@4.2.4: - dependencies: - '@socket.io/component-emitter': 3.1.2 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - - socket.io@4.7.5: - dependencies: - accepts: 1.3.8 - base64id: 2.0.0 - cors: 2.8.5 - debug: 4.3.4 - engine.io: 6.5.4 - socket.io-adapter: 2.5.4 - socket.io-parser: 4.2.4 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - - sockjs@0.3.24: - dependencies: - faye-websocket: 0.11.4 - uuid: 8.3.2 - websocket-driver: 0.7.4 - - socks-proxy-agent@8.0.3: - dependencies: - agent-base: 7.1.1 - debug: 4.3.4 - socks: 2.8.3 - transitivePeerDependencies: - - supports-color - - socks@2.8.3: - dependencies: - ip-address: 9.0.5 - smart-buffer: 4.2.0 - - source-map-js@1.2.0: {} - - source-map-loader@5.0.0(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - iconv-lite: 0.6.3 - source-map-js: 1.2.0 - webpack: 5.90.3(esbuild@0.20.1) - - source-map-support@0.5.21: - dependencies: - buffer-from: 1.1.2 - source-map: 0.6.1 - - source-map@0.6.1: {} - - source-map@0.7.4: {} - - spdx-correct@3.2.0: - dependencies: - spdx-expression-parse: 3.0.1 - spdx-license-ids: 3.0.18 - - spdx-exceptions@2.5.0: {} - - spdx-expression-parse@3.0.1: - dependencies: - spdx-exceptions: 2.5.0 - spdx-license-ids: 3.0.18 - - spdx-license-ids@3.0.18: {} - - spdy-transport@3.0.0: - dependencies: - debug: 4.3.4 - detect-node: 2.1.0 - hpack.js: 2.1.6 - obuf: 1.1.2 - readable-stream: 3.6.2 - wbuf: 1.7.3 - transitivePeerDependencies: - - supports-color - - spdy@4.0.2: - dependencies: - debug: 4.3.4 - handle-thing: 2.0.1 - http-deceiver: 1.2.7 - select-hose: 2.0.0 - spdy-transport: 3.0.0 - transitivePeerDependencies: - - supports-color - - sprintf-js@1.0.3: {} - - sprintf-js@1.1.3: {} - - ssri@10.0.6: - dependencies: - minipass: 7.1.2 - - statuses@1.5.0: {} - - statuses@2.0.1: {} - - streamroller@3.1.5: - dependencies: - date-format: 4.0.14 - debug: 4.3.4 - fs-extra: 8.1.0 - transitivePeerDependencies: - - supports-color - - strict-event-emitter@0.5.1: {} - - string-width@4.2.3: - dependencies: - emoji-regex: 8.0.0 - is-fullwidth-code-point: 3.0.0 - strip-ansi: 6.0.1 - - string-width@5.1.2: - dependencies: - eastasianwidth: 0.2.0 - emoji-regex: 9.2.2 - strip-ansi: 7.1.0 - - string_decoder@1.1.1: - dependencies: - safe-buffer: 5.1.2 - - string_decoder@1.3.0: - dependencies: - safe-buffer: 5.2.1 - - strip-ansi@6.0.1: - dependencies: - ansi-regex: 5.0.1 - - strip-ansi@7.1.0: - dependencies: - ansi-regex: 6.0.1 - - strip-bom@3.0.0: {} - - strip-final-newline@2.0.0: {} - - strip-json-comments@3.1.1: {} - - strong-log-transformer@2.1.0: - dependencies: - duplexer: 0.1.2 - minimist: 1.2.8 - through: 2.3.8 - - supports-color@5.5.0: - dependencies: - has-flag: 3.0.0 - - supports-color@7.2.0: - dependencies: - has-flag: 4.0.0 - - supports-color@8.1.1: - dependencies: - has-flag: 4.0.0 - - supports-preserve-symlinks-flag@1.0.0: {} - - symbol-observable@4.0.0: {} - - tapable@2.2.1: {} - - tar-stream@2.2.0: - dependencies: - bl: 4.1.0 - end-of-stream: 1.4.4 - fs-constants: 1.0.0 - inherits: 2.0.4 - readable-stream: 3.6.2 - - tar@6.2.1: - dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 - minipass: 5.0.0 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 - - terser-webpack-plugin@5.3.10(esbuild@0.20.1)(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - '@jridgewell/trace-mapping': 0.3.25 - jest-worker: 27.5.1 - schema-utils: 3.3.0 - serialize-javascript: 6.0.2 - terser: 5.29.1 - webpack: 5.90.3(esbuild@0.20.1) - optionalDependencies: - esbuild: 0.20.1 - - terser@5.29.1: - dependencies: - '@jridgewell/source-map': 0.3.6 - acorn: 8.11.3 - commander: 2.20.3 - source-map-support: 0.5.21 - - test-exclude@6.0.0: - dependencies: - '@istanbuljs/schema': 0.1.3 - glob: 7.2.3 - minimatch: 3.1.2 - - text-table@0.2.0: {} - - through@2.3.8: {} - - thunky@1.1.0: {} - - tmp@0.0.33: - dependencies: - os-tmpdir: 1.0.2 - - tmp@0.2.3: {} - - to-fast-properties@2.0.0: {} - - to-regex-range@5.0.1: - dependencies: - is-number: 7.0.0 - - toidentifier@1.0.1: {} - - tree-kill@1.2.2: {} - - ts-api-utils@1.3.0(typescript@5.2.2): - dependencies: - typescript: 5.2.2 - - tsconfig-paths@4.2.0: - dependencies: - json5: 2.2.3 - minimist: 1.2.8 - strip-bom: 3.0.0 - - tslib@2.6.2: {} - - tuf-js@2.2.1: - dependencies: - '@tufjs/models': 2.0.1 - debug: 4.3.4 - make-fetch-happen: 13.0.1 - transitivePeerDependencies: - - supports-color - - type-check@0.4.0: - dependencies: - prelude-ls: 1.2.1 - - type-fest@0.20.2: {} - - type-fest@0.21.3: {} - - type-fest@4.18.3: {} - - type-is@1.6.18: - dependencies: - media-typer: 0.3.0 - mime-types: 2.1.35 - - typed-assert@1.0.9: {} - - typescript@5.2.2: {} - - ua-parser-js@0.7.37: {} - - undici-types@5.26.5: {} - - undici@6.11.1: {} - - unicode-canonical-property-names-ecmascript@2.0.0: {} - - unicode-match-property-ecmascript@2.0.0: - dependencies: - unicode-canonical-property-names-ecmascript: 2.0.0 - unicode-property-aliases-ecmascript: 2.1.0 - - unicode-match-property-value-ecmascript@2.1.0: {} - - unicode-property-aliases-ecmascript@2.1.0: {} - - unique-filename@3.0.0: - dependencies: - unique-slug: 4.0.0 - - unique-slug@4.0.0: - dependencies: - imurmurhash: 0.1.4 - - universalify@0.1.2: {} - - universalify@2.0.1: {} - - unpipe@1.0.0: {} - - update-browserslist-db@1.0.16(browserslist@4.23.0): - dependencies: - browserslist: 4.23.0 - escalade: 3.1.2 - picocolors: 1.0.1 - - uri-js@4.4.1: - dependencies: - punycode: 2.3.1 - - util-deprecate@1.0.2: {} - - utils-merge@1.0.1: {} - - uuid@8.3.2: {} - - validate-npm-package-license@3.0.4: - dependencies: - spdx-correct: 3.2.0 - spdx-expression-parse: 3.0.1 - - validate-npm-package-name@5.0.1: {} - - vary@1.1.2: {} - - vite@5.1.7(@types/node@20.12.12)(less@4.2.0)(sass@1.71.1)(terser@5.29.1): - dependencies: - esbuild: 0.19.12 - postcss: 8.4.35 - rollup: 4.18.0 - optionalDependencies: - '@types/node': 20.12.12 - fsevents: 2.3.3 - less: 4.2.0 - sass: 1.71.1 - terser: 5.29.1 - - void-elements@2.0.1: {} - - watchpack@2.4.0: - dependencies: - glob-to-regexp: 0.4.1 - graceful-fs: 4.2.11 - - wbuf@1.7.3: - dependencies: - minimalistic-assert: 1.0.1 - - wcwidth@1.0.1: - dependencies: - defaults: 1.0.4 - - webpack-dev-middleware@5.3.4(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - colorette: 2.0.20 - memfs: 3.5.3 - mime-types: 2.1.35 - range-parser: 1.2.1 - schema-utils: 4.2.0 - webpack: 5.90.3(esbuild@0.20.1) - - webpack-dev-middleware@6.1.2(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - colorette: 2.0.20 - memfs: 3.5.3 - mime-types: 2.1.35 - range-parser: 1.2.1 - schema-utils: 4.2.0 - optionalDependencies: - webpack: 5.90.3(esbuild@0.20.1) - - webpack-dev-server@4.15.1(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - '@types/bonjour': 3.5.13 - '@types/connect-history-api-fallback': 1.5.4 - '@types/express': 4.17.21 - '@types/serve-index': 1.9.4 - '@types/serve-static': 1.15.7 - '@types/sockjs': 0.3.36 - '@types/ws': 8.5.10 - ansi-html-community: 0.0.8 - bonjour-service: 1.2.1 - chokidar: 3.6.0 - colorette: 2.0.20 - compression: 1.7.4 - connect-history-api-fallback: 2.0.0 - default-gateway: 6.0.3 - express: 4.19.2 - graceful-fs: 4.2.11 - html-entities: 2.5.2 - http-proxy-middleware: 2.0.6(@types/express@4.17.21) - ipaddr.js: 2.2.0 - launch-editor: 2.6.1 - open: 8.4.2 - p-retry: 4.6.2 - rimraf: 3.0.2 - schema-utils: 4.2.0 - selfsigned: 2.4.1 - serve-index: 1.9.1 - sockjs: 0.3.24 - spdy: 4.0.2 - webpack-dev-middleware: 5.3.4(webpack@5.90.3(esbuild@0.20.1)) - ws: 8.17.0 - optionalDependencies: - webpack: 5.90.3(esbuild@0.20.1) - transitivePeerDependencies: - - bufferutil - - debug - - supports-color - - utf-8-validate - - webpack-merge@5.10.0: - dependencies: - clone-deep: 4.0.1 - flat: 5.0.2 - wildcard: 2.0.1 - - webpack-sources@3.2.3: {} - - webpack-subresource-integrity@5.1.0(webpack@5.90.3(esbuild@0.20.1)): - dependencies: - typed-assert: 1.0.9 - webpack: 5.90.3(esbuild@0.20.1) - - webpack@5.90.3(esbuild@0.20.1): - dependencies: - '@types/eslint-scope': 3.7.7 - '@types/estree': 1.0.5 - '@webassemblyjs/ast': 1.12.1 - '@webassemblyjs/wasm-edit': 1.12.1 - '@webassemblyjs/wasm-parser': 1.12.1 - acorn: 8.11.3 - acorn-import-assertions: 1.9.0(acorn@8.11.3) - browserslist: 4.23.0 - chrome-trace-event: 1.0.3 - enhanced-resolve: 5.16.1 - es-module-lexer: 1.5.3 - eslint-scope: 5.1.1 - events: 3.3.0 - glob-to-regexp: 0.4.1 - graceful-fs: 4.2.11 - json-parse-even-better-errors: 2.3.1 - loader-runner: 4.3.0 - mime-types: 2.1.35 - neo-async: 2.6.2 - schema-utils: 3.3.0 - tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(esbuild@0.20.1)(webpack@5.90.3(esbuild@0.20.1)) - watchpack: 2.4.0 - webpack-sources: 3.2.3 - transitivePeerDependencies: - - '@swc/core' - - esbuild - - uglify-js - - websocket-driver@0.7.4: - dependencies: - http-parser-js: 0.5.8 - safe-buffer: 5.2.1 - websocket-extensions: 0.1.4 - - websocket-extensions@0.1.4: {} - - which@1.3.1: - dependencies: - isexe: 2.0.0 - - which@2.0.2: - dependencies: - isexe: 2.0.0 - - which@4.0.0: - dependencies: - isexe: 3.1.1 - - wildcard@2.0.1: {} - - word-wrap@1.2.5: {} - - wrap-ansi@6.2.0: - dependencies: - ansi-styles: 4.3.0 - string-width: 4.2.3 - strip-ansi: 6.0.1 - - wrap-ansi@7.0.0: - dependencies: - ansi-styles: 4.3.0 - string-width: 4.2.3 - strip-ansi: 6.0.1 - - wrap-ansi@8.1.0: - dependencies: - ansi-styles: 6.2.1 - string-width: 5.1.2 - strip-ansi: 7.1.0 - - wrappy@1.0.2: {} - - ws@8.11.0: {} - - ws@8.17.0: {} - - y18n@5.0.8: {} - - yallist@3.1.1: {} - - yallist@4.0.0: {} - - yargs-parser@20.2.9: {} - - yargs-parser@21.1.1: {} - - yargs@16.2.0: - dependencies: - cliui: 7.0.4 - escalade: 3.1.2 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 20.2.9 - - yargs@17.7.2: - dependencies: - cliui: 8.0.1 - escalade: 3.1.2 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 21.1.1 - - yocto-queue@0.1.0: {} - - yocto-queue@1.0.0: {} - - zone.js@0.14.6: {} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index c966979..b487572 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,3 +1,12 @@ export const environment = { production: true, + auth: { + domain: '${process.env.DOMAIN}', + clientId: '${process.env.CLIENT_ID}', + authorizationParams: { + audience: '${process.env.AUDIENCE}', + redirect_uri: '${process.env.REDIRECT_URL}', + }, + }, + url: '${process.env.URL}' }; From 678576fa307503a87412678dcad5002fc9ff6106 Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Mon, 21 Oct 2024 21:52:40 -0300 Subject: [PATCH 106/203] esilizado de la pagina view-quiz --- .../pages/view-quiz/view-quiz.component.html | 79 ++++++--- .../pages/view-quiz/view-quiz.component.scss | 159 +++++++----------- 2 files changed, 117 insertions(+), 121 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 3def92e..4d1e3a9 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,34 +1,63 @@
- -

Detalles del Quiz: {{ quizDetails?.name }}

+

Detalles del Quiz: {{ quizDetails?.name }}

Logo +
-
-

Módulo: {{ quizDetails?.cell?.module?.name }}

-

Célula: {{ quizDetails?.cell?.name }}

-

Seniority: {{ quizDetails?.seniority }}

-
+
+ +
+

Módulo

+
+ +
+
-

Preguntas:

-
    -
  • -

    Pregunta: {{ question.question }}

    -

    Opciones:

    -
      -
    • - {{ option }} -
      • -
    -

    Tipo: {{ question.type }}

    -

    Explicación: {{ question.explanation }}

    - -
    • -
+ +
+

Célula

+
+ +
+
- -

No hay preguntas disponibles para este quiz.

- + +
+

Seniority / Nivel

+
+ +
+
+
+ +

Preguntas:

+
    +
  • +

    Pregunta:

    +

    Opciones:

    +
      +
    • + +
    +

    Tipo:

    +

    Explicación:

    +
    • + +
+ +

No hay preguntas disponibles para este quiz.

diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index 02d9df6..15f3cd5 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -1,38 +1,59 @@ -body { - font-family: 'popi'; - background-color: #141414; - color: #fff; - margin: 0; - padding: 0; - line-height: 1.6; - height: 100vh; +.contenedor { display: flex; + flex-direction: column; justify-content: center; align-items: center; -} - -.container { - margin: 0 auto; - max-width: 90%; - height: 90%; - padding: 20px; - border-radius: 10px; - box-shadow: 0 0 15px rgba(0, 0, 0, 0.5); + } + + .content-1 { + background-color: #353434; display: flex; - flex-direction: column; justify-content: space-between; - position: relative; /* Para el logo */ -} - -h2 { - color: #fff; - font-size: 28px; - margin-bottom: 20px; - text-align: center; -} - -/* Logo centrado */ -.logo-centrado { + width: 135vh; + border-radius: 12px; + padding: 0.8rem; + } + + .input-container { + width: 38vh; + display: flex; + flex-direction: column; + } + + h4 { + color: #f0f0f0; + font-size: 16px; + margin-bottom: 5px; + } + + select { + background-color: #202020; + color: #8e8e8e; + border: none; + border-radius: 5px; + padding: 0.8rem; + font-size: 12px; + outline: none; + appearance: none; + width: 100%; + } + + select:hover { + background-color: #303030; + } + + .module-option, + .cell-option, + .seniority-option { + background-color: #202020; + color: rgb(142, 142, 142); + border: none; + border-radius: 0.5rem; + padding: 0.8rem; + font-size: 12px; + } + + .logo-centrado { position: absolute; top: 50%; left: 50%; @@ -40,9 +61,9 @@ h2 { width: 250px; opacity: 0.1; z-index: 0; -} - -.card { + } + + .card { background-color: #1d1d1d; border-radius: 8px; padding: 20px; @@ -51,66 +72,12 @@ h2 { position: relative; overflow: hidden; flex-grow: 1; - z-index: 1; /* El contenido está por encima del logo */ -} - -.container-sup { - display: flex; - justify-content: space-between; - gap: 20px; - -} - -.container-sup p { - margin: 0; - font-size: 18px; - flex: 1; -} - -h4 { - color: #f0f0f0; - font-size: 22px; - margin-bottom: 10px; - text-align: left; -} - -ul { - list-style-type: none; - padding: 0; - margin-top: 10px; -} - -li { - background-color: #292929; - padding: 15px; - margin-bottom: 15px; - border-radius: 8px; -} - -li p { - margin: 0; - font-size: 16px; -} - -li strong { - color: #9e9eff; -} - -li ul { - margin-top: 10px; -} - -li ul li { - background: none; - padding: 0; - color: #b3b3b3; - margin-bottom: 5px; -} - -.noQuestions { - text-align: center; - padding: 10px; - background-color: #292929; - border-radius: 5px; - font-size: 16px; -} + z-index: 1; + } + + .container-sup { + display: flex; + justify-content: space-between; + gap: 20px; + } + \ No newline at end of file From d628119bf4c610feca148d77b6fa1f6e1a5c4a21 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Mon, 21 Oct 2024 22:07:01 -0300 Subject: [PATCH 107/203] add enviroment production2 --- .env.example | 2 +- src/environments/environment.prod.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index fb27620..7afc9f8 100644 --- a/.env.example +++ b/.env.example @@ -2,4 +2,4 @@ DOMAIN="" CLIENT_ID="" AUDIENCE="" REDIRECT_URL="" -URL="" \ No newline at end of file +API_URL="" \ No newline at end of file diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index b487572..01e60a0 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -8,5 +8,5 @@ export const environment = { redirect_uri: '${process.env.REDIRECT_URL}', }, }, - url: '${process.env.URL}' + url: '${process.env.API_URL}' }; From 964610cb64a65c61d57df0f3566d79082ddffc8e Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Tue, 22 Oct 2024 00:20:25 -0300 Subject: [PATCH 108/203] change angular.json package.json --- angular.json | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/angular.json b/angular.json index 975540b..f4358b8 100644 --- a/angular.json +++ b/angular.json @@ -49,6 +49,13 @@ "maximumError": "10kb" } ], + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": true, "outputHashing": "all" }, "development": { diff --git a/package.json b/package.json index cdb0339..a46acb6 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "ng build", + "build": "ng build --configuration=production", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e", From 47b3aaef01a60f07310679ce8da97f688c0f609b Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Tue, 22 Oct 2024 12:32:55 -0300 Subject: [PATCH 109/203] =?UTF-8?q?Configuraci=C3=B3n=20environ=20y=20esti?= =?UTF-8?q?lo=20mejorado=20view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../all/pages/all-page/all-page.component.ts | 7 +- .../pages/view-quiz/view-quiz.component.html | 46 ++-- .../pages/view-quiz/view-quiz.component.scss | 221 +++++++++++------- .../pages/view-quiz/view-quiz.component.ts | 2 +- 4 files changed, 162 insertions(+), 114 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 52128ea..6c59521 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -3,6 +3,7 @@ import { Router } from '@angular/router'; import { trigger, style, transition, animate, state } from '@angular/animations'; import { Output, EventEmitter } from '@angular/core'; import Swal from 'sweetalert2'; +import { environment } from 'src/environments/environment'; interface User { first_name: string; @@ -59,7 +60,7 @@ export class AllPageComponent implements OnInit { async fetchAllQuizzes() { try { const response = await fetch( - 'https://challenge-be-development-99e1.onrender.com/quiz' + `${environment.url}/quiz` ); if (!response.ok) { @@ -104,7 +105,7 @@ export class AllPageComponent implements OnInit { try { const response = await fetch( - `https://challenge-be-development-99e1.onrender.com/quiz/${quiz.name}`, + `${environment.url}/quiz/${quiz.name}`, { // Asegúrate de usar un identificador correcto method: 'PUT', @@ -160,7 +161,7 @@ export class AllPageComponent implements OnInit { if (result.isConfirmed) { let response = await fetch( - `https://challenge-be-development-99e1.onrender.com/quiz/${quiz.id}`, + `${environment.url}/quiz/${quiz.id}`, { method: 'DELETE', headers: { diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 4d1e3a9..c9aa844 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,6 +1,6 @@ -
+

Detalles del Quiz: {{ quizDetails?.name }}

- Logo +
@@ -8,56 +8,44 @@

Detalles del Quiz: {{ quizDetails?.name }}

Módulo

-
- +
+
{{quizDetails?.cell?.module?.name}}

Célula

-
- +
+
{{quizDetails?.cell?.name}}

Seniority / Nivel

-
- +
+
{{quizDetails?.seniority}}

Preguntas:

-
    -
  • -

    Pregunta:

    +
      +
    • +

      Pregunta: {{ question.question }}

      Opciones:

        -
      • - +
      • {{ option }}
      -

      Tipo:

      -

      Explicación:

      +

      Tipo: {{ question.type }}

      +

      Explicación: {{ question.explanation }}

      • -
    -

    No hay preguntas disponibles para este quiz.

    + +

    No hay preguntas disponibles para este quiz.

    +
diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index 15f3cd5..f48b08f 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -1,83 +1,142 @@ +/* Contenedor principal centrado */ .contenedor { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - } + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + font-family: Poppins; +} + +/* Contenedor normal con fondo oscuro, borde redondeado y sombra */ +.normal-container { + background-color: #212121; + padding: 1.5rem; + border-radius: 12px; + box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); + background-color: #212121; + background-image: url('../../../../../assets/layout/images/logo.svg') !important; + background-repeat: no-repeat; + background-position: center; + background-size: 180px; + box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); + +} + +/* Estilos base para el componente custom-select-static */ +.custom-select-static { + position: relative; + display: inline-block; + width: 100%; + background: rgba(32, 32, 32, 1); + + border: 1px solid #ccc; + border-radius: 4px; + padding: 8px; + font-size: 14px; + color: #333; +} + +/* Estilos base para las opciones dentro del custom select */ +.custom-option { + padding: 6px 12px; + font-family: Poppins; + font-size: 10px; + font-weight: 300; + line-height: 11.68px; + text-align: left; + color: var(--Grays-White, rgba(255, 255, 255, 1)); + + +} + + +.content-1 { + background-color: #353434; + display: flex; + justify-content: space-between; + width: 135vh; + border-radius: 12px; + padding: 0.8rem; +} + +/* Contenedor individual de inputs */ +.input-container { + width: 38vh; + display: flex; + flex-direction: column; + font-family: Poppins; + font-size: 10px; + font-weight: 300; + line-height: 11.68px; + text-align: left; - .content-1 { - background-color: #353434; - display: flex; - justify-content: space-between; - width: 135vh; - border-radius: 12px; - padding: 0.8rem; - } - - .input-container { - width: 38vh; - display: flex; - flex-direction: column; - } - - h4 { - color: #f0f0f0; - font-size: 16px; - margin-bottom: 5px; - } - - select { - background-color: #202020; - color: #8e8e8e; - border: none; - border-radius: 5px; - padding: 0.8rem; - font-size: 12px; - outline: none; - appearance: none; - width: 100%; - } - - select:hover { - background-color: #303030; - } - - .module-option, - .cell-option, - .seniority-option { - background-color: #202020; - color: rgb(142, 142, 142); - border: none; - border-radius: 0.5rem; - padding: 0.8rem; - font-size: 12px; - } - - .logo-centrado { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - width: 250px; - opacity: 0.1; - z-index: 0; - } - - .card { - background-color: #1d1d1d; - border-radius: 8px; - padding: 20px; - border: 1px solid rgba(255, 255, 255, 0.1); - box-shadow: 0 0 15px rgba(115, 102, 255, 0.2); - position: relative; - overflow: hidden; - flex-grow: 1; - z-index: 1; - } - - .container-sup { - display: flex; - justify-content: space-between; - gap: 20px; - } - \ No newline at end of file + +} + +/* Estilos base para los títulos */ +h4 { + color: #f0f0f0; + font-size: 16px; + margin-bottom: 5px; +} + +/* Estilos base para select */ +select { + background-color: #202020; + color: #8e8e8e; + border: none; + border-radius: 5px; + padding: 0.8rem; + font-size: 12px; + outline: none; + appearance: none; + width: 100%; +} + +/* Hover para el select */ +select:hover { + background-color: #303030; +} + +/* Estilos para las opciones de Módulo, Célula y Seniority */ +.module-option, +.cell-option, +.seniority-option { + background-color: #202020; + color: rgb(142, 142, 142); + border: none; + border-radius: 0.5rem; + padding: 0.8rem; + font-size: 12px; +} + +/* Estilo para el logo centrado */ +.logo-centrado { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 250px; + opacity: 0.1; + z-index: 0; +} + +/* Estilos para la tarjeta (card) con fondo oscuro, sombra y borde */ +.card { + background-color: #1d1d1d; + border-radius: 8px; + padding: 20px; + border: 1px solid rgba(255, 255, 255, 0.1); + box-shadow: 0 0 15px rgba(115, 102, 255, 0.2); + position: relative; + overflow: hidden; + flex-grow: 1; + z-index: 1; +} + +/* Contenedor superior */ +.container-sup { + display: flex; + justify-content: space-between; + gap: 20px; +} diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index 0aa830a..cb32b24 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -64,7 +64,7 @@ export class ViewQuizComponent implements OnInit { async fetchQuizDetails() { try { console.log(`Realizando solicitud a la API con ID: ${this.quizId}`); - const response = await fetch(`https://challenge-be-development-99e1.onrender.com/quiz/${this.quizId}`); + const response = await fetch(`${environment.url}/quiz/${this.quizId}`); if (response.ok) { const data: Quiz = await response.json(); this.quizDetails = data; From ba43512b90cac2651898333110d39baf49ce22e2 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Tue, 22 Oct 2024 15:06:59 -0300 Subject: [PATCH 110/203] correcion --- .../pages/new-pages/new-pages.component.html | 4 +- .../pages/new-pages/new-pages.component.ts | 6 ++- .../header-page/header-page.component.ts | 41 ++++++++++++------- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index fb1f02c..f422cc7 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -31,7 +31,9 @@ + (datosParaPadre)="recibirDatos($event)" + [mode]="toggle" + >
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 2cfba5d..dbea7d1 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -8,6 +8,7 @@ import {environment} from '../../../../../environments/environment' styleUrls: ['./new-pages.component.scss'], }) export class NewPagesComponent { + constructor(private formsBuilder: FormBuilder) {} public selectNameForm = this.formsBuilder.group({ name: ['', Validators.required], @@ -46,6 +47,7 @@ export class NewPagesComponent { showSubmits: boolean = false; quizID: number | string = ''; quizData: any = {}; + toggle : boolean = true trackByFn(index: number): any { return index; @@ -103,7 +105,7 @@ export class NewPagesComponent { } /* modulo */ - switch (datos.module) { + switch (datos.module) { /* hacer dinamico */ case 'Sistemas': this.quizData.module = '84c66f03-c98f-47f1-a461-589cfb3dbf1f'; break; @@ -154,6 +156,7 @@ console.log(response); if (!response.ok) { throw new Error(`Error: ${response.status}`); } + this.toggle = false; this.showForm = true; this.showButton = false; this.questionCategory.name = this.selectNameForm.value.name; @@ -242,6 +245,7 @@ console.log(response); editQuiz(): void { this.showForm = false; + this.toggle = true } answerChoice(i: number) { if (true) { diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index ba5f27a..1403749 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { environment } from 'src/environments/environment'; @@ -8,11 +8,13 @@ import { environment } from 'src/environments/environment'; styleUrl: './header-page.component.scss', }) export class HeaderPageComponent { + @Input() mode: boolean = true; @Output() datosParaPadre = new EventEmitter(); // cambie a any public selectHeaderForm: FormGroup; constructor(private formsBuilder: FormBuilder) {} ngOnInit(): void { + console.log(this.mode); this.selectHeaderForm = this.formsBuilder.group({ nombreQuiz: [''], descripcion: [''], @@ -49,12 +51,13 @@ export class HeaderPageComponent { async getModule() { let response = await fetch(`${environment.url}/modules`); response = await response.json(); - this.opModules = response + this.opModules = response; } - async getCells() { /* no pude reutilizar fn anterior con parametros */ + async getCells() { + /* no pude reutilizar fn anterior con parametros */ let response = await fetch(`${environment.url}/cells`); response = await response.json(); - this.opCells = response + this.opCells = response; } pushQuestionCategory(prop: string, val: string, color: string): void { @@ -67,23 +70,31 @@ export class HeaderPageComponent { } isShowModulo() { - this.getModule(); - this.showModulo = !this.showModulo; - this.showCelula = false; - this.showSeniority = false; + /* if(mode){ + + } */ if (this.mode) { + this.getModule(); + this.showModulo = !this.showModulo; + this.showCelula = false; + this.showSeniority = false; + } console.log(this.opModules); } isShowCelula() { - this.getCells(); + if (this.mode) { + this.getCells(); - this.showCelula = !this.showCelula; - this.showSeniority = false; - this.showModulo = false; + this.showCelula = !this.showCelula; + this.showSeniority = false; + this.showModulo = false; + } console.log(this.opCells); } isShowSeniority() { - this.showSeniority = !this.showSeniority; - this.showCelula = false; - this.showModulo = false; + if (this.mode) { + this.showSeniority = !this.showSeniority; + this.showCelula = false; + this.showModulo = false; + } } } From 159c6e9b806b3811e75256ffc480fa007a2e0a4f Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Tue, 22 Oct 2024 16:00:19 -0300 Subject: [PATCH 111/203] Modificaciones view-quiz --- .../pages/view-quiz/view-quiz.component.html | 23 ++++++++----- .../pages/view-quiz/view-quiz.component.scss | 32 +++++++++++++++++++ .../pages/view-quiz/view-quiz.component.ts | 27 ++++++++-------- 3 files changed, 60 insertions(+), 22 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index c9aa844..bb52451 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,8 +1,15 @@ -
-

Detalles del Quiz: {{ quizDetails?.name }}

+
+ -
+
+ +
@@ -32,15 +39,15 @@

Seniority / Nivel

Preguntas:

-
    +
    • -

      Pregunta: {{ question.question }}

      +

      Pregunta: {{ question.question }}

      Opciones:

        -
      • {{ option }}
        • +
      • {{ option }}
      -

      Tipo: {{ question.type }}

      -

      Explicación: {{ question.explanation }}

      + +
    diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index f48b08f..bc161ea 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -7,6 +7,38 @@ font-family: Poppins; } +.checkbox-container { + width: 4vh; + height: 4vh; + background-color: #303030; + border-radius: 8px 0 0 8px; + display: flex; + justify-content: center; + align-items: center; + padding: 0; +} +.question-container { + display: flex; + flex-direction: column; /* Asegura que los elementos hijos se apilen verticalmente */ + gap: 10px; /* Espaciado entre las preguntas */ +} +.btn-circle { + width: 40px; /* Ajusta el tamaño según tus preferencias */ + height: 40px; + border-radius: 50%; /* Crea el círculo */ + display: flex; + align-items: center; + justify-content: center; + font-size: 20px; /* Ajusta el tamaño del ícono */ + background: rgba(0, 0, 0, 1); + + color: white; /* Color del ícono */ + border: none; + cursor: pointer; + + +} + /* Contenedor normal con fondo oscuro, borde redondeado y sombra */ .normal-container { background-color: #212121; diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index cb32b24..9e68089 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Location } from '@angular/common'; import { environment } from 'src/environments/environment'; interface User { @@ -23,8 +24,9 @@ interface Quiz { module: Module; cell: Cell; is_active: boolean; - questions: Question[]; + questions: Question[]; } + interface Question { id: string; question: string; @@ -36,39 +38,32 @@ interface Question { is_active: boolean; } - @Component({ selector: 'app-view-quiz', templateUrl: './view-quiz.component.html', styleUrls: ['./view-quiz.component.scss'], }) export class ViewQuizComponent implements OnInit { - quizId: string = ''; - quizDetails: Quiz | null = null; + quizId: string = ''; + quizDetails: Quiz | null = null; - constructor(private route: ActivatedRoute) {} + constructor(private route: ActivatedRoute, private location: Location) {} ngOnInit(): void { - this.quizId = this.route.snapshot.paramMap.get('id') || ''; - - this.quizId = this.quizId.replace(/['"]+/g, ''); - - console.log('ID del quiz sin comillas:', this.quizId); - - + console.log('ID del quiz sin comillas:', this.quizId); this.fetchQuizDetails(); } async fetchQuizDetails() { try { - console.log(`Realizando solicitud a la API con ID: ${this.quizId}`); + console.log(`Realizando solicitud a la API con ID: ${this.quizId}`); const response = await fetch(`${environment.url}/quiz/${this.quizId}`); if (response.ok) { const data: Quiz = await response.json(); this.quizDetails = data; - console.log('Detalles del quiz:', this.quizDetails); + console.log('Detalles del quiz:', this.quizDetails); } else { console.error('Error al obtener detalles del quiz, respuesta no OK.'); } @@ -76,4 +71,8 @@ export class ViewQuizComponent implements OnInit { console.error('Error en la solicitud:', error); } } + + goBack(): void { + this.location.back(); + } } From b7de12a26927409b82658d2b5205976601031f06 Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Tue, 22 Oct 2024 18:35:23 -0300 Subject: [PATCH 112/203] checkbox estatico --- .../pages/view-quiz/view-quiz.component.html | 29 +++++++++++++++---- .../pages/view-quiz/view-quiz.component.scss | 3 +- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index bb52451..7ae99e3 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -40,14 +40,33 @@

    Seniority / Nivel

    Preguntas:

      -
    • +

    • Pregunta: {{ question.question }}

      Opciones:

      -
        -
      • {{ option }}
        • +
          +
        • + +
          + +
          + +
          + + +
          +
        - -
      diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index bc161ea..e945b55 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -155,7 +155,8 @@ select:hover { /* Estilos para la tarjeta (card) con fondo oscuro, sombra y borde */ .card { - background-color: #1d1d1d; + background: rgba(56, 53, 53, 1); + border-radius: 8px; padding: 20px; border: 1px solid rgba(255, 255, 255, 0.1); From 565cf20034dc5b9f9dde4b06b7147cf7fd89a896 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 22 Oct 2024 18:39:15 -0300 Subject: [PATCH 113/203] changes --- .../pages/new-pages/new-pages.component.html | 2 +- .../pages/new-pages/new-pages.component.ts | 80 ++++++++++--------- 2 files changed, 43 insertions(+), 39 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index fb1f02c..65e518f 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -36,7 +36,7 @@
- +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 2cfba5d..51cd983 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import {environment} from '../../../../../environments/environment' +import { environment } from '../../../../../environments/environment'; @Component({ selector: 'app-new-pages', @@ -14,8 +14,6 @@ export class NewPagesComponent { description: ['', Validators.required], }); - - isFieldInvalid(field: string): boolean { const control = this.selectNameForm.get(field); return control?.invalid && (control.dirty || control.touched); @@ -38,18 +36,19 @@ export class NewPagesComponent { array: any = ['']; selectedOption: string = ''; inputType: string = ''; - showButton: boolean = false; - showForm: boolean = false; + showButton: boolean = false; + showForm: boolean = false; isTrueFalseQuestion: boolean = false; showPlus: boolean = false; showPlus2: boolean = false; showSubmits: boolean = false; quizID: number | string = ''; quizData: any = {}; + createOrEdit: boolean = true; trackByFn(index: number): any { - return index; - } + return index; + } onQuestionTypeChange(selectedType: string) { this.array = @@ -111,23 +110,20 @@ export class NewPagesComponent { /* celula */ - let response: any = await fetch(`${environment.url}/cells`) - response = await response.json() -console.log(response); - - response = response.find((element)=>datos.cell == element.name) - + let response: any = await fetch(`${environment.url}/cells`); + response = await response.json(); + console.log(response); - console.log(response) - response ? this.quizData.cell = response.id : '' - console.log(this.quizData) + response = response.find(element => datos.cell == element.name); + console.log(response); + response ? (this.quizData.cell = response.id) : ''; + console.log(this.quizData); /* seniority */ if (datos.seniority) { this.quizData.seniority = datos.seniority; } - } async createQuiz() { try { @@ -141,16 +137,13 @@ console.log(response); created_by_id: '224742e8-731b-40bf-b05f-a7547270746c', is_active: true, }; - const response = await fetch( - `${environment.url}/quiz`, - { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(prueba), - } - ); + const response = await fetch(`${environment.url}/quiz`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(prueba), + }); if (!response.ok) { throw new Error(`Error: ${response.status}`); } @@ -168,6 +161,20 @@ console.log(response); } } + async updateQuiz() { + const update = { name: 'nuevo name desde el front ->'+this.quizID }; + let response = await fetch(`${environment.url}/quiz/${this.quizID}`, { + method: 'PUT', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(update), + }); + response = await response.json(); + + console.log(response); + } + async createQuestion(form: any) { try { const formSection = form.value; @@ -204,20 +211,16 @@ console.log(response); quiz_id: this.quizID, }; if (this.questions.length <= 10) { - console.log(form.value); /* this.onQuestionTypeChange('otro', 0); */ - const response = await fetch( - `${environment.url}/question`, - { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(question), - } - ); + const response = await fetch(`${environment.url}/question`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(question), + }); const data = await response.json(); @@ -242,6 +245,7 @@ console.log(response); editQuiz(): void { this.showForm = false; + this.createOrEdit = false } answerChoice(i: number) { if (true) { From f32a7779918e3cbaba419cd1437ae9d30f2745e7 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 22 Oct 2024 19:42:40 -0300 Subject: [PATCH 114/203] dinamismo --- .../new/pages/new-pages/new-pages.component.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 17f1864..4e66aec 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -103,11 +103,13 @@ export class NewPagesComponent { } /* modulo */ - switch (datos.module /* hacer dinamico */) { - case 'Sistemas': - this.quizData.module = '84c66f03-c98f-47f1-a461-589cfb3dbf1f'; - break; - } + + let responseModule: any = await fetch(`${environment.url}/modules`) + responseModule = await responseModule.json() + + responseModule = responseModule.find((element)=>element.name == datos.module ) + console.log(responseModule) + this.quizData.module = responseModule.id /* celula */ From a4ae34443446de0c25500f5c8d1d3fa8130497bc Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Tue, 22 Oct 2024 18:46:07 -0500 Subject: [PATCH 115/203] configuracion general variables de entorno --- .../modules/all/pages/all-page/all-page.component.ts | 7 ++++--- .../modules/all/pages/view-quiz/view-quiz.component.ts | 4 ++-- .../auth/pages/auth-page/auth-page.component.ts | 3 ++- .../modules/new/pages/new-pages/new-pages.component.ts | 2 +- .../pages/welcome-page/welcome-page.component.ts | 10 +--------- tsconfig.json | 5 ++++- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 52128ea..1fac7b9 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -3,6 +3,7 @@ import { Router } from '@angular/router'; import { trigger, style, transition, animate, state } from '@angular/animations'; import { Output, EventEmitter } from '@angular/core'; import Swal from 'sweetalert2'; +import { environment } from '@environments/environment'; interface User { first_name: string; @@ -59,7 +60,7 @@ export class AllPageComponent implements OnInit { async fetchAllQuizzes() { try { const response = await fetch( - 'https://challenge-be-development-99e1.onrender.com/quiz' + `${environment.url}/quiz` ); if (!response.ok) { @@ -104,7 +105,7 @@ export class AllPageComponent implements OnInit { try { const response = await fetch( - `https://challenge-be-development-99e1.onrender.com/quiz/${quiz.name}`, + `${environment.url}/quiz/${quiz.name}`, { // Asegúrate de usar un identificador correcto method: 'PUT', @@ -160,7 +161,7 @@ export class AllPageComponent implements OnInit { if (result.isConfirmed) { let response = await fetch( - `https://challenge-be-development-99e1.onrender.com/quiz/${quiz.id}`, + `${environment.url}/quiz/${quiz.id}`, { method: 'DELETE', headers: { diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index 0aa830a..6259f3b 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { environment } from 'src/environments/environment'; +import { environment } from '@environments/environment'; interface User { first_name: string; @@ -64,7 +64,7 @@ export class ViewQuizComponent implements OnInit { async fetchQuizDetails() { try { console.log(`Realizando solicitud a la API con ID: ${this.quizId}`); - const response = await fetch(`https://challenge-be-development-99e1.onrender.com/quiz/${this.quizId}`); + const response = await fetch(`${environment.url}/quiz/${this.quizId}`); if (response.ok) { const data: Quiz = await response.json(); this.quizDetails = data; diff --git a/src/app/modules/auth/pages/auth-page/auth-page.component.ts b/src/app/modules/auth/pages/auth-page/auth-page.component.ts index 3bf3a7d..187b32e 100644 --- a/src/app/modules/auth/pages/auth-page/auth-page.component.ts +++ b/src/app/modules/auth/pages/auth-page/auth-page.component.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import { AuthService } from '@auth0/auth0-angular'; import { Router } from '@angular/router'; +import { environment } from '@environments/environment'; @Component({ selector: 'app-auth-page', @@ -30,7 +31,7 @@ export class AuthPageComponent { password: 'defaultPassword', }; - fetch('http://localhost:3000/user', { + fetch(`${environment.url}/user`, { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 2cfba5d..15331cd 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import {environment} from '../../../../../environments/environment' +import { environment } from '@environments/environment'; @Component({ selector: 'app-new-pages', diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index d8a981b..31d818e 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -66,15 +66,7 @@ import { export class WelcomePageComponent { constructor(private router: Router) { } - goToAll() { - this.router.navigate(['/all']); - } - goToCreate() { - this.router.navigate(['/create']); - } - goToEdit() { - this.router.navigate(['/edit']); - } + isExpanded1 = false; // Controla la expansión de la columna de "Todos" isExpanded2 = false; // Controla la expansión de la columna de "Nuevo" diff --git a/tsconfig.json b/tsconfig.json index 1658455..064d646 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,7 +19,10 @@ "target": "ESNext", "module": "ESNext", "useDefineForClassFields": false, - "lib": ["ES2022", "dom"] + "lib": ["ES2022", "dom"], + "paths": { + "@environments/*":["src/environments/*"] + } }, "exclude": ["node_modules", "**/node_modules/*"], "angularCompilerOptions": { From 40f65d1a8dde0824943779f2f7ac590bca379f6d Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Tue, 22 Oct 2024 21:24:54 -0300 Subject: [PATCH 116/203] fix view-quiz.component.ts --- src/app/modules/all/pages/view-quiz/view-quiz.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index 3515271..f056dcb 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -71,7 +71,7 @@ export class ViewQuizComponent implements OnInit { } } - goBack(): void { + /* goBack(): void { this.location.back(); - } + } */ } From f1885033e9c6e89d488905cef5ebcc24dd6bf59f Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Tue, 22 Oct 2024 21:29:54 -0300 Subject: [PATCH 117/203] fix view-quiz.component.html --- src/app/modules/all/pages/view-quiz/view-quiz.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 7ae99e3..a512dfc 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -3,7 +3,7 @@
-
-
-
- - {{ option.text }} + + +
+ {{ question.get('text').value }} +
+ + +
+ +
+
+ + Verdadero + + + Falso + +
+
+
+
+ + + + + + +
+
+
- +
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss index 24b75a7..e368a68 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss @@ -4,38 +4,32 @@ justify-content: center; background-color: #1e1e1e; height: 100vh; - } - -.fa-solid { - width: 30px; - height: 30px; - padding: 6px 0px; - border-radius: 15px; - text-align: center; - font-size: 12px; - line-height: 1.42857; + padding: 20px; } - a { - text-decoration: none; color: white; - transition: .3s ease-in-out; + flex: 0 0 33.33%; - &:hover { - color: darkviolet; - cursor: pointer; - } +} +a:hover { + cursor: pointer; + text-decoration: none; + color: magenta; +} +h1 { + color: magenta; + flex: 0 0 33.33%; + text-align: center; +} +.empty-space { + flex: 0 0 33.33%; // El espacio vacío, puede tener una clase o simplemente estar vacío } .tittle { display: flex; - flex-wrap: nowrap; align-items: center; justify-content: space-between; - margin-right: 40%; - margin-top: 1%; - margin-left: 3%; - margin-bottom: 1%; + margin: 1% 3%; } .content-1 { @@ -47,39 +41,73 @@ a { background-size: 414px 404px; background-color: #353434; border-radius: 15px; - padding: 20px; // Asegúrate de tener espacio interno + padding: 20px; + display: flex; + flex-direction: column; } .question { display: flex; - flex-direction: column; // Organiza preguntas de manera vertical - margin-bottom: 10px; // Espacio entre preguntas + flex-direction: column; + margin-bottom: 20px; + padding: 15px; + border: 1px solid #444; + border-radius: 8px; + background-color: #282828; } -input[type="text"], .custom-option-input { - padding: 10px; // Espacio interno - margin-top: 5px; // Espacio encima del input - border: 1px solid #ccc; // Borde suave - border-radius: 5px; // Bordes redondeados - width: 100%; // Ancho completo +input[type='text'], +.custom-option-input { + padding: 10px; + margin-top: 5px; + border: 1px solid #ccc; + border-radius: 5px; + width: 100%; } .btn-primary { - background-color: #007bff; // Color de fondo - color: white; // Color de texto - padding: 10px 15px; // Espaciado interno - border: none; // Sin borde + background-color: #007bff; + color: white; + padding: 10px 15px; + border: none; + border-radius: 5px; + cursor: pointer; +} + +.btn-primary:hover { + background-color: #0056b3; } + .quiz-name-input { - font-size: 24px; // Aumentar el tamaño del texto - background-color: transparent; // Fondo transparente - color: white; // Color del texto - border: none; // Sin borde - border-bottom: 2px solid #ccc; // Borde inferior - outline: none; // Sin borde al hacer clic - width: 200px; // Ancho ajustable + font-size: 24px; + background-color: transparent; + color: white; + border: none; + border-bottom: 2px solid #ccc; + outline: none; + width: 200px; } .quiz-name-input:focus { - border-bottom-color: darkviolet; // Cambiar color al enfocar -} \ No newline at end of file + border-bottom-color: darkviolet; +} +button { + padding: 8px 12px; + background-color: #444; + color: white; + border: none; + border-radius: 5px; + cursor: pointer; + transition: background-color 0.3s; + background-color:slateblue; +} + +button:hover { + background-color: darkviolet; +} +.buttons{ + display: flex; + align-items: center; + justify-content: space-between; + padding: 20%; +} diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts index f648019..56a4238 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts @@ -1,6 +1,7 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, FormArray } from '@angular/forms'; import { trigger, style, transition, animate, state } from '@angular/animations'; +import { QuizService } from './services/quiz.service'; @Component({ selector: 'app-edit-pages', @@ -19,69 +20,77 @@ import { trigger, style, transition, animate, state } from '@angular/animations' ]) ] }) -export class EditPagesComponent { - @Input() quiz: { name: string; questions: any[]; modulo: any; celula: any; seniority: any }; +export class EditPagesComponent implements OnInit { + @Input() quizId: string; // Cambia esto para recibir solo el ID del quiz @Output() close = new EventEmitter(); - isEditing:boolean = false; + isEditing: boolean = false; selectNameForm: FormGroup; - questionCategory: any; - showButton = false; - constructor(private formBuilder: FormBuilder) { + + constructor(private formBuilder: FormBuilder, private quizService: QuizService) { this.selectNameForm = this.formBuilder.group({ - name: [''] + name: [''], + questions: this.formBuilder.array([]) }); } ngOnInit() { - this.selectNameForm.patchValue({ - name: this.quiz.name, + // Obtener el cuestionario y sus preguntas al iniciar + if (!this.quizId) { + console.error('Quiz ID no proporcionado'); + return; // Salir si no hay ID + } + + this.quizService.getQuizWithQuestions(this.quizId).subscribe(quizData => { + this.selectNameForm.patchValue({ name: quizData.name }); + this.populateQuestions(quizData.questions); + console.log(quizData) + }, error => { + console.error('Error al obtener el cuestionario:', error); }); - console.log(this.quiz) - - this.populateQuestions(this.quiz.questions); - this.questionCategory = { - modulo: this.quiz.modulo || '', - celula: this.quiz.celula || '', - seniority: this.quiz.seniority || '' - }; } - private populateQuestions(questions: any[]) { - this.questionCategory.questions = this.formBuilder.array(questions.map(question => { - return this.formBuilder.group({ - text: [question.text], - type: [question.type], - options: this.formBuilder.array(question.options.map(option => this.formBuilder.group({ - text: [option.text], - selected: [option.selected || false] - }))) - }); + const questionForms = questions.map(question => this.formBuilder.group({ + id: [question.id], + text: [question.text], + type: [question.type], + correct_option: [question.correct_option], + options: this.formBuilder.array(question.options.map(option => this.formBuilder.group({ + id: [option.id], + text: [option.text], + selected: [option.selected || false] + }))) })); + + const questionsArray = this.selectNameForm.get('questions') as FormArray; + questionsArray.clear(); + questionForms.forEach(form => questionsArray.push(form)); } get questions(): FormArray { - return this.questionCategory.questions as FormArray; + return this.selectNameForm.get('questions') as FormArray; } - createQuiz() { const updatedQuiz = { - ...this.quiz, + id: this.quizId, name: this.selectNameForm.value.name, questions: this.questions.value, - modulo: this.questionCategory.modulo, - celula: this.questionCategory.celula, - seniority: this.questionCategory.seniority, }; - console.log('Cambios guardados para el quiz:', updatedQuiz); - this.close.emit(); // Emitir evento para cerrar + this.quizService.updateQuiz(this.quizId, updatedQuiz).subscribe(response => { + console.log('Cambios guardados para el quiz:', response); + this.close.emit(); + }, error => { + console.error('Error al guardar cambios:', error); + }); } - - recibirDatos(event: any) { - console.log('Datos recibidos:', event); + editQuestion(index: number) { + + const question = this.questions.at(index); + + console.log('Editando pregunta:', question.value); } } diff --git a/src/app/modules/edit/pages/edit-pages/services/quiz.service.spec.ts b/src/app/modules/edit/pages/edit-pages/services/quiz.service.spec.ts new file mode 100644 index 0000000..cfbf626 --- /dev/null +++ b/src/app/modules/edit/pages/edit-pages/services/quiz.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { QuizService } from './quiz.service'; + +describe('QuizService', () => { + let service: QuizService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(QuizService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts b/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts new file mode 100644 index 0000000..f84889c --- /dev/null +++ b/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts @@ -0,0 +1,23 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import { environment } from '@environments/environment'; + +@Injectable({ + providedIn: 'root' +}) +export class QuizService { + private apiUrl = `${environment.url}/quiz`; // Cambia esto por tu URL real + + constructor(private http: HttpClient) {} + + // Método para obtener un cuestionario con sus preguntas + getQuizWithQuestions(id: string): Observable { + return this.http.get(`${this.apiUrl}/${id}`); + } + + // Método para actualizar un cuestionario + updateQuiz(id: string, quizData: any): Observable { + return this.http.put(`${this.apiUrl}/${id}`, quizData); + } +} diff --git a/src/app/modules/guards/role.guard.ts b/src/app/modules/guards/role.guard.ts index a0b84a1..2c60e2b 100644 --- a/src/app/modules/guards/role.guard.ts +++ b/src/app/modules/guards/role.guard.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; -import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; +import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router'; import { AuthService } from '@auth0/auth0-angular'; import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { map, tap } from 'rxjs/operators'; @Injectable({ providedIn: 'root', }) export class RoleGuard implements CanActivate { - constructor(private auth: AuthService) {} + constructor(private auth: AuthService, private router: Router) {} canActivate( route: ActivatedRouteSnapshot, @@ -18,6 +18,11 @@ export class RoleGuard implements CanActivate { map(user => { const roles = user['https://miaplicacion.com/roles']; return roles && roles.includes('admin'); + }), + tap(hasAccess => { + if (!hasAccess) { + this.router.navigate(['/sign-in']); // Redirigir si no tiene acceso + } }) ); } diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index b87aabe..8ea3ecd 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -5,6 +5,7 @@ display: flex; flex-direction: column; align-items: center; + margin-block: 2.5vh; } .header-inputs-container { diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index e40f81a..91e0c9e 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -1,7 +1,7 @@ .active-column, .column-tasks { width: 9vh; - height: 100vh; + height: 95vh; border-radius: 12px; padding: 1.5rem 2rem 2rem 2rem; background-color: #212121; @@ -10,6 +10,8 @@ justify-content: center; gap: 3px; box-shadow: 0px 4px 4px 0px #718ee3, 0px 4px 4px 0px #00000040; + margin-top: 2.5vh; + z-index: 9999; @media (max-width: 768px) { width: 20vh; // Ajusta el ancho para pantallas pequeñas @@ -80,15 +82,16 @@ } .wall { - height: 100%; + height: 95%; width: 100%; // Cambia a 100% para que se ajuste a la pantalla - + z-index: 9999; display: flex; justify-content: space-between; background-image: url('../../../../../assets/layout/images/logo.svg'); background-repeat: no-repeat; background-position: center; background-size: 414px 404px; + @media (max-width: 768px) { flex-direction: column; // Cambia la dirección en pantallas pequeñas diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index 75a7445..2d30724 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -62,7 +62,7 @@ .option-floating { position: absolute; - +z-index: 100000; width: 41vh; background-color: #303030; display: flex; diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index 1403749..51383f6 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { environment } from 'src/environments/environment'; +import { environment } from '@environments/environment'; @Component({ selector: 'app-header-page', diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss index bfb2436..d939990 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss @@ -8,7 +8,7 @@ padding: 10px; color: white; cursor: pointer; - z-index: 1000; + z-index: 99999; i { font-size: 1.5rem; @@ -17,11 +17,11 @@ .sidebar { width: 250px; // Ancho del sidebar - height: 100%; + height: 95%; background-color: #212121; position: fixed; - top: 0; - + top: 2.5%; + border-radius: 15px; transition: left 0.5s ease; &.active { diff --git a/src/assets/demo/images/login/trainit.png b/src/assets/demo/images/login/trainit.png new file mode 100644 index 0000000000000000000000000000000000000000..bf368705219bfbd45ea807e4c8283606255fb6a2 GIT binary patch literal 17237 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 O84RATelF{r5}E-1vhPFy literal 0 HcmV?d00001 From e65e174aee0f1291b2e18c7af9ca19f9752b94ec Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Thu, 24 Oct 2024 18:28:28 -0300 Subject: [PATCH 123/203] Cambios de style en view-quiz --- .../pages/view-quiz/view-quiz.component.html | 73 +++---- .../pages/view-quiz/view-quiz.component.scss | 181 +++++------------- 2 files changed, 90 insertions(+), 164 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 7ae99e3..2ae8ffe 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,7 +1,5 @@ -
- - -
+
+
+

Módulo

-
{{quizDetails?.cell?.module?.name}}
+
{{quizDetails?.cell?.module?.name}}
@@ -24,7 +23,7 @@

Módulo

Célula

-
{{quizDetails?.cell?.name}}
+
{{quizDetails?.cell?.name}}
@@ -32,46 +31,48 @@

Célula

Seniority / Nivel

-
{{quizDetails?.seniority}}
+
{{quizDetails?.seniority}}
-

Preguntas:

-
    -
  • -

    Pregunta: {{ question.question }}

    -

    Opciones:

    -
      -
    • - -
      - -
      +
      +

      Preguntas:

      +
        +
      • +

        Pregunta: {{ question.question }}

        +

        Opciones:

        +
          +
        • + +
          + +
          + +
          + + type="text" + class="custom-option-input" + [(ngModel)]="question.options[i]" + name="option{{ i }}" + readonly />
          - - -
      -
      • -
    -
    • -
+ + + + +

No hay preguntas disponibles para este quiz.
+
\ No newline at end of file diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index e945b55..5cfa643 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -1,175 +1,100 @@ -/* Contenedor principal centrado */ +/* Centrado del contenedor principal */ .contenedor { display: flex; - flex-direction: column; - justify-content: center; - align-items: center; + flex-direction: column; + font-family: Poppins; + + } -.checkbox-container { - width: 4vh; - height: 4vh; - background-color: #303030; - border-radius: 8px 0 0 8px; - display: flex; - justify-content: center; - align-items: center; - padding: 0; -} -.question-container { - display: flex; - flex-direction: column; /* Asegura que los elementos hijos se apilen verticalmente */ - gap: 10px; /* Espaciado entre las preguntas */ -} -.btn-circle { - width: 40px; /* Ajusta el tamaño según tus preferencias */ - height: 40px; - border-radius: 50%; /* Crea el círculo */ - display: flex; - align-items: center; - justify-content: center; - font-size: 20px; /* Ajusta el tamaño del ícono */ - background: rgba(0, 0, 0, 1); - color: white; /* Color del ícono */ - border: none; - cursor: pointer; - - -} -/* Contenedor normal con fondo oscuro, borde redondeado y sombra */ .normal-container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; background-color: #212121; - padding: 1.5rem; + padding: 2rem; border-radius: 12px; + width: 100%; + box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); + max-width: 900px; box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); - background-color: #212121; background-image: url('../../../../../assets/layout/images/logo.svg') !important; background-repeat: no-repeat; background-position: center; background-size: 180px; - box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); - -} - -/* Estilos base para el componente custom-select-static */ -.custom-select-static { - position: relative; - display: inline-block; - width: 100%; - background: rgba(32, 32, 32, 1); - - border: 1px solid #ccc; - border-radius: 4px; - padding: 8px; - font-size: 14px; - color: #333; -} - -/* Estilos base para las opciones dentro del custom select */ -.custom-option { - padding: 6px 12px; - font-family: Poppins; - font-size: 10px; - font-weight: 300; - line-height: 11.68px; - text-align: left; - color: var(--Grays-White, rgba(255, 255, 255, 1)); - - } - .content-1 { background-color: #353434; display: flex; justify-content: space-between; - width: 135vh; + width: 100%; + padding: 1rem; border-radius: 12px; - padding: 0.8rem; } -/* Contenedor individual de inputs */ .input-container { - width: 38vh; + width: 30%; /* Ajustado para que cada campo ocupe un 30% del ancho */ display: flex; flex-direction: column; font-family: Poppins; - font-size: 10px; - font-weight: 300; - line-height: 11.68px; - text-align: left; - - + font-size: 14px; + color: white; } -/* Estilos base para los títulos */ -h4 { +.styled-static { + padding: 10px; + border-radius: 8px; + background-color: #202020; color: #f0f0f0; - font-size: 16px; - margin-bottom: 5px; + text-align: center; } -/* Estilos base para select */ -select { - background-color: #202020; - color: #8e8e8e; - border: none; - border-radius: 5px; - padding: 0.8rem; - font-size: 12px; - outline: none; - appearance: none; +.form-group { + margin-top: 2rem; width: 100%; } -/* Hover para el select */ -select:hover { - background-color: #303030; +.question-container { + display: flex; + flex-direction: column; + gap: 15px; } -/* Estilos para las opciones de Módulo, Célula y Seniority */ -.module-option, -.cell-option, -.seniority-option { - background-color: #202020; - color: rgb(142, 142, 142); - border: none; - border-radius: 0.5rem; - padding: 0.8rem; - font-size: 12px; +.option-row { + display: flex; + flex-wrap: wrap; + justify-content: space-between; } -/* Estilo para el logo centrado */ -.logo-centrado { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - width: 250px; - opacity: 0.1; - z-index: 0; +.option-item { + width: 45%; /* Para que cada opción ocupe el 45% del ancho y queden dos por fila */ + margin-bottom: 1rem; } -/* Estilos para la tarjeta (card) con fondo oscuro, sombra y borde */ -.card { - background: rgba(56, 53, 53, 1); - +.custom-option-input { + width: 100%; + padding: 0.8rem; + background-color: #202020; + border: none; border-radius: 8px; - padding: 20px; - border: 1px solid rgba(255, 255, 255, 0.1); - box-shadow: 0 0 15px rgba(115, 102, 255, 0.2); - position: relative; - overflow: hidden; - flex-grow: 1; - z-index: 1; + color: #8e8e8e; } -/* Contenedor superior */ -.container-sup { +/* Alinear el botón circular de cierre */ +.btn-circle { display: flex; - justify-content: space-between; - gap: 20px; + align-items: center; + justify-content: center; + width: 40px; + height: 40px; + border-radius: 50%; + background-color: rgba(0, 0, 0, 1); + color: white; + border: none; + cursor: pointer; } From 46d0c9e840053357260ee9c388b9cac4adb7e378 Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Fri, 25 Oct 2024 18:45:20 -0300 Subject: [PATCH 124/203] algunos errores arreglados --- .../pages/all-page/all-page.component.html | 22 +-- .../pages/all-page/all-page.component.scss | 7 +- .../all/pages/all-page/all-page.component.ts | 185 +++++++++--------- 3 files changed, 104 insertions(+), 110 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 1aaaf98..9e4892a 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -4,7 +4,7 @@

Todos los Quiz

- +
@@ -22,18 +22,18 @@

Todos los Quiz

- - {{ quiz.name }} - {{ quiz.seniority }} - {{ quiz.created_at | date:'dd-MM-yyyy' }} - {{ quiz.created_by.first_name }} - {{ quiz.cell.module.name }} - {{ quiz.cell.name }} + + {{ quiz?.name }} + {{ quiz?.seniority }} + {{ quiz?.created_at | date:'dd/MM/yyyy' }} + {{ quiz?.created_by?.first_name }} + {{ quiz?.cell?.module?.name }} + {{ quiz?.cell?.name }} - {{ quiz.is_active ? 'Activo' : 'Inactivo' }} + {{ quiz?.is_active ? 'Activo' : 'Inactivo' }} @@ -43,10 +43,10 @@

Todos los Quiz

+
-
diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index c61a18d..62b30c2 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -192,11 +192,14 @@ h2 { } .actions button { + display: flexbox; background: none; border: none; cursor: pointer; - color: #aaa; - margin-right: 5px; + color: white; + + + } .status { diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 6c59521..ee0999a 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -17,22 +17,25 @@ interface Cell { name: string; } +interface Seniority { + name: string; +} + interface Quiz { id: string; name: string; - seniority: string; + seniority: Seniority; created_at: string; - created_by: User; // Cambiado a objeto - module: Module; // Cambiado a objeto - cell: Cell; // Cambiado a objeto + created_by: User; + module: Module; + cell: Cell; is_active: boolean; } @Component({ selector: 'app-all-page', templateUrl: './all-page.component.html', - styleUrls: ['./all-page.component.scss'], // Cambiado a styleUrls para usar un array - + styleUrls: ['./all-page.component.scss'], animations: [ trigger('expandState3', [ state('collapsed', style({ display: 'none' })), @@ -44,132 +47,125 @@ interface Quiz { }) export class AllPageComponent implements OnInit { @Output() quizSelected = new EventEmitter(); - searchText: string = ''; // Campo de búsqueda - quizzes: Quiz[] = []; // Inicializa el array de quizzes + searchText: string = ''; + seniority: string = ''; + module: string = ''; + cell: string = ''; + quizzes: Quiz[] = []; selectedQuiz: any; - - constructor(private router: Router) { } - + isExpanded3: boolean = false; + showEdit: boolean = false; + + constructor(private router: Router) {} ngOnInit(): void { - // Llama al método para obtener todos los quizzes al iniciar el componente this.fetchAllQuizzes(); } - // Método para obtener todos los quizzes desde la API + // Método para obtener quizzes de la API con búsqueda dinámica async fetchAllQuizzes() { try { - const response = await fetch( - `${environment.url}/quiz` - ); - + const params = new URLSearchParams(); + + // Solo agregar el parámetro 'search' si se está buscando por nombre del quiz + if (this.searchText) { + params.append('search', this.searchText.toLowerCase()); + console.log(`Buscando por: ${this.searchText.toLowerCase()}`); + } + + // Agregar parámetros solo si existen + if (this.seniority) { + params.append('seniority', this.seniority.toLowerCase()); + console.log(`Filtrando por seniority: ${this.seniority.toLowerCase()}`); + } + if (this.module) { + params.append('module', this.module.toLowerCase()); + console.log(`Filtrando por módulo: ${this.module.toLowerCase()}`); + } + if (this.cell) { + params.append('cell', this.cell.toLowerCase()); + console.log(`Filtrando por célula: ${this.cell.toLowerCase()}`); + } + + // Construir la URL + const url = `${environment.url}/quiz${params.toString() ? '?' + params.toString() : ''}`; + console.log(`URL construida para la consulta: ${url}`); + + // Realizar la consulta + const response = await fetch(url, { method: 'GET' }); if (!response.ok) { - // Verifica si la respuesta fue exitosa throw new Error('Error en la consulta: ' + response.status); } - - // Lee el cuerpo de la respuesta solo una vez - const data = await response.json(); // Renombrado a 'data' para reflejar que es un objeto - console.log('Datos recibidos de la API:', data); // Inspecciona la estructura de la respuesta - - // Asegúrate de que quizData es un array antes de asignarlo - this.quizzes = Array.isArray(data.quizzes) ? data.quizzes : []; // Accede al array 'quizzes' dentro del objeto - - console.log('Quizzes recibidos:', this.quizzes); + + // Procesar la respuesta + const data = await response.json(); + this.quizzes = Array.isArray(data.quizzes) ? data.quizzes : []; + console.log('Quizzes filtrados recibidos:', this.quizzes); + } catch (error) { - // Manejo de errores console.error('Error al obtener los quizzes:', error); } } + + + - // Método para filtrar quizzes según el texto de búsqueda - filteredQuizzes(): Quiz[] { - const search = this.searchText.toLowerCase(); // Convertir a minúsculas para hacer la búsqueda insensible a mayúsculas/minúsculas - - // Retornar los quizzes filtrados - return this.quizzes.filter( - quiz => - quiz.name.toLowerCase().includes(search) || - quiz.seniority.toLowerCase().includes(search) || - quiz.created_at.toLowerCase().includes(search) || // fecha - quiz.created_by.first_name.toLowerCase().includes(search) || // creador - quiz.module.name.toLowerCase().includes(search) || //modulo - quiz.cell.name.toLowerCase().includes(search) || //celula - (quiz.is_active ? 'Activo' : 'Inactivo').toLowerCase().includes(search) // esta activo - ); + // Método para actualizar los resultados de la búsqueda al cambiar el texto + onSearchChange() { + this.fetchAllQuizzes(); } - // Método para alternar el estado de is_active async toggleActive(quiz: Quiz) { - quiz.is_active = !quiz.is_active; // Alterna el valor de is_active + quiz.is_active = !quiz.is_active; try { - const response = await fetch( - `${environment.url}/quiz/${quiz.name}`, - { - // Asegúrate de usar un identificador correcto - method: 'PUT', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ is_active: quiz.is_active }), // Envía el nuevo estado - } - ); + const response = await fetch(`${environment.url}/quiz/${quiz.id}`, { + method: 'PUT', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ is_active: quiz.is_active }), + }); if (!response.ok) { - throw new Error( - 'Error al actualizar el estado del quiz: ' + response.status - ); + throw new Error('Error al actualizar el estado del quiz: ' + response.status); } } catch (error) { console.error('Error al actualizar el estado del quiz:', error); } } - viewQuiz(quiz: Quiz) { - this.selectedQuiz = quiz; - - this.router.navigate(['home/view-quiz', quiz.id]); + this.selectedQuiz = quiz; + this.router.navigate(['home/view-quiz', quiz.id]); } - // Método para editar un quiz - // editQuiz(quiz: Quiz) { - // alert(`Editando el quiz: ${quiz.name}`); - // this.router.navigate(['/edit', quiz.name]); // Redirigir al editar usando el nombre del quiz - // } - - // Método para eliminar un quiz async deleteQuiz(quiz: any) { try { const result = await Swal.fire({ title: '¿Deseas eliminar el registro?', - text: 'Una vez eliminado no se podrá recuperar', + text: 'Una vez eliminado no se podrá recuperar', showCancelButton: true, - confirmButtonColor: '#6c63ff', // Color del botón de confirmación - cancelButtonColor: '#4e4e4e', // Color del botón de cancelación + confirmButtonColor: '#6c63ff', + cancelButtonColor: '#4e4e4e', confirmButtonText: 'Eliminar', cancelButtonText: 'Cancelar', customClass: { - popup: 'custom-popup', // Clase para el fondo y bordes - title: 'custom-title', // Clase para el título - confirmButton: 'custom-confirm-btn', // Clase para el botón de confirmación - cancelButton: 'custom-cancel-btn' // Clase para el botón de cancelación + popup: 'custom-popup', + title: 'custom-title', + confirmButton: 'custom-confirm-btn', + cancelButton: 'custom-cancel-btn' } }); - ; - + if (result.isConfirmed) { - let response = await fetch( - `${environment.url}/quiz/${quiz.id}`, - { - method: 'DELETE', - headers: { - 'Content-Type': 'application/json', - } + let response = await fetch(`${environment.url}/quiz/${quiz.id}`, { + method: 'DELETE', + headers: { + 'Content-Type': 'application/json', } - ); - + }); + if (response.ok) { Swal.fire('Eliminado', 'El quiz ha sido eliminado.', 'success'); this.quizzes = this.quizzes.filter(q => q !== quiz); @@ -182,18 +178,13 @@ export class AllPageComponent implements OnInit { Swal.fire('Error', 'Hubo un error en la solicitud.', 'error'); } } - - isExpanded3: boolean = false; - showEdit: boolean = false; - editQuiz(quiz: any) { - this.selectedQuiz = quiz; // Almacena el quiz seleccionado para editar - this.quizSelected.emit(quiz); // Expande la columna de edición + this.selectedQuiz = quiz; + this.quizSelected.emit(quiz); } - - // Cuando se cierra la edición + closeEdit() { - this.isExpanded3 = false; // Oculta la columna de edición + this.isExpanded3 = false; } } From 684afad390c687c59d51e400ed61a0189fc0f3b8 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Fri, 25 Oct 2024 17:24:04 -0500 Subject: [PATCH 125/203] node --- package-lock.json | 712 ++++++++++++++++++++++++++++++++++++---------- package.json | 1 + 2 files changed, 569 insertions(+), 144 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea19309..4d5fda7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "@sweetalert2/ngx-sweetalert2": "^12.4.0", "auth0": "^4.7.0", "bootstrap": "^5.3.0", + "esbuild": "^0.24.0", "glob": "^9.3.5", "msw": "^2.3.0", "primeflex": "^3.3.1", @@ -219,6 +220,437 @@ } } }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/aix-ppc64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz", + "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz", + "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz", + "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz", + "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-arm64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz", + "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz", + "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-arm64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz", + "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz", + "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz", + "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz", + "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ia32": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz", + "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-loong64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz", + "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-mips64el": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz", + "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ppc64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz", + "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-riscv64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz", + "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-s390x": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz", + "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz", + "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/netbsd-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz", + "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/openbsd-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz", + "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/sunos-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz", + "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-arm64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz", + "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-ia32": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz", + "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz", + "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/esbuild": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz", + "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.20.1", + "@esbuild/android-arm": "0.20.1", + "@esbuild/android-arm64": "0.20.1", + "@esbuild/android-x64": "0.20.1", + "@esbuild/darwin-arm64": "0.20.1", + "@esbuild/darwin-x64": "0.20.1", + "@esbuild/freebsd-arm64": "0.20.1", + "@esbuild/freebsd-x64": "0.20.1", + "@esbuild/linux-arm": "0.20.1", + "@esbuild/linux-arm64": "0.20.1", + "@esbuild/linux-ia32": "0.20.1", + "@esbuild/linux-loong64": "0.20.1", + "@esbuild/linux-mips64el": "0.20.1", + "@esbuild/linux-ppc64": "0.20.1", + "@esbuild/linux-riscv64": "0.20.1", + "@esbuild/linux-s390x": "0.20.1", + "@esbuild/linux-x64": "0.20.1", + "@esbuild/netbsd-x64": "0.20.1", + "@esbuild/openbsd-x64": "0.20.1", + "@esbuild/sunos-x64": "0.20.1", + "@esbuild/win32-arm64": "0.20.1", + "@esbuild/win32-ia32": "0.20.1", + "@esbuild/win32-x64": "0.20.1" + } + }, "node_modules/@angular-devkit/build-angular/node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", @@ -2681,394 +3113,387 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz", - "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz", + "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==", "cpu": [ "ppc64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "aix" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz", - "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz", + "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==", "cpu": [ "arm" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz", - "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz", + "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==", "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz", - "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz", + "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==", "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz", - "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz", + "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==", "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz", - "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz", + "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==", "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz", - "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz", + "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==", "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz", - "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz", + "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==", "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz", - "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz", + "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==", "cpu": [ "arm" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz", - "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz", + "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==", "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz", - "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz", + "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==", "cpu": [ "ia32" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz", - "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz", + "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==", "cpu": [ "loong64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz", - "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz", + "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==", "cpu": [ "mips64el" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz", - "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz", + "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==", "cpu": [ "ppc64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz", - "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz", + "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==", "cpu": [ "riscv64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz", - "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz", + "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==", "cpu": [ "s390x" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz", - "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz", + "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==", "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz", - "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz", + "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==", "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "netbsd" ], "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz", + "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz", - "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz", + "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==", "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "openbsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz", - "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz", + "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==", "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "sunos" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz", - "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz", + "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==", "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz", - "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz", + "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==", "cpu": [ "ia32" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz", - "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz", + "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==", "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@eslint-community/eslint-utils": { @@ -7755,43 +8180,42 @@ "license": "MIT" }, "node_modules/esbuild": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz", - "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==", - "dev": true, + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz", + "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==", "hasInstallScript": true, "license": "MIT", - "optional": true, "bin": { "esbuild": "bin/esbuild" }, "engines": { - "node": ">=12" + "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.20.1", - "@esbuild/android-arm": "0.20.1", - "@esbuild/android-arm64": "0.20.1", - "@esbuild/android-x64": "0.20.1", - "@esbuild/darwin-arm64": "0.20.1", - "@esbuild/darwin-x64": "0.20.1", - "@esbuild/freebsd-arm64": "0.20.1", - "@esbuild/freebsd-x64": "0.20.1", - "@esbuild/linux-arm": "0.20.1", - "@esbuild/linux-arm64": "0.20.1", - "@esbuild/linux-ia32": "0.20.1", - "@esbuild/linux-loong64": "0.20.1", - "@esbuild/linux-mips64el": "0.20.1", - "@esbuild/linux-ppc64": "0.20.1", - "@esbuild/linux-riscv64": "0.20.1", - "@esbuild/linux-s390x": "0.20.1", - "@esbuild/linux-x64": "0.20.1", - "@esbuild/netbsd-x64": "0.20.1", - "@esbuild/openbsd-x64": "0.20.1", - "@esbuild/sunos-x64": "0.20.1", - "@esbuild/win32-arm64": "0.20.1", - "@esbuild/win32-ia32": "0.20.1", - "@esbuild/win32-x64": "0.20.1" + "@esbuild/aix-ppc64": "0.24.0", + "@esbuild/android-arm": "0.24.0", + "@esbuild/android-arm64": "0.24.0", + "@esbuild/android-x64": "0.24.0", + "@esbuild/darwin-arm64": "0.24.0", + "@esbuild/darwin-x64": "0.24.0", + "@esbuild/freebsd-arm64": "0.24.0", + "@esbuild/freebsd-x64": "0.24.0", + "@esbuild/linux-arm": "0.24.0", + "@esbuild/linux-arm64": "0.24.0", + "@esbuild/linux-ia32": "0.24.0", + "@esbuild/linux-loong64": "0.24.0", + "@esbuild/linux-mips64el": "0.24.0", + "@esbuild/linux-ppc64": "0.24.0", + "@esbuild/linux-riscv64": "0.24.0", + "@esbuild/linux-s390x": "0.24.0", + "@esbuild/linux-x64": "0.24.0", + "@esbuild/netbsd-x64": "0.24.0", + "@esbuild/openbsd-arm64": "0.24.0", + "@esbuild/openbsd-x64": "0.24.0", + "@esbuild/sunos-x64": "0.24.0", + "@esbuild/win32-arm64": "0.24.0", + "@esbuild/win32-ia32": "0.24.0", + "@esbuild/win32-x64": "0.24.0" } }, "node_modules/esbuild-wasm": { diff --git a/package.json b/package.json index a46acb6..946d404 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "@sweetalert2/ngx-sweetalert2": "^12.4.0", "auth0": "^4.7.0", "bootstrap": "^5.3.0", + "esbuild": "^0.24.0", "glob": "^9.3.5", "msw": "^2.3.0", "primeflex": "^3.3.1", From 1600ea42af09f9cae807839d567b0d8ee220fe0a Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Fri, 25 Oct 2024 18:09:00 -0500 Subject: [PATCH 126/203] add view-quiz --- src/app/app.module.ts | 4 ++++ src/app/modules/all/pages/view-quiz/view-quiz.component.html | 2 +- src/app/modules/all/pages/view-quiz/view-quiz.component.ts | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4c69cdc..be503c8 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -8,11 +8,15 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { AuthModule } from '@auth0/auth0-angular'; import { environment } from 'src/environments/environment'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; +import { BrowserModule } from '@angular/platform-browser'; +import { CommonModule } from '@angular/common'; @NgModule({ declarations: [AppComponent], imports: [ AppRoutingModule, + BrowserModule, + CommonModule, AppLayoutModule, HttpClientModule, BrowserAnimationsModule, diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 26a6333..4363f97 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,7 +1,7 @@
-
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index aa06c2b..0a194a0 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -92,13 +92,20 @@ export class NewPagesComponent { } } + validarDatos(){ + + } + async recibirDatos(datos: any) { + if ( + this.selectNameForm.value.description && this.selectNameForm.valid && datos.celula != 'Selecciona la célula' && datos.modulo != 'Selecciona el modulo' && datos.seniority != 'Seniority' ) { + this.showButton = true; } @@ -108,38 +115,42 @@ export class NewPagesComponent { responseModule = await responseModule.json() responseModule = responseModule.find((element)=>element.name == datos.module ) - console.log(responseModule) + this.quizData.module = responseModule.id /* celula */ let response: any = await fetch(`${environment.url}/cells`); response = await response.json(); - console.log(response); + response = response.find(element => datos.cell == element.name); - console.log(response); + response ? (this.quizData.cell = response.id) : ''; - console.log(this.quizData); + /* seniority */ if (datos.seniority) { this.quizData.seniority = datos.seniority; } } + async createQuiz() { try { +this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quizData + const prueba = { name: this.selectNameForm.value.name, description: this.selectNameForm.value.description, - cell_id: this.quizData.cell, seniority: this.quizData.seniority, challenge_type: 'immediate', created_by_id: '224742e8-731b-40bf-b05f-a7547270746c', is_active: true, }; + + if (this.selectNameForm.value.description && this.selectNameForm.value.name){ const response = await fetch(`${environment.url}/quiz`, { method: 'POST', headers: { @@ -147,19 +158,27 @@ export class NewPagesComponent { }, body: JSON.stringify(prueba), }); - if (!response.ok) { - throw new Error(`Error: ${response.status}`); + if (!response.ok ) { + alert(response.status); + throw new Error(`Error: ${response.status}`); + } + const data = await response.json(); + this.quizID = data.id; + this.showForm = true; + this.toggle = false; + this.showButton = false; + this.questionCategory.name = this.selectNameForm.value.name; + this.questionCategory.description = this.selectNameForm.value.description; + console.log(this.questionCategory.description); + } else{ + alert('complete los datos requeridos') + this.showButton = false } - this.toggle = false; - this.showForm = true; - this.showButton = false; - this.questionCategory.name = this.selectNameForm.value.name; - this.questionCategory.description = this.selectNameForm.value.description; - console.log(this.quizData); - - const data = await response.json(); - this.quizID = data.id; /* aca hago global el ID del quiz */ - console.log(data); + + + + + } catch (error) { console.error('Error creating quiz:', error); } @@ -185,7 +204,7 @@ export class NewPagesComponent { this.questionCategory.name = this.selectNameForm.value.name; this.questionCategory.description = this.selectNameForm.value.description; - console.log(response); + } async createQuestion(form: any) { @@ -204,7 +223,7 @@ export class NewPagesComponent { break; } - console.log(formSection); + let question = { question: formSection.questionText, seniority: 'junior', @@ -223,9 +242,10 @@ export class NewPagesComponent { is_active: true, quiz_id: this.quizID, }; - if (this.questions.length <= 10) { - console.log(form.value); + + /* this.onQuestionTypeChange('otro', 0); */ + if(this.selectNameForm.value.description.length > 0){ const response = await fetch(`${environment.url}/question`, { method: 'POST', @@ -236,16 +256,17 @@ export class NewPagesComponent { }); const data = await response.json(); - if (!response.ok) { alert(response.status); throw new Error(`Error: ${response.status}`); } - this.questions.push(formSection); - console.log(data); - form.reset(); - this.options = []; - } + + this.questions.push(formSection); + + form.reset(); + this.options = []; + } else {alert('complete los campos requeridos')} + if (this.questions.length == 10) { alert('10 preguntas cargadas con exito'); window.location.reload(); diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index 51383f6..7c316d0 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -14,7 +14,7 @@ export class HeaderPageComponent { constructor(private formsBuilder: FormBuilder) {} ngOnInit(): void { - console.log(this.mode); + this.selectHeaderForm = this.formsBuilder.group({ nombreQuiz: [''], descripcion: [''], @@ -70,15 +70,12 @@ export class HeaderPageComponent { } isShowModulo() { - /* if(mode){ - - } */ if (this.mode) { + if (this.mode) { this.getModule(); this.showModulo = !this.showModulo; this.showCelula = false; this.showSeniority = false; } - console.log(this.opModules); } isShowCelula() { if (this.mode) { @@ -88,7 +85,6 @@ export class HeaderPageComponent { this.showSeniority = false; this.showModulo = false; } - console.log(this.opCells); } isShowSeniority() { if (this.mode) { From 889cbcb9cad5e422c283af5f1a9025df29bc9522 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 26 Oct 2024 12:49:22 -0300 Subject: [PATCH 128/203] resolving --- .../new/pages/new-pages/new-pages.component.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 0a194a0..3ea06cc 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -51,7 +51,8 @@ export class NewPagesComponent { return index; } - onQuestionTypeChange(selectedType: string) { + onQuestionTypeChange(selectedType: string, form: any) { + this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ this.selection = @@ -257,7 +258,7 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz const data = await response.json(); if (!response.ok) { - alert(response.status); + alert(response); throw new Error(`Error: ${response.status}`); } @@ -271,9 +272,10 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz alert('10 preguntas cargadas con exito'); window.location.reload(); } + console.log(formSection) } catch (error) { alert(error); - console.error('Error creating question:', error); + console.error(error); } } @@ -283,14 +285,14 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz this.toggle = true; } answerChoice(i: number) { - if (true) { + this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ this.selection = []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ this.array.push(i); this.selection = this.array; - } + } addOption() { From 8cae3a6b4db608dae65b0eb387cb881fe870250c Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Mon, 28 Oct 2024 08:19:44 -0300 Subject: [PATCH 129/203] f --- .../pages/new-pages/new-pages.component.ts | 79 +++++++------------ 1 file changed, 28 insertions(+), 51 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 3ea06cc..b0f83be 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -52,7 +52,7 @@ export class NewPagesComponent { } onQuestionTypeChange(selectedType: string, form: any) { - + console.log(form.value) this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ this.selection = @@ -82,15 +82,7 @@ export class NewPagesComponent { 'Opción 2.', ]; /* haciendo distinto el valor funciona */ /* Pero al agregar un campo el problema vuelve a surgir */ - } else { - this.isTrueFalseQuestion = false; - this.options = []; - this.showPlus = false; - this.showPlus2 = false; - this.showSubmits = false; - this.inputType = 'radio'; - selectedType = 'Tipo de Pregunta'; - } + } } validarDatos(){ @@ -123,14 +115,9 @@ export class NewPagesComponent { let response: any = await fetch(`${environment.url}/cells`); response = await response.json(); - - response = response.find(element => datos.cell == element.name); - - response ? (this.quizData.cell = response.id) : ''; - /* seniority */ if (datos.seniority) { this.quizData.seniority = datos.seniority; @@ -176,10 +163,6 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz this.showButton = false } - - - - } catch (error) { console.error('Error creating quiz:', error); } @@ -204,8 +187,6 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz this.showForm = true; this.questionCategory.name = this.selectNameForm.value.name; this.questionCategory.description = this.selectNameForm.value.description; - - } async createQuestion(form: any) { @@ -223,30 +204,26 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz formSection.questionType = 'simple_choice'; break; } - - - let question = { - question: formSection.questionText, - seniority: 'junior', - type: formSection.questionType, - options: [ - formSection?.option0, - formSection?.option1, - formSection?.option2, - formSection?.option3, - formSection?.option4, - formSection?.option5, - ].filter(option => option !== undefined && option !== null), - correct_option: formSection.solution, - explanation: 'string', - link: 'string', - is_active: true, - quiz_id: this.quizID, - }; - - - /* this.onQuestionTypeChange('otro', 0); */ - if(this.selectNameForm.value.description.length > 0){ + + if(formSection.solution && formSection.questionText){ + let question = { + question: formSection.questionText, + seniority: 'junior', + type: formSection.questionType, + options: [ + formSection?.option0, + formSection?.option1, + formSection?.option2, + formSection?.option3, + formSection?.option4, + formSection?.option5, + ].filter(option => option !== undefined && option !== null), + correct_option: formSection.solution, + explanation: 'string', + link: 'string', + is_active: true, + quiz_id: this.quizID, + }; const response = await fetch(`${environment.url}/question`, { method: 'POST', @@ -266,7 +243,7 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz form.reset(); this.options = []; - } else {alert('complete los campos requeridos')} + } else {alert('complete los campos requeridos'); console.log(formSection)} if (this.questions.length == 10) { alert('10 preguntas cargadas con exito'); @@ -285,13 +262,13 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz this.toggle = true; } answerChoice(i: number) { - - this.array = - []; /* <--- este array se crea porque no permite hacer push a selection directamente */ - this.selection = - []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ + this.array = + []; /* <--- este array se crea porque no permite hacer push a selection directamente */ + this.selection = + []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ this.array.push(i); this.selection = this.array; + console.log(this.array); } From cb5d7ff9946c6fb6031f624a60a69bcbf47e2221 Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Mon, 28 Oct 2024 09:27:20 -0300 Subject: [PATCH 130/203] view QUIZ --- .../pages/all-page/all-page.component.html | 6 ++- .../pages/view-quiz/view-quiz.component.html | 41 +++++++--------- .../pages/view-quiz/view-quiz.component.scss | 49 ++++++++++--------- 3 files changed, 50 insertions(+), 46 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 9e4892a..b81da1d 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1,5 +1,9 @@
- +

Todos los Quiz

diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 4363f97..a1bbfa2 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,8 +1,8 @@ -
-
+
+
-
@@ -39,40 +39,37 @@

Seniority / Nivel

Preguntas:

-
    -
  • +
      +

    • Pregunta: {{ question.question }}

      Opciones:

      • -
        -
        + disabled + />
        - + [value]="option" + readonly + />
    - +
- -

No hay preguntas disponibles para este quiz.

- +
-
\ No newline at end of file diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index 5cfa643..3e10da0 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -1,33 +1,35 @@ -/* Centrado del contenedor principal */ -.contenedor { - display: flex; - flex-direction: column; - - font-family: Poppins; - - -} - - - +/* Estilos para el contenedor principal */ .normal-container { display: flex; flex-direction: column; - justify-content: center; align-items: center; - background-color: #212121; padding: 2rem; - border-radius: 12px; width: 100%; - box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); max-width: 900px; - box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); - background-image: url('../../../../../assets/layout/images/logo.svg') !important; + height: 100vh; + background-color: rgba(33, 33, 33, 0.8); + border-radius: 12px; + box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); + background-image: url('../../../../../assets/layout/images/logo.svg'); background-repeat: no-repeat; background-position: center; background-size: 180px; + overflow-y: auto; + overflow-x: hidden; + border: 2px solid rgba(241, 121, 197, 1); + position: relative; + z-index: 1; } +/* Centrado del contenedor interno */ +.contenedor { + display: flex; + flex-direction: column; + font-family: Poppins; + width: 100%; /* Alinea el contenido al tamaño del contenedor */ +} + +/* Estilos adicionales */ .content-1 { background-color: #353434; display: flex; @@ -38,7 +40,7 @@ } .input-container { - width: 30%; /* Ajustado para que cada campo ocupe un 30% del ancho */ + width: 30%; display: flex; flex-direction: column; font-family: Poppins; @@ -55,8 +57,10 @@ } .form-group { - margin-top: 2rem; - width: 100%; + display: flex; + justify-content: space-between; + flex-wrap: wrap; + width: 130vh; } .question-container { @@ -72,7 +76,7 @@ } .option-item { - width: 45%; /* Para que cada opción ocupe el 45% del ancho y queden dos por fila */ + width: 45%; margin-bottom: 1rem; } @@ -85,7 +89,6 @@ color: #8e8e8e; } -/* Alinear el botón circular de cierre */ .btn-circle { display: flex; align-items: center; From 58715fc97f107228f6ea24a09958e8e019d46ff8 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Mon, 28 Oct 2024 12:35:04 -0300 Subject: [PATCH 131/203] bug --- .env.example | 5 --- package.json | 2 ++ .../pages/new-pages/new-pages.component.html | 2 +- .../pages/new-pages/new-pages.component.ts | 35 +++++++++++-------- 4 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 .env.example diff --git a/.env.example b/.env.example deleted file mode 100644 index 7afc9f8..0000000 --- a/.env.example +++ /dev/null @@ -1,5 +0,0 @@ -DOMAIN="" -CLIENT_ID="" -AUDIENCE="" -REDIRECT_URL="" -API_URL="" \ No newline at end of file diff --git a/package.json b/package.json index 1e220cb..75bccc9 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,9 @@ "ng": "ng", "start": "ng serve", "build": "ng build", + "build:dev": "ng build --configuration=dev", "build:testing": "ng build --configuration=testing", + "build:production": "ng build --configuration=production", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e", diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 45fa536..bbe8150 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -105,7 +105,7 @@

Define la pregunta {{questions.length+1}}/10

class="checkbox-input" name="solution" [ngModel]="selection" - (ngModelChange)="answerChoice(i, inputType)" /> + (ngModelChange)="answerChoice(i, questionForm)" />
Date: Mon, 28 Oct 2024 18:30:27 -0300 Subject: [PATCH 132/203] bugs --- .../pages/new-pages/new-pages.component.html | 8 +++++--- .../new/pages/new-pages/new-pages.component.ts | 18 +++++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index bbe8150..2df8a75 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -59,7 +59,7 @@

Define la pregunta {{questions.length+1}}/10

id="questionType" name="questionType" [(ngModel)]="selectedOption" - (ngModelChange)="onQuestionTypeChange($event, questionForm)" + (ngModelChange)="onQuestionTypeChange($event)" required>
Define la pregunta {{questions.length+1}}/10 [(ngModel)]="options[i]" name="option{{ i }}" [readonly]="isTrueFalseQuestion" + required /> -
+
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 04e93d6..4871160 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -62,14 +62,17 @@ export class NewPagesComponent { console.log(this.array); } + lolo = false onQuestionTypeChange(selectedType: string, form: any) { - console.log(form.value) + this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ - this.selection = + this.selection = []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ - if (selectedType === 'Verdadero o falso') { + if (selectedType === 'Verdadero o falso') { + + this.lolo = false this.isTrueFalseQuestion = true; this.options = ['Verdadero', 'Falso']; this.showPlus = false; @@ -77,6 +80,7 @@ export class NewPagesComponent { this.showSubmits = true; this.inputType = 'radio'; } else if (selectedType === 'Selección mutiple') { + this.lolo = false this.isTrueFalseQuestion = false; this.options = ['Opción 1', 'Opción 2', 'Opción 3']; this.showPlus = true; @@ -84,6 +88,7 @@ export class NewPagesComponent { this.showSubmits = true; this.inputType = 'checkbox'; } else if (selectedType == 'Casilla') { + this.lolo = false this.isTrueFalseQuestion = false; this.showPlus = false; this.showPlus2 = true; @@ -198,6 +203,10 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz this.questionCategory.description = this.selectNameForm.value.description; } + isDisabled(index: number): any { + return this.selection[index] || false; + } + async createQuestion(form: any) { try { const formSection = form.value; @@ -213,13 +222,12 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz formSection.questionType = 'simple_choice'; break; } - if(!form.value.solution){ form.value.solution = this.selection } - if(formSection.solution && formSection.questionText){ + if(formSection.solution.length !=0 && formSection.questionText){ let question = { question: formSection.questionText, seniority: 'junior', From e0f7dca4c2a3f3c2824f319dd5edebfe7a342cd1 Mon Sep 17 00:00:00 2001 From: ignacio salazar Date: Mon, 28 Oct 2024 22:01:27 -0300 Subject: [PATCH 133/203] bug --- .../pages/new-pages/new-pages.component.html | 5 +- .../pages/new-pages/new-pages.component.ts | 150 +++++++++--------- 2 files changed, 78 insertions(+), 77 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 2df8a75..8a6c3dc 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -87,7 +87,7 @@

Define la pregunta {{questions.length+1}}/10

id="questionText" class="custom-input" name="questionText" - ngModel + placeholder="Escribe una pregunta" required />
@@ -104,8 +104,7 @@

Define la pregunta {{questions.length+1}}/10

type="{{ inputType }}" class="checkbox-input" name="solution" - [ngModel]="selection" - [checked]="lolo" + [(ngModel)]="selections[i]" (ngModelChange)="answerChoice(i)" />
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 4871160..422d8a7 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -53,26 +53,24 @@ export class NewPagesComponent { answerChoice(i: number, form: any) { this.array = - []; /* <--- este array se crea porque no permite hacer push a selection directamente */ - this.selection = - []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ - this.array.push(i); - this.selection = this.array; - - console.log(this.array); + []; /* <--- este array se crea porque no permite hacer push a selection directamente */ + this.selection = + []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ + this.array.push(i); + this.selection = this.array; + console.log(this.array); } - lolo = false + selections: boolean[] = [] + onQuestionTypeChange(selectedType: string, form: any) { - + this.selections = this.selections.map(() => false); this.array = []; /* <--- este array se crea porque no permite hacer push a selection directamente */ - this.selection = + this.selection = []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ - if (selectedType === 'Verdadero o falso') { - - this.lolo = false + if (selectedType === 'Verdadero o falso') { this.isTrueFalseQuestion = true; this.options = ['Verdadero', 'Falso']; this.showPlus = false; @@ -80,7 +78,6 @@ export class NewPagesComponent { this.showSubmits = true; this.inputType = 'radio'; } else if (selectedType === 'Selección mutiple') { - this.lolo = false this.isTrueFalseQuestion = false; this.options = ['Opción 1', 'Opción 2', 'Opción 3']; this.showPlus = true; @@ -88,7 +85,6 @@ export class NewPagesComponent { this.showSubmits = true; this.inputType = 'checkbox'; } else if (selectedType == 'Casilla') { - this.lolo = false this.isTrueFalseQuestion = false; this.showPlus = false; this.showPlus2 = true; @@ -99,11 +95,10 @@ export class NewPagesComponent { 'Opción 2.', ]; /* haciendo distinto el valor funciona */ /* Pero al agregar un campo el problema vuelve a surgir */ - } + } } async recibirDatos(datos: any) { - if ( this.selectNameForm.value.description && this.selectNameForm.valid && @@ -111,18 +106,19 @@ export class NewPagesComponent { datos.modulo != 'Selecciona el modulo' && datos.seniority != 'Seniority' ) { - this.showButton = true; } /* modulo */ - - let responseModule: any = await fetch(`${environment.url}/modules`) - responseModule = await responseModule.json() - responseModule = responseModule.find((element)=>element.name == datos.module ) - - this.quizData.module = responseModule.id + let responseModule: any = await fetch(`${environment.url}/modules`); + responseModule = await responseModule.json(); + + responseModule = responseModule.find( + element => element.name == datos.module + ); + + this.quizData.module = responseModule.id; /* celula */ @@ -130,7 +126,7 @@ export class NewPagesComponent { response = await response.json(); response = response.find(element => datos.cell == element.name); response ? (this.quizData.cell = response.id) : ''; - + /* seniority */ if (datos.seniority) { this.quizData.seniority = datos.seniority; @@ -139,7 +135,9 @@ export class NewPagesComponent { async createQuiz() { try { -this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quizData + this.quizData.seniority == 'semi-sr' + ? (this.quizData.seniority = 'middle') + : this.quizData; const prueba = { name: this.selectNameForm.value.name, @@ -150,33 +148,35 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz created_by_id: '224742e8-731b-40bf-b05f-a7547270746c', is_active: true, }; - - - if (this.selectNameForm.value.description && this.selectNameForm.value.name){ - const response = await fetch(`${environment.url}/quiz`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(prueba), - }); - if (!response.ok ) { + + if ( + this.selectNameForm.value.description && + this.selectNameForm.value.name + ) { + const response = await fetch(`${environment.url}/quiz`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(prueba), + }); + if (!response.ok) { alert(response.status); throw new Error(`Error: ${response.status}`); } const data = await response.json(); - this.quizID = data.id; + this.quizID = data.id; this.showForm = true; this.toggle = false; this.showButton = false; this.questionCategory.name = this.selectNameForm.value.name; - this.questionCategory.description = this.selectNameForm.value.description; + this.questionCategory.description = + this.selectNameForm.value.description; console.log(this.questionCategory.description); - } else{ - alert('complete los datos requeridos') - this.showButton = false + } else { + alert('complete los datos requeridos'); + this.showButton = false; } - } catch (error) { console.error('Error creating quiz:', error); } @@ -223,29 +223,28 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz break; } - - if(!form.value.solution){ - form.value.solution = this.selection + if (!form.value.solution) { + form.value.solution = this.selection; } - if(formSection.solution.length !=0 && formSection.questionText){ - let question = { - question: formSection.questionText, - seniority: 'junior', - type: formSection.questionType, - options: [ - formSection?.option0, - formSection?.option1, - formSection?.option2, - formSection?.option3, - formSection?.option4, - formSection?.option5, - ].filter(option => option !== undefined && option !== null), - correct_option: formSection.solution, - explanation: 'string', - link: 'string', - is_active: true, - quiz_id: this.quizID, - }; + if (formSection.solution.length != 0 && formSection.questionText) { + let question = { + question: formSection.questionText, + seniority: 'junior', + type: formSection.questionType, + options: [ + formSection?.option0, + formSection?.option1, + formSection?.option2, + formSection?.option3, + formSection?.option4, + formSection?.option5, + ].filter(option => option !== undefined && option !== null), + correct_option: formSection.solution, + explanation: 'string', + link: 'string', + is_active: true, + quiz_id: this.quizID, + }; const response = await fetch(`${environment.url}/question`, { method: 'POST', @@ -260,19 +259,22 @@ this.quizData.seniority == 'semi-sr'?this.quizData.seniority= 'middle':this.quiz alert(response); throw new Error(`Error: ${response.status}`); } - - console.log(data) - this.questions.push(formSection); - - form.reset(); - this.options = []; - } else {alert('complete los campos requeridos'); console.log(formSection)} - + + console.log(data); + this.questions.push(formSection); + + form.reset(); + this.options = []; + } else { + alert('complete los campos requeridos'); + console.log(formSection); + } + if (this.questions.length == 10) { alert('10 preguntas cargadas con exito'); window.location.reload(); } - console.log(formSection) + console.log(formSection); } catch (error) { alert(error); console.error(error); From cb64632bcb4cb77f1401cd7f0c8dee4c6e8ff739 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 29 Oct 2024 18:38:02 -0300 Subject: [PATCH 134/203] bugs --- .../pages/new-pages/new-pages.component.html | 52 +++++++++++++------ .../pages/new-pages/new-pages.component.scss | 6 ++- .../pages/new-pages/new-pages.component.ts | 1 + 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 8a6c3dc..2bb9268 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -8,45 +8,59 @@ + [ngClass]="{ notice: isFieldInvalid('name') }" />
- +
+ [placeholder]=" + isFieldInvalid('description') + ? '* La descripción es requerida' + : 'Descripción' + " + formControlName="description" />
- + + [mode]="toggle">
- +
-

Define la pregunta {{questions.length+1}}/10

+

Define la pregunta {{ questions.length + 1 }}/10

-
+
@@ -97,7 +114,9 @@

Define la pregunta {{questions.length+1}}/10

-
+
Define la pregunta {{questions.length+1}}/10 [(ngModel)]="options[i]" name="option{{ i }}" [readonly]="isTrueFalseQuestion" - required /> -
+
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 8ea3ecd..f1ce585 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -276,4 +276,8 @@ i { .notice:focus { box-shadow: 0 0 8px 2px rgba(203, 60, 231, 0.8); /* Sombra más fuerte al hacer foco */ -} \ No newline at end of file +} + +.hidden { + display: none; +} diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 422d8a7..b999975 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -46,6 +46,7 @@ export class NewPagesComponent { quizData: any = {}; createOrEdit: boolean = true; toggle: boolean = true; + isFocused = false; trackByFn(index: number): any { return index; From a6a0f3db3e19caa4ada64fa7bac01bb74ff50761 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 29 Oct 2024 20:09:25 -0300 Subject: [PATCH 135/203] fallos --- src/app/modules/new/pages/new-pages/new-pages.component.html | 1 + src/app/modules/new/pages/new-pages/new-pages.component.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 2bb9268..dcc0021 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -106,6 +106,7 @@

Define la pregunta {{ questions.length + 1 }}/10

class="custom-input" name="questionText" placeholder="Escribe una pregunta" + [(ngModel)]="questionText" required />
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index b999975..3d9628f 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -30,6 +30,7 @@ export class NewPagesComponent { seniority: 'Seniority', }; + questionText: string = ''; questions: any = []; options: string[] = []; selection: string[] = ['']; @@ -211,7 +212,7 @@ export class NewPagesComponent { async createQuestion(form: any) { try { const formSection = form.value; - +console.log(formSection) switch (formSection.questionType) { case 'Selección mutiple': formSection.questionType = 'multiple_choice'; From edd69a680fa22fa13325eba871eb993351e3852f Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Tue, 29 Oct 2024 18:29:40 -0500 Subject: [PATCH 136/203] changes --- src/app/modules/all/pages/all-page/all-page.component.ts | 2 +- src/app/modules/all/pages/view-quiz/view-quiz.component.scss | 2 +- src/app/modules/auth/pages/auth-page/auth-page.component.ts | 2 +- .../welcome/pages/welcome-page/welcome-page.component.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 8828094..92516c9 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -179,7 +179,7 @@ export class AllPageComponent implements OnInit { } } - editQuiz(quiz: any) { + editQuiz(quiz: Quiz) { this.selectedQuiz = quiz; this.quizSelected.emit(quiz); } diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index 5cfa643..eee42c9 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -20,7 +20,7 @@ border-radius: 12px; width: 100%; box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); - max-width: 900px; + max-width: 1000px; box-shadow: 0 6px 15px rgba(0, 0, 0, 0.9); background-image: url('../../../../../assets/layout/images/logo.svg') !important; background-repeat: no-repeat; diff --git a/src/app/modules/auth/pages/auth-page/auth-page.component.ts b/src/app/modules/auth/pages/auth-page/auth-page.component.ts index e0e94f6..3c2ae55 100644 --- a/src/app/modules/auth/pages/auth-page/auth-page.component.ts +++ b/src/app/modules/auth/pages/auth-page/auth-page.component.ts @@ -72,4 +72,4 @@ export class AuthPageComponent implements OnInit { this.router.navigate(['/sign-in']); } } -} +} \ No newline at end of file diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 7a97804..a034dfe 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -14,7 +14,7 @@
- +
From 39efd6c1fd15286c6d23d566ea87b58d8d528ae5 Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Tue, 29 Oct 2024 20:30:15 -0300 Subject: [PATCH 137/203] style and logic in view-quiz --- .../pages/view-quiz/view-quiz.component.html | 15 +++--- .../pages/view-quiz/view-quiz.component.scss | 51 ++++++++++--------- .../pages/view-quiz/view-quiz.component.ts | 9 +++- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index a1bbfa2..2350ef8 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,8 +1,12 @@
-
+
+
+ +
- +

Preguntas:

    @@ -66,10 +70,5 @@

    Pregunta: {{ question.question }}

- -
diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index 3e10da0..6e242ce 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -1,41 +1,43 @@ -/* Estilos para el contenedor principal */ .normal-container { display: flex; flex-direction: column; align-items: center; + justify-content: flex-start; padding: 2rem; - width: 100%; + width: 90%; max-width: 900px; - height: 100vh; - background-color: rgba(33, 33, 33, 0.8); + height: 90vh; border-radius: 12px; - box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); + box-shadow: 0px 0px 12.8px rgba(241, 121, 197, 1); + background: rgba(56, 53, 53, 1); + border: 2px solid rgba(241, 121, 197, 1); background-image: url('../../../../../assets/layout/images/logo.svg'); background-repeat: no-repeat; background-position: center; - background-size: 180px; - overflow-y: auto; - overflow-x: hidden; - border: 2px solid rgba(241, 121, 197, 1); - position: relative; - z-index: 1; + background-size: 180px; + z-index: 1; + font-family: Poppins; + margin: auto; + overflow-y: auto; + margin-top: 10px; + } -/* Centrado del contenedor interno */ .contenedor { + margin-top: 20px; display: flex; - flex-direction: column; - font-family: Poppins; - width: 100%; /* Alinea el contenido al tamaño del contenedor */ + flex-direction: column; + align-items: center; + width: 100%; } -/* Estilos adicionales */ .content-1 { background-color: #353434; display: flex; justify-content: space-between; width: 100%; padding: 1rem; + gap: 5px; border-radius: 12px; } @@ -60,7 +62,8 @@ display: flex; justify-content: space-between; flex-wrap: wrap; - width: 130vh; + width: 100%; + margin-top: 20px; } .question-container { @@ -81,12 +84,13 @@ } .custom-option-input { - width: 100%; - padding: 0.8rem; - background-color: #202020; - border: none; + width: 57vh; + height: 4vh; border-radius: 8px; - color: #8e8e8e; + border: none; + background: rgba(32, 32, 32, 0.8); + border-radius: 0 8px 8px 0px; + cursor: pointer; } .btn-circle { @@ -97,7 +101,6 @@ height: 40px; border-radius: 50%; background-color: rgba(0, 0, 0, 1); - color: white; - border: none; + color: white; cursor: pointer; } diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index 77702a5..c1763ec 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { environment } from '@environments/environment'; import { Location } from '@angular/common'; - +import { Router } from '@angular/router'; interface User { first_name: string; } @@ -47,7 +47,7 @@ export class ViewQuizComponent implements OnInit { quizId: string = ''; quizDetails: Quiz | null = null; - constructor(private route: ActivatedRoute, private location: Location) {} + constructor(private route: ActivatedRoute, private location: Location, private router: Router ) {} ngOnInit(): void { this.quizId = this.route.snapshot.paramMap.get('id') || ''; @@ -71,6 +71,11 @@ export class ViewQuizComponent implements OnInit { console.error('Error en la solicitud:', error); } } + editQuiz(): void { + + this.router.navigate(['home', ]); + } + goBack(): void { this.location.back(); From 9c10f322895f74a044759c69bdc06c4209037aab Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Tue, 29 Oct 2024 20:32:16 -0300 Subject: [PATCH 138/203] style and logic in view-quiz --- src/app/modules/all/pages/view-quiz/view-quiz.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index c1763ec..fc460c9 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -73,7 +73,7 @@ export class ViewQuizComponent implements OnInit { } editQuiz(): void { - this.router.navigate(['home', ]); + } From fcf3f6c19fe7afc81b8c374af068e9d4faa846c6 Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Wed, 30 Oct 2024 20:17:46 -0300 Subject: [PATCH 139/203] add styles in screen view-quiz --- .../pages/all-page/all-page.component.scss | 7 ++- .../pages/view-quiz/view-quiz.component.html | 26 +++++++---- .../pages/view-quiz/view-quiz.component.scss | 45 +++++++++++++++---- .../pages/view-quiz/view-quiz.component.ts | 9 +++- .../pages/home-page/home-page.component.ts | 2 +- 5 files changed, 67 insertions(+), 22 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index ea338dc..f263d96 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -8,8 +8,7 @@ $spacing: 20px; .quiz-dashboard { - padding: 20px; - background-color: #1e1e1e; + padding: 20px; color: #fff; height: 95vh; width: 150vh; @@ -19,6 +18,10 @@ $spacing: 20px; opacity: 0px; overflow: auto; margin-block: 2.5vh; + background-image: url('../../../../../assets/layout/images/logo.svg'); + background-repeat: no-repeat; + background-position: center; + background-size: 180px; } .table-sup{ font-family: Poppins; diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 2350ef8..3237425 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,19 +1,29 @@
-
+
-
-
+ -
+
+
+
+

Nombre del quiz

+ +
+
+

Descripcion

+ +
+
+
diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index 6e242ce..bee1d2d 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -32,7 +32,7 @@ } .content-1 { - background-color: #353434; + display: flex; justify-content: space-between; width: 100%; @@ -71,6 +71,25 @@ flex-direction: column; gap: 15px; } +.inline-block { + display: inline-block; + vertical-align: top; + margin-top: 20px; +} + + +.descripcion, .namequiz { + display: flex; + flex-direction: column; + width: 384px; + height: 40px; + border-radius: 8px; + border: 1px solid #333232; + background-color: #1b1b1b; + padding: 1rem; + font-size: 14px; +} + .option-row { display: flex; @@ -93,14 +112,22 @@ cursor: pointer; } -.btn-circle { +.button-container { display: flex; align-items: center; - justify-content: center; - width: 40px; - height: 40px; - border-radius: 50%; - background-color: rgba(0, 0, 0, 1); - color: white; - cursor: pointer; + justify-content: space-between; /* Para separarlos a cada extremo del contenedor */ +} + +.btn-plus { + width: 3rem; + height: 3rem; + border-radius: 8px; + padding: 8px; + gap: 8px; + background: linear-gradient(to right, #6a5fff80, #ff5ea680); + border: none; +} + +.btn-circle { + margin-left: auto; /* Envía el botón de cerrar a la derecha */ } diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index fc460c9..d734794 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Output, EventEmitter} from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { environment } from '@environments/environment'; import { Location } from '@angular/common'; @@ -46,6 +46,7 @@ interface Question { export class ViewQuizComponent implements OnInit { quizId: string = ''; quizDetails: Quiz | null = null; + @Output() close = new EventEmitter(); constructor(private route: ActivatedRoute, private location: Location, private router: Router ) {} @@ -78,6 +79,10 @@ export class ViewQuizComponent implements OnInit { goBack(): void { - this.location.back(); + this.close.emit(); + + + + } } diff --git a/src/app/modules/home/pages/home-page/home-page.component.ts b/src/app/modules/home/pages/home-page/home-page.component.ts index de4c76b..6485210 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.ts +++ b/src/app/modules/home/pages/home-page/home-page.component.ts @@ -6,7 +6,7 @@ import { Component } from '@angular/core'; styleUrl: './home-page.component.scss' }) export class HomePageComponent { - user: string = 'Agustín'; // Aquí puedes cambiar dinámicamente el nombre del usuario + user: string = ''; // Aquí puedes cambiar dinámicamente el nombre del usuario activeSection = 'Todos'; // Sección activa por defecto From a1335d19ae4b812d688e30dd0366aa307017e315 Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Wed, 30 Oct 2024 20:56:52 -0300 Subject: [PATCH 140/203] add style in screen all-page --- .../pages/all-page/all-page.component.html | 2 +- .../pages/all-page/all-page.component.scss | 101 +++++++++--------- 2 files changed, 53 insertions(+), 50 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index b81da1d..b2337c2 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -26,7 +26,7 @@

Todos los Quiz

- + {{ quiz?.name }} {{ quiz?.seniority }} {{ quiz?.created_at | date:'dd/MM/yyyy' }} diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index f263d96..327db65 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -1,12 +1,3 @@ -$background-color: #2a2a2a; -$shadow-color: rgba(0, 217, 255, 0.4); -$input-bg-color: #333; -$text-color: #fff; -$border-radius: 12px; -$transition-time: 0.3s; -$spacing: 20px; - - .quiz-dashboard { padding: 20px; color: #fff; @@ -17,11 +8,15 @@ $spacing: 20px; gap: 47px; opacity: 0px; overflow: auto; - margin-block: 2.5vh; - background-image: url('../../../../../assets/layout/images/logo.svg'); - background-repeat: no-repeat; - background-position: center; - background-size: 180px; + margin-block: 2.5vh; + background-color: rgba(53, 52, 52, 0.5); + + + border: 2px solid rgba(241, 121, 197, 1); + // background-image: url('../../../../../assets/layout/images/logo.svg'); + // background-repeat: no-repeat; + // background-position: center; + // background-size: 180px; } .table-sup{ font-family: Poppins; @@ -30,12 +25,16 @@ $spacing: 20px; line-height: 24px; letter-spacing: 0.20000000298023224px; text-align: center; + background: rgba(27, 27, 27, 0.5); + + } .table-int{ margin: 0 auto; flex: auto; - + background: rgba(27, 27, 27, 0.5); + } @@ -54,7 +53,9 @@ h2 { } .filters select { - background-color: #333; + background-color: rgba(53, 52, 52, 0.5); + + border: 1px solid #444; padding: 10px; color: #fff; @@ -64,7 +65,9 @@ h2 { .search-container { top: 0; - background-color: #1e1e1e; + background-color: rgba(53, 52, 52, 0.5); + + padding: 10px 20px; display: flex; justify-content: space-between; @@ -73,7 +76,9 @@ h2 { } .search-container input { - background-color: #333; + background-color: rgba(53, 52, 52, 0.5); + + border: 1px solid #444; padding: 8px; color: #fff; @@ -115,16 +120,18 @@ h2 { width: 100%; border-collapse: collapse; margin-top: 10px; + background: rgba(27, 27, 27, 0.5); + } + .activo { - color:rgba(151, 71, 255, 1); - ; /* Color para activo */ - font-weight: bold; /* Puedes ajustar el estilo como desees */ + color:rgba(151, 71, 255, 1); + } .inactivo { - color: red; /* Color para inactivo */ - font-weight: normal; /* Estilo normal para inactivo */ + color: red; + font-weight: normal; } .input-wrapper { @@ -141,34 +148,36 @@ h2 { color: #aaa; } .custom-popup { - background-color: #1f1f1f; /* Fondo oscuro similar al de la imagen */ - color: #fff; /* Texto en blanco */ - border-radius: 15px; /* Bordes redondeados */ + background-color: rgba(53, 52, 52, 0.5) !important; + + + color: #fff !important; + border-radius: 15px !important ; } .custom-title { - font-size: 20px; /* Tamaño de fuente del título */ - font-weight: bold; - color: #fff; /* Color del texto del título */ + font-size: 20px !important; + font-weight: bold !important; + color: #fff !important; } .custom-content { - font-size: 14px; /* Tamaño de fuente del contenido */ - color: #cccccc; /* Color del texto del contenido */ + font-size: 14px !important; + color: #cccccc !important; } .custom-confirm-btn { - background-color: #6c63ff; /* Color del botón de confirmación */ - border-radius: 10px; /* Bordes redondeados en el botón */ - color: #fff; /* Texto en blanco */ - padding: 10px 20px; /* Espaciado en el botón */ + background-color: #6c63ff !important; + border-radius: 10px !important; + color: #fff !important; + padding: 10px 20px !important; } .custom-cancel-btn { - background-color: #4e4e4e; /* Color del botón de cancelación */ - border-radius: 10px; - color: #fff; - padding: 10px 20px; + background-color: #4e4e4e !important; + border-radius: 10px !important; + color: #fff !important; + padding: 10px 20px !important; } .input-wrapper input { @@ -180,21 +189,15 @@ h2 { padding: 10px; text-align: left; border-bottom: 1px solid #444; -} - -.quiz-table th { - background-color: #333; - -} - -.quiz-table td { - background-color: #222; + background-color: rgba(53, 52, 52, 0.5); text-align: center; // Centrar el texto horizontalmente padding: 12px; // Espacio alrededor del texto font-family: "Poppins"; - + } + + .actions button { display: flexbox; background: none; From 395750254568c8351077c77234874b1bbf5163ea Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Wed, 30 Oct 2024 19:30:13 -0500 Subject: [PATCH 141/203] edit changes --- src/app/modules/all/all.module.ts | 5 + .../pages/all-page/all-page.component.html | 2 +- .../all/pages/all-page/all-page.component.ts | 2 + .../pages/auth-page/auth-page.component.ts | 4 +- .../edit-pages/edit-pages.component.html | 82 ++++---- .../edit-pages/edit-pages.component.scss | 76 +++++++- .../pages/edit-pages/edit-pages.component.ts | 175 +++++++++++++----- .../pages/edit-pages/services/quiz.service.ts | 11 +- .../welcome-page/welcome-page.component.html | 2 +- .../sideBar/side-bar/side-bar.component.html | 2 + 10 files changed, 265 insertions(+), 96 deletions(-) diff --git a/src/app/modules/all/all.module.ts b/src/app/modules/all/all.module.ts index 139bb4e..7dea988 100644 --- a/src/app/modules/all/all.module.ts +++ b/src/app/modules/all/all.module.ts @@ -7,6 +7,7 @@ import { RouterModule, Routes } from '@angular/router'; import { FormsModule } from '@angular/forms'; import { HeaderFormModule } from 'src/app/shared/components/header-form/header-form.module'; import { EditModule } from '../edit/edit.module'; +import { EditPagesComponent } from '../edit/pages/edit-pages/edit-pages.component'; const routes: Routes = [ @@ -14,6 +15,10 @@ const routes: Routes = [ path: 'view-quiz/:id', // Define la ruta con el parámetro 'id' component: ViewQuizComponent }, + { + path: 'edit-pages/:id', // Define la ruta con el parámetro 'id' + component: EditPagesComponent + }, ]; @NgModule({ diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index b81da1d..e230f8f 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -52,7 +52,7 @@

Todos los Quiz

- +
diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 92516c9..16f21e9 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -182,9 +182,11 @@ export class AllPageComponent implements OnInit { editQuiz(quiz: Quiz) { this.selectedQuiz = quiz; this.quizSelected.emit(quiz); + } closeEdit() { + this.selectedQuiz = null; this.isExpanded3 = false; } } diff --git a/src/app/modules/auth/pages/auth-page/auth-page.component.ts b/src/app/modules/auth/pages/auth-page/auth-page.component.ts index 3c2ae55..7fa04a8 100644 --- a/src/app/modules/auth/pages/auth-page/auth-page.component.ts +++ b/src/app/modules/auth/pages/auth-page/auth-page.component.ts @@ -12,11 +12,11 @@ export class AuthPageComponent implements OnInit { constructor(private auth: AuthService, private router: Router) {} ngOnInit() { - this.handleRedirectCallback(); // Maneja la redirección después del inicio de sesión + this.handleRedirectCallback(); } login() { - this.auth.loginWithRedirect(); // Cambiado a redirección + this.auth.loginWithRedirect(); } private handleRedirectCallback() { diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index 3ee4e86..6652c75 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -1,10 +1,10 @@
-
+
volver al listado
-

{{ selectNameForm.value.name }}

+

{{ selectNameForm.value.name }}

@@ -14,56 +14,68 @@

{{ selectNameForm.value.name }}

-
+
- - +
-
+
{{ question.get('text').value }}
- -
- -
-
+ +
+ + + Verdadero + + + + Falso + +
+ +
+
+
- Verdadero + - Falso + {{ option.get('text').value }}
-
-
-
- - - - - - -
-
-
-
+
+ + +
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss index e368a68..0915261 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss @@ -3,26 +3,32 @@ flex-direction: column; justify-content: center; background-color: #1e1e1e; - height: 100vh; + height: 95vh; padding: 20px; + border-radius: 15px; + margin-block: 2.5vh; } + a { color: white; - flex: 0 0 33.33%; - + flex: 0 0 33.33%; } + a:hover { cursor: pointer; text-decoration: none; color: magenta; } + h1 { color: magenta; - flex: 0 0 33.33%; + flex: 0 0 33.33%; text-align: center; + top: 0%; } + .empty-space { - flex: 0 0 33.33%; // El espacio vacío, puede tener una clase o simplemente estar vacío + flex: 0 0 33.33%; } .tittle { @@ -44,6 +50,8 @@ h1 { padding: 20px; display: flex; flex-direction: column; + border: 2px solid rgba(241, 121, 197, 1); + box-shadow: 0px 0px 12.8px rgba(241, 121, 197, 1); } .question { @@ -91,6 +99,7 @@ input[type='text'], .quiz-name-input:focus { border-bottom-color: darkviolet; } + button { padding: 8px 12px; background-color: #444; @@ -99,15 +108,68 @@ button { border-radius: 5px; cursor: pointer; transition: background-color 0.3s; - background-color:slateblue; + background-color: slateblue; } button:hover { background-color: darkviolet; } -.buttons{ + +.buttons { display: flex; align-items: center; justify-content: space-between; padding: 20%; } + +/* Estilos para la paginación */ +.pagination-buttons { + display: flex; + justify-content: space-between; + margin-top: 20px; +} + +.pagination-buttons button { + padding: 10px 20px; + background-color: #444; + color: white; + border: none; + border-radius: 5px; + cursor: pointer; + transition: background-color 0.3s; +} + +.pagination-buttons button:hover { + background-color: darkviolet; +} + +.pagination-buttons button:disabled { + background-color: #888; + cursor: not-allowed; +} + +.buttons { + display: flex; + align-items: center; + justify-content: space-between; + padding: 20px 0; /* Ajusta el padding según sea necesario */ +} + +.buttons button { + padding: 10px 15px; + background-color: #444; + color: white; + border: none; + border-radius: 5px; + cursor: pointer; + transition: background-color 0.3s; +} + +.buttons button:hover { + background-color: darkviolet; +} + +.buttons button:disabled { + background-color: #888; + cursor: not-allowed; +} diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts index 56a4238..0dfb0eb 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts @@ -1,6 +1,20 @@ -import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; +import { + Component, + Input, + Output, + EventEmitter, + OnInit, + OnChanges, + SimpleChanges, +} from '@angular/core'; import { FormBuilder, FormGroup, FormArray } from '@angular/forms'; -import { trigger, style, transition, animate, state } from '@angular/animations'; +import { + trigger, + style, + transition, + animate, + state, +} from '@angular/animations'; import { QuizService } from './services/quiz.service'; @Component({ @@ -9,70 +23,106 @@ import { QuizService } from './services/quiz.service'; styleUrls: ['./edit-pages.component.scss'], animations: [ trigger('enterState', [ - state('void', style({ - transform: 'translateX(-50%)', - })), + state('void', style({ transform: 'translateX(-50%)' })), transition(':enter', [ - animate(300, style({ - transform: 'translateX(0)' - })) - ]) - ]) - ] + animate(300, style({ transform: 'translateX(0)' })), + ]), + ]), + ], }) -export class EditPagesComponent implements OnInit { - @Input() quizId: string; // Cambia esto para recibir solo el ID del quiz +export class EditPagesComponent implements OnInit, OnChanges { + @Input() quizId: string; @Output() close = new EventEmitter(); isEditing: boolean = false; selectNameForm: FormGroup; + currentPage: number = 0; + questionsPerPage: number = 3; - constructor(private formBuilder: FormBuilder, private quizService: QuizService) { + constructor( + private formBuilder: FormBuilder, + private quizService: QuizService + ) { this.selectNameForm = this.formBuilder.group({ name: [''], - questions: this.formBuilder.array([]) + questions: this.formBuilder.array([]), }); } ngOnInit() { - // Obtener el cuestionario y sus preguntas al iniciar + if (this.quizId) { + this.loadQuiz(); + } + } + + ngOnChanges(changes: SimpleChanges) { + if (changes['quizId'] && changes['quizId'].currentValue) { + this.loadQuiz(); + } + } + + private loadQuiz() { if (!this.quizId) { console.error('Quiz ID no proporcionado'); - return; // Salir si no hay ID + return; } - - this.quizService.getQuizWithQuestions(this.quizId).subscribe(quizData => { - this.selectNameForm.patchValue({ name: quizData.name }); - this.populateQuestions(quizData.questions); - console.log(quizData) - }, error => { - console.error('Error al obtener el cuestionario:', error); - }); + this.quizService.getQuizWithQuestions(this.quizId).subscribe( + quizData => { + console.log('Respuesta de la API:', quizData); // Verificar respuesta + this.selectNameForm.patchValue({ name: quizData.name }); + this.populateQuestions(quizData.questions); + }, + error => { + console.error('Error al obtener el cuestionario:', error); + } + ); } private populateQuestions(questions: any[]) { - const questionForms = questions.map(question => this.formBuilder.group({ - id: [question.id], - text: [question.text], - type: [question.type], - correct_option: [question.correct_option], - options: this.formBuilder.array(question.options.map(option => this.formBuilder.group({ - id: [option.id], - text: [option.text], - selected: [option.selected || false] - }))) - })); + console.log('Preguntas recibidas:', questions); // Verificar preguntas + + const questionForms = questions.map(question => + this.formBuilder.group({ + id: [question.id], + text: [question.question], + type: [question.type], + correct_option: [question.correct_option], + options: this.formBuilder.array( + question.options.map(option => + this.formBuilder.group({ + id: [null], + text: [option], + selected: [false], + }) + ) + ), + }) + ); const questionsArray = this.selectNameForm.get('questions') as FormArray; - questionsArray.clear(); + questionsArray.clear(); questionForms.forEach(form => questionsArray.push(form)); + + console.log('Preguntas pobladas:', this.questions.value); // Verificar preguntas } get questions(): FormArray { return this.selectNameForm.get('questions') as FormArray; } + get paginatedQuestions() { + const startIndex = this.currentPage * this.questionsPerPage; + return this.questions.controls.slice( + startIndex, + startIndex + this.questionsPerPage + ); + } + + get totalPages() { + return Math.ceil(this.questions.length / this.questionsPerPage); + } + createQuiz() { const updatedQuiz = { id: this.quizId, @@ -80,17 +130,46 @@ export class EditPagesComponent implements OnInit { questions: this.questions.value, }; - this.quizService.updateQuiz(this.quizId, updatedQuiz).subscribe(response => { - console.log('Cambios guardados para el quiz:', response); - this.close.emit(); - }, error => { - console.error('Error al guardar cambios:', error); - }); + this.quizService.updateQuiz(this.quizId, updatedQuiz).subscribe( + response => { + console.log('Cambios guardados para el quiz:', response); + this.close.emit(); + }, + error => { + console.error('Error al guardar cambios:', error); + } + ); + } + + nextPage() { + if (this.currentPage < this.totalPages - 1) { + this.currentPage++; + } + } + + prevPage() { + if (this.currentPage > 0) { + this.currentPage--; + } } - editQuestion(index: number) { - - const question = this.questions.at(index); - - console.log('Editando pregunta:', question.value); + + // Método para seleccionar la opción correcta + selectCorrectOption(questionIndex: number, optionId: string) { + const question = this.questions.at(questionIndex); + const options = question.get('options') as FormArray; + + // Limpiar la selección previa + options.controls.forEach(option => { + option.get('selected').setValue(false); + }); + + // Marcar la opción seleccionada + const selectedOption = options.controls.find( + option => option.get('id').value === optionId + ); + if (selectedOption) { + selectedOption.get('selected').setValue(true); + question.get('correct_option').setValue(optionId); + } } } diff --git a/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts b/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts index f84889c..e85fe12 100644 --- a/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts +++ b/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts @@ -2,9 +2,10 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; import { environment } from '@environments/environment'; +import { tap, catchError } from 'rxjs/operators'; @Injectable({ - providedIn: 'root' + providedIn: 'root', }) export class QuizService { private apiUrl = `${environment.url}/quiz`; // Cambia esto por tu URL real @@ -13,7 +14,13 @@ export class QuizService { // Método para obtener un cuestionario con sus preguntas getQuizWithQuestions(id: string): Observable { - return this.http.get(`${this.apiUrl}/${id}`); + return this.http.get(`${this.apiUrl}/${id}`).pipe( + tap(response => console.log('Respuesta de la API:', response)), + catchError(error => { + console.error('Error al obtener el cuestionario:', error); + return error(error); + }) + ); } // Método para actualizar un cuestionario diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index a034dfe..2382dea 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -14,7 +14,7 @@
- +
diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index 7a0cb7f..8312c63 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -39,8 +39,10 @@ Configuración
From 78fedc0957b16df9da6e6e866668680d8e92973d Mon Sep 17 00:00:00 2001 From: Ignacio Date: Thu, 31 Oct 2024 12:27:54 -0300 Subject: [PATCH 142/203] solucionando ando --- .../pages/new-pages/new-pages.component.html | 5 +- .../pages/new-pages/new-pages.component.scss | 6 +- .../pages/new-pages/new-pages.component.ts | 60 +++++++++---------- 3 files changed, 34 insertions(+), 37 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index dcc0021..fd0e9cb 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -123,9 +123,8 @@

Define la pregunta {{ questions.length + 1 }}/10

+ + (click)="answerChoice(i)" />
+ element!=i) + }else { + this.correct_option.push(i); + } + console.log(this.correct_option); + } + - onQuestionTypeChange(selectedType: string, form: any) { - this.selections = this.selections.map(() => false); - this.array = - []; /* <--- este array se crea porque no permite hacer push a selection directamente */ - this.selection = - []; /* <--- 'DEBERIA' limpiar el array, pero en modo 'CASILLA' no se limpia */ + + onQuestionTypeChange(selectedType: string, form: any) { + this.correct_option = [] + console.log(this.correct_option); if (selectedType === 'Verdadero o falso') { this.isTrueFalseQuestion = true; this.options = ['Verdadero', 'Falso']; @@ -174,7 +174,6 @@ export class NewPagesComponent { this.questionCategory.name = this.selectNameForm.value.name; this.questionCategory.description = this.selectNameForm.value.description; - console.log(this.questionCategory.description); } else { alert('complete los datos requeridos'); this.showButton = false; @@ -212,7 +211,7 @@ export class NewPagesComponent { async createQuestion(form: any) { try { const formSection = form.value; -console.log(formSection) + switch (formSection.questionType) { case 'Selección mutiple': formSection.questionType = 'multiple_choice'; @@ -225,10 +224,8 @@ console.log(formSection) break; } - if (!form.value.solution) { - form.value.solution = this.selection; - } - if (formSection.solution.length != 0 && formSection.questionText) { + + if ( formSection.questionText && this.correct_option.length != 0) { let question = { question: formSection.questionText, seniority: 'junior', @@ -241,11 +238,12 @@ console.log(formSection) formSection?.option4, formSection?.option5, ].filter(option => option !== undefined && option !== null), - correct_option: formSection.solution, + correct_option: this.correct_option, explanation: 'string', link: 'string', is_active: true, - quiz_id: this.quizID, + /* quiz_id: '168b2a93-7358-48cb-951a-793281c35983', */ + quiz_id: this.quizID, }; const response = await fetch(`${environment.url}/question`, { @@ -269,14 +267,14 @@ console.log(formSection) this.options = []; } else { alert('complete los campos requeridos'); - console.log(formSection); + console.log(this.correct_option); } - if (this.questions.length == 10) { + if (this.questions.length == 10000) { alert('10 preguntas cargadas con exito'); window.location.reload(); } - console.log(formSection); + } catch (error) { alert(error); console.error(error); From 21431b35f8c95751f623ba259e880df1768a7c4b Mon Sep 17 00:00:00 2001 From: Ignacio Date: Fri, 1 Nov 2024 11:45:45 -0300 Subject: [PATCH 143/203] solucion bug placeholder --- src/app/modules/new/pages/new-pages/new-pages.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 0a18f7e..b6e45fa 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -97,6 +97,10 @@ export class NewPagesComponent { 'Opción 2.', ]; /* haciendo distinto el valor funciona */ /* Pero al agregar un campo el problema vuelve a surgir */ + } else { + this.showPlus = false; + this.showPlus2 = false; + this.showSubmits = false; } } @@ -264,6 +268,8 @@ export class NewPagesComponent { this.questions.push(formSection); form.reset(); + this.selectedOption = '' + this.isFocused = false this.options = []; } else { alert('complete los campos requeridos'); From 24ec690c7fcdbfef7556ed7516c7856d4840b62b Mon Sep 17 00:00:00 2001 From: Ignacio Date: Fri, 1 Nov 2024 19:39:09 -0300 Subject: [PATCH 144/203] salacrack --- .../pages/new-pages/new-pages.component.html | 28 +++++-- .../pages/new-pages/new-pages.component.ts | 83 +++++++++++-------- 2 files changed, 68 insertions(+), 43 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index fd0e9cb..d5ec0ce 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -115,16 +115,26 @@

Define la pregunta {{ questions.length + 1 }}/10

-
+
-
+
+ [(ngModel)]="selectedRadio" + [value]="option" + name="radioGroup" + (click)="answerChoice(i)" + /> +
Define la pregunta {{ questions.length + 1 }}/10 [(ngModel)]="options[i]" name="option{{ i }}" [readonly]="isTrueFalseQuestion" - required /> + required + />
+ diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index b6e45fa..1ac6fb5 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { environment } from '@environments/environment'; +import { ChangeDetectorRef } from '@angular/core'; @Component({ selector: 'app-new-pages', @@ -8,7 +9,7 @@ import { environment } from '@environments/environment'; styleUrls: ['./new-pages.component.scss'], }) export class NewPagesComponent { - constructor(private formsBuilder: FormBuilder) {} + constructor(private formsBuilder: FormBuilder,private cdr: ChangeDetectorRef) {} public selectNameForm = this.formsBuilder.group({ name: ['', Validators.required], description: ['', Validators.required], @@ -51,11 +52,13 @@ export class NewPagesComponent { toggle: boolean = true; isFocused: boolean = false; correct_option: number[] = [] + selectedValues: boolean[] = []; trackByFn(index: number): any { return index; } + answerChoice(i: number, form: any) { /* hacer condicional si existe o no existe blabla */ if(this.correct_option.includes(i)){ @@ -66,43 +69,53 @@ export class NewPagesComponent { } console.log(this.correct_option); } - - + showInput: boolean = true + selectedRadio: string | null = null; + changeInputType() { + this.selectedValues = Array(this.options.length).fill(false); + this.selectedRadio = null; // Reinicia la selección de radio + this.showInput = false; + setTimeout(() => { + this.showInput = true; + this.cdr.detectChanges(); + }, 50); + } + onQuestionTypeChange(selectedType: string, form: any) { - this.correct_option = [] - console.log(this.correct_option); - if (selectedType === 'Verdadero o falso') { - this.isTrueFalseQuestion = true; - this.options = ['Verdadero', 'Falso']; - this.showPlus = false; - this.showPlus2 = false; - this.showSubmits = true; - this.inputType = 'radio'; - } else if (selectedType === 'Selección mutiple') { - this.isTrueFalseQuestion = false; - this.options = ['Opción 1', 'Opción 2', 'Opción 3']; - this.showPlus = true; - this.showPlus2 = false; - this.showSubmits = true; - this.inputType = 'checkbox'; - } else if (selectedType == 'Casilla') { - this.isTrueFalseQuestion = false; - this.showPlus = false; - this.showPlus2 = true; - this.showSubmits = true; - this.inputType = 'radio'; - this.options = [ - 'Opción 1.', - 'Opción 2.', - ]; /* haciendo distinto el valor funciona */ - /* Pero al agregar un campo el problema vuelve a surgir */ - } else { - this.showPlus = false; - this.showPlus2 = false; - this.showSubmits = false; + this.correct_option = []; + this.selectedValues = []; + + if (selectedType === 'Verdadero o falso') { + this.options = ['Verdadero', 'Falso']; + this.inputType = 'radio'; + this.isTrueFalseQuestion = true; + this.showPlus = false; + this.showPlus2 = false; + + } else if (selectedType === 'Selección mutiple') { + this.options = ['Opción 1', 'Opción 2', 'Opción 3']; + this.inputType = 'checkbox'; + this.isTrueFalseQuestion = false; + this.showPlus = true; + this.showPlus2 = false; + + } else if (selectedType === 'Casilla') { + this.options = ['Opción 1', 'Opción 2']; + this.inputType = 'radio'; + this.isTrueFalseQuestion = false; + this.showPlus = false; + this.showPlus2 = true; + } else { + this.showPlus = false; + this.showPlus2 = false; + } + + this.changeInputType(); + this.cdr.detectChanges(); } - } + + async recibirDatos(datos: any) { if ( From 53f9d8b5bd6046339a0278bda218c7111b009617 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Fri, 1 Nov 2024 19:56:40 -0300 Subject: [PATCH 145/203] submit --- .../pages/new-pages/new-pages.component.ts | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 1ac6fb5..7c6e0ae 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -35,7 +35,6 @@ export class NewPagesComponent { questions: any = []; options: string[] = []; selection: number[] = []; - selectedOption: string = ''; inputType: string = ''; showButton: boolean = false; @@ -44,7 +43,6 @@ export class NewPagesComponent { isTrueFalseQuestion: boolean = false; showPlus: boolean = false; - showPlus2: boolean = false; showSubmits: boolean = false; quizID: number | string = ''; quizData: any = {}; @@ -85,30 +83,26 @@ export class NewPagesComponent { onQuestionTypeChange(selectedType: string, form: any) { this.correct_option = []; this.selectedValues = []; - + this.showSubmits = true; if (selectedType === 'Verdadero o falso') { this.options = ['Verdadero', 'Falso']; this.inputType = 'radio'; this.isTrueFalseQuestion = true; this.showPlus = false; - this.showPlus2 = false; - } else if (selectedType === 'Selección mutiple') { this.options = ['Opción 1', 'Opción 2', 'Opción 3']; this.inputType = 'checkbox'; this.isTrueFalseQuestion = false; this.showPlus = true; - this.showPlus2 = false; } else if (selectedType === 'Casilla') { this.options = ['Opción 1', 'Opción 2']; this.inputType = 'radio'; this.isTrueFalseQuestion = false; - this.showPlus = false; - this.showPlus2 = true; + this.showPlus = true; } else { this.showPlus = false; - this.showPlus2 = false; + } this.changeInputType(); @@ -164,7 +158,7 @@ export class NewPagesComponent { cell_id: this.quizData.cell, seniority: this.quizData.seniority, challenge_type: 'immediate', - created_by_id: '224742e8-731b-40bf-b05f-a7547270746c', + created_by_id: this.quizData, is_active: true, }; @@ -185,6 +179,8 @@ export class NewPagesComponent { } const data = await response.json(); this.quizID = data.id; + console.log(data.id) + console.log(this.quizID) this.showForm = true; this.toggle = false; this.showButton = false; @@ -312,16 +308,7 @@ export class NewPagesComponent { } else { this.options.push(`Opción ${this.options.length + 1}`); this.showPlus = false; - this.showPlus2 = false; - } - } - addOption2() { - if (this.options.length < 5) { - this.options.push(`Opción ${this.options.length + 1 + '.'}`); - } else { - this.options.push(`Opción ${this.options.length + 1 + '.'}`); - this.showPlus = false; - this.showPlus2 = false; } } + } From 06d488823f02de74a1c422460c1dee90622dbb94 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Fri, 1 Nov 2024 19:02:09 -0500 Subject: [PATCH 146/203] changes edit y view --- .../pages/all-page/all-page.component.scss | 96 ++++++++----------- .../edit-pages/edit-pages.component.html | 36 ++++--- .../edit-pages/edit-pages.component.scss | 35 ++++++- .../pages/edit-pages/edit-pages.component.ts | 18 ++-- .../pages/edit-pages/services/quiz.service.ts | 11 ++- .../welcome-page/welcome-page.component.ts | 4 +- 6 files changed, 113 insertions(+), 87 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index 327db65..a9993c5 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -1,24 +1,23 @@ .quiz-dashboard { - padding: 20px; + padding: 20px; color: #fff; height: 95vh; - width: 150vh; + width: 150vh; border-radius: 12px; padding: 24px 8px 8px 8px; - gap: 47px; + gap: 47px; opacity: 0px; - overflow: auto; - margin-block: 2.5vh; + overflow: auto; + margin-block: 2.5vh; background-color: rgba(53, 52, 52, 0.5); - - border: 2px solid rgba(241, 121, 197, 1); + border: 2px solid rgba(241, 121, 197, 1); // background-image: url('../../../../../assets/layout/images/logo.svg'); // background-repeat: no-repeat; // background-position: center; - // background-size: 180px; + // background-size: 180px; } -.table-sup{ +.table-sup { font-family: Poppins; font-size: 16px; font-weight: 400; @@ -26,24 +25,16 @@ letter-spacing: 0.20000000298023224px; text-align: center; background: rgba(27, 27, 27, 0.5); - - - } -.table-int{ - margin: 0 auto; - flex: auto; - background: rgba(27, 27, 27, 0.5); - - - +.table-int { + margin: 0 auto; + flex: auto; + background: rgba(27, 27, 27, 0.5); } h2 { color: #fff; font-size: 1.5rem; margin: 0; - - } .filters { @@ -55,7 +46,6 @@ h2 { .filters select { background-color: rgba(53, 52, 52, 0.5); - border: 1px solid #444; padding: 10px; color: #fff; @@ -63,11 +53,10 @@ h2 { width: 30%; } -.search-container { +.search-container { top: 0; background-color: rgba(53, 52, 52, 0.5); - padding: 10px 20px; display: flex; justify-content: space-between; @@ -78,7 +67,6 @@ h2 { .search-container input { background-color: rgba(53, 52, 52, 0.5); - border: 1px solid #444; padding: 8px; color: #fff; @@ -121,17 +109,15 @@ h2 { border-collapse: collapse; margin-top: 10px; background: rgba(27, 27, 27, 0.5); - } .activo { - color:rgba(151, 71, 255, 1); - + color: rgba(151, 71, 255, 1); } .inactivo { - color: red; - font-weight: normal; + color: red; + font-weight: normal; } .input-wrapper { @@ -142,80 +128,76 @@ h2 { .input-wrapper i { position: absolute; - left: 10px; + left: 10px; top: 50%; transform: translateY(-50%); - color: #aaa; + color: #aaa; } .custom-popup { background-color: rgba(53, 52, 52, 0.5) !important; - - color: #fff !important; - border-radius: 15px !important ; + color: #fff !important; + border-radius: 15px !important ; } .custom-title { - font-size: 20px !important; + font-size: 20px !important; font-weight: bold !important; - color: #fff !important; + color: #fff !important; } .custom-content { - font-size: 14px !important; - color: #cccccc !important; + font-size: 14px !important; + color: #cccccc !important; } .custom-confirm-btn { - background-color: #6c63ff !important; - border-radius: 10px !important; - color: #fff !important; - padding: 10px 20px !important; + background-color: #6c63ff !important; + border-radius: 10px !important; + color: #fff !important; + padding: 10px 20px !important; } .custom-cancel-btn { - background-color: #4e4e4e !important; + background-color: #4e4e4e !important; border-radius: 10px !important; color: #fff !important; padding: 10px 20px !important; } .input-wrapper input { - padding-left: 35px; - width: 100%; + padding-left: 35px; + width: 100%; } -.quiz-table th, .quiz-table td { +.quiz-table th, +.quiz-table td { padding: 10px; text-align: left; border-bottom: 1px solid #444; background-color: rgba(53, 52, 52, 0.5); text-align: center; // Centrar el texto horizontalmente - padding: 12px; // Espacio alrededor del texto - font-family: "Poppins"; - + padding: 12px; // Espacio alrededor del texto + font-family: 'Poppins'; } - - .actions button { display: flexbox; background: none; border: none; cursor: pointer; color: white; - - - } .status { font-weight: bold; + transition: .5s ease-in-out; +} +.status:hover{ + cursor: pointer; } - .status.Activo { color: rgba(151, 71, 255, 1); - ; } .status.Inactivo { diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index 6652c75..d2891f3 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -19,7 +19,7 @@

{{ selectNameForm.value.name }}

[formGroupName]="i" class="question-container">
- +
@@ -27,40 +27,48 @@

{{ selectNameForm.value.name }}

{{ question.get('text').value }}
- -
+ +
+
- Verdadero + +
+
- Falso +
+
-
+ +
+ *ngFor="let option of question.get('options').controls; let j = index" + [formGroupName]="j" class="option-item"> - {{ option.get('text').value }} + + + +
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss index 0915261..acd68c0 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss @@ -64,6 +64,7 @@ h1 { background-color: #282828; } + input[type='text'], .custom-option-input { padding: 10px; @@ -151,7 +152,7 @@ button:hover { .buttons { display: flex; align-items: center; - justify-content: space-between; + justify-content:space-around; padding: 20px 0; /* Ajusta el padding según sea necesario */ } @@ -163,13 +164,41 @@ button:hover { border-radius: 5px; cursor: pointer; transition: background-color 0.3s; + background-color: rgb(0, 56, 211); } .buttons button:hover { - background-color: darkviolet; + background-color: rgb(17, 75, 236); } .buttons button:disabled { background-color: #888; - cursor: not-allowed; + +} +.option-row { + // display: flex; + // flex-wrap: wrap; /* Permitir que las opciones se envuelvan */ + // justify-content: space-between; /* Espacio entre las opciones */ + margin-top: 15px; /* Espacio entre la pregunta y las opciones */ + display: inline; } + +.option-item { + display: inline-block; + align-items: center; /* Alinear el texto y el input verticalmente */ + width: 48%; /* Ocupa casi la mitad del contenedor */ + margin-bottom: 10px; /* Espacio inferior entre las opciones */ + border: 1px solid #444; /* Borde oscuro */ + border-radius: 15px; /* Borde redondeado */ + background-color: #282828; /* Color de fondo */ + padding: 10px; /* Espacio interno */ + color: #4f4f4f; /* Color de texto gris oscuro */ +} + +.option-label { + color: #4f4f4f; /* Color gris oscuro para las etiquetas */ +} + +input[type="radio"] { + margin-right: 5px; /* Espacio entre el input y el texto */ +} \ No newline at end of file diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts index 0dfb0eb..dfd50fe 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts @@ -69,7 +69,7 @@ export class EditPagesComponent implements OnInit, OnChanges { this.quizService.getQuizWithQuestions(this.quizId).subscribe( quizData => { - console.log('Respuesta de la API:', quizData); // Verificar respuesta + console.log('Respuesta de la API:', quizData); this.selectNameForm.patchValue({ name: quizData.name }); this.populateQuestions(quizData.questions); }, @@ -80,20 +80,20 @@ export class EditPagesComponent implements OnInit, OnChanges { } private populateQuestions(questions: any[]) { - console.log('Preguntas recibidas:', questions); // Verificar preguntas + console.log('Preguntas recibidas:', questions); const questionForms = questions.map(question => this.formBuilder.group({ id: [question.id], - text: [question.question], + text: [question.question], type: [question.type], - correct_option: [question.correct_option], + correct_option: [question.correct_option[0]], // Ajuste aquí options: this.formBuilder.array( - question.options.map(option => + question.options.map((optionText, index) => this.formBuilder.group({ - id: [null], - text: [option], - selected: [false], + id: [index.toString()], // Usar el índice como ID + text: [optionText], // Asignar el texto directamente + selected: [index === question.correct_option[0]], // Marcar la opción correcta }) ) ), @@ -104,7 +104,7 @@ export class EditPagesComponent implements OnInit, OnChanges { questionsArray.clear(); questionForms.forEach(form => questionsArray.push(form)); - console.log('Preguntas pobladas:', this.questions.value); // Verificar preguntas + console.log('Preguntas pobladas:', this.questions.value); } get questions(): FormArray { diff --git a/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts b/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts index e85fe12..80a6708 100644 --- a/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts +++ b/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Observable } from 'rxjs'; +import { Observable, throwError } from 'rxjs'; import { environment } from '@environments/environment'; import { tap, catchError } from 'rxjs/operators'; @@ -18,13 +18,18 @@ export class QuizService { tap(response => console.log('Respuesta de la API:', response)), catchError(error => { console.error('Error al obtener el cuestionario:', error); - return error(error); + return throwError(error); // Retorna un observable de error }) ); } // Método para actualizar un cuestionario updateQuiz(id: string, quizData: any): Observable { - return this.http.put(`${this.apiUrl}/${id}`, quizData); + return this.http.put(`${this.apiUrl}/${id}`, quizData).pipe( + catchError(error => { + console.error('Error al actualizar el cuestionario:', error); + return throwError(error); + }) + ); } } diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index 31d818e..9e012cf 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -86,7 +86,9 @@ export class WelcomePageComponent { } toggleExpand3() { - this.isExpanded3 = !this.isExpanded3; // Cambia el estado de expansión + this.isExpanded3 = !this.isExpanded3; + this.isExpanded2 = false; + this.isExpanded1 = false; } // Navegación existente From 2effea6719ce06a4d318052083b7f2055104d540 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 2 Nov 2024 11:06:19 -0300 Subject: [PATCH 147/203] bugs --- src/app/modules/new/pages/new-pages/new-pages.component.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 7c6e0ae..4963d8d 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -158,7 +158,7 @@ export class NewPagesComponent { cell_id: this.quizData.cell, seniority: this.quizData.seniority, challenge_type: 'immediate', - created_by_id: this.quizData, + created_by_id: '224742e8-731b-40bf-b05f-a7547270746c', is_active: true, }; @@ -179,8 +179,6 @@ export class NewPagesComponent { } const data = await response.json(); this.quizID = data.id; - console.log(data.id) - console.log(this.quizID) this.showForm = true; this.toggle = false; this.showButton = false; @@ -211,7 +209,7 @@ export class NewPagesComponent { body: JSON.stringify(update), }); response = await response.json(); - + this.showButton = false; this.showForm = true; this.questionCategory.name = this.selectNameForm.value.name; this.questionCategory.description = this.selectNameForm.value.description; From 31ad7fa92e7053fced2c073f302c90bdf980cf92 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 2 Nov 2024 11:45:27 -0300 Subject: [PATCH 148/203] solucion bug de inputs --- .../new/pages/new-pages/new-pages.component.html | 6 ++++-- .../new/pages/new-pages/new-pages.component.ts | 13 ++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index d5ec0ce..35151bb 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -14,6 +14,7 @@ : 'Nombre del Quiz' " formControlName="name" + (input)="isValidInput()" [ngClass]="{ notice: isFieldInvalid('name') }" />
@@ -44,7 +46,7 @@
-
+

diff --git a/src/app/shared/components/pop-message/pop-message.component.scss b/src/app/shared/components/pop-message/pop-message.component.scss new file mode 100644 index 0000000..9f7e15d --- /dev/null +++ b/src/app/shared/components/pop-message/pop-message.component.scss @@ -0,0 +1,11 @@ +.pop-message-container { + background-color: #212121; + border-radius: 1.5rem; + padding: .8rem 2rem .8rem 2rem; + box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.25); +} + +.close-btn { + border: none; + background-color: rgba(0, 0, 0, 0); +} \ No newline at end of file diff --git a/src/app/shared/components/pop-message/pop-message.component.spec.ts b/src/app/shared/components/pop-message/pop-message.component.spec.ts new file mode 100644 index 0000000..599c148 --- /dev/null +++ b/src/app/shared/components/pop-message/pop-message.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PopMessageComponent } from './pop-message.component'; + +describe('PopMessageComponent', () => { + let component: PopMessageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [PopMessageComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(PopMessageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/components/pop-message/pop-message.component.ts b/src/app/shared/components/pop-message/pop-message.component.ts new file mode 100644 index 0000000..379a25d --- /dev/null +++ b/src/app/shared/components/pop-message/pop-message.component.ts @@ -0,0 +1,15 @@ +import { Component, Input,Output, EventEmitter } from '@angular/core'; + +@Component({ + selector: 'app-pop-message', + templateUrl: './pop-message.component.html', + styleUrl: './pop-message.component.scss' +}) +export class PopMessageComponent { +@Input() message: string +@Output() closeEvent = new EventEmitter(); + +close() { + this.closeEvent.emit(); +} +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 1077c40..8971ebd 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,10 +1,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SideBarComponent } from './components/sideBar/side-bar/side-bar.component'; +import {PopMessageComponent} from './components/pop-message/pop-message.component' @NgModule({ - declarations: [SideBarComponent], + declarations: [SideBarComponent, PopMessageComponent], imports: [CommonModule], - exports: [SideBarComponent], + exports: [SideBarComponent, PopMessageComponent], }) export class SharedModule {} From b45e7018d1e6a5b75a42bb2a710f4307c2cf7453 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 5 Nov 2024 10:36:15 -0300 Subject: [PATCH 150/203] logo --- src/app/modules/home/pages/home-page/home-page.component.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/modules/home/pages/home-page/home-page.component.scss b/src/app/modules/home/pages/home-page/home-page.component.scss index fbb5c05..a242cad 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.scss +++ b/src/app/modules/home/pages/home-page/home-page.component.scss @@ -7,6 +7,10 @@ background-color: #121212; min-height: 100vh; display: flex; + background-image: url('../../../../../assets/layout/images/logo.svg'); + background-repeat: no-repeat; + background-position: center; + background-size: 414px 404px; /* Asegura que los elementos ocupen el alto completo */ } From 897881d2e7bd88531c06727bafd78d687e4af8ee Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 5 Nov 2024 12:21:33 -0300 Subject: [PATCH 151/203] bugs --- .../pages/new-pages/new-pages.component.html | 8 +++++-- .../pages/new-pages/new-pages.component.scss | 4 ++-- .../pages/new-pages/new-pages.component.ts | 7 +++--- .../pop-message/pop-message.component.html | 7 +++++- .../pop-message/pop-message.component.scss | 20 +++++++++++++++--- src/assets/demo/images/close/Vector.png | Bin 0 -> 223 bytes 6 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 src/assets/demo/images/close/Vector.png diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index bec141f..83c3f73 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,5 +1,7 @@
+ +
@@ -50,8 +52,7 @@
- - +
+ + +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 6ee9b12..dc2f92d 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -284,8 +284,8 @@ i { .pop-message{ position: relative; - top: 50vh; + top: 47.3vh; max-width: 80vh; +} -} diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 0c2f025..88c6def 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -38,9 +38,8 @@ export class NewPagesComponent { selectedOption: string = ''; inputType: string = ''; showButton: boolean = false; - pop: boolean = false + pop: boolean = true showForm: boolean = false; - isTrueFalseQuestion: boolean = false; showPlus: boolean = false; showSubmits: boolean = false; @@ -133,6 +132,8 @@ export class NewPagesComponent { ) { this.showButton = true; + } else { + this.showButton = false } /* modulo */ @@ -198,7 +199,7 @@ export class NewPagesComponent { this.pop= true setTimeout(()=>{ this.closeFn() - }, 20000) + }, 2000) this.questionCategory.name = this.selectNameForm.value.name; this.questionCategory.description = this.selectNameForm.value.description; diff --git a/src/app/shared/components/pop-message/pop-message.component.html b/src/app/shared/components/pop-message/pop-message.component.html index faf5404..762cf76 100644 --- a/src/app/shared/components/pop-message/pop-message.component.html +++ b/src/app/shared/components/pop-message/pop-message.component.html @@ -1 +1,6 @@ -

{{message}}

+
+

{{ message }}

+ +
diff --git a/src/app/shared/components/pop-message/pop-message.component.scss b/src/app/shared/components/pop-message/pop-message.component.scss index 9f7e15d..1c33aae 100644 --- a/src/app/shared/components/pop-message/pop-message.component.scss +++ b/src/app/shared/components/pop-message/pop-message.component.scss @@ -1,11 +1,25 @@ .pop-message-container { background-color: #212121; border-radius: 1.5rem; - padding: .8rem 2rem .8rem 2rem; - box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.25); + padding: .8rem; + box-shadow: 2px 2px 3px 1px rgba(0, 0, 0, 0.39); + display: flex; + justify-content: space-between; + align-items: center; + width: 57vh; } .close-btn { border: none; background-color: rgba(0, 0, 0, 0); -} \ No newline at end of file +} +p { + font-family: Poppins; + font-weight: 500; + font-size: 1.2rem; + margin: 0 + } + + img { + display: block + } \ No newline at end of file diff --git a/src/assets/demo/images/close/Vector.png b/src/assets/demo/images/close/Vector.png new file mode 100644 index 0000000000000000000000000000000000000000..c4e10752f27d148ac2e5bc22768d9c5d514c22a7 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^{2``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBeu<}xV@L(#(n$w-4=8ZB`l`R?kUi*|u(|Jw zU`DWQz@zE+Jsvqev{el{Q-|+AmRSUD@%0sE7Gge4=C)IS9-^>Kl#Hv=GPy9 P_A_|8`njxgN@xNA{&q<+ literal 0 HcmV?d00001 From 2f0c78bc74c10d680263378d35fca6627cdf035c Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 5 Nov 2024 12:22:38 -0300 Subject: [PATCH 152/203] bugs --- src/app/modules/new/pages/new-pages/new-pages.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 88c6def..769db02 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -38,7 +38,7 @@ export class NewPagesComponent { selectedOption: string = ''; inputType: string = ''; showButton: boolean = false; - pop: boolean = true + pop: boolean = false showForm: boolean = false; isTrueFalseQuestion: boolean = false; showPlus: boolean = false; From eea171184688ce9dec2765a2424e433fc04f46d7 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 5 Nov 2024 18:39:21 -0300 Subject: [PATCH 153/203] bugs --- src/app/modules/new/pages/new-pages/new-pages.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 769db02..bb403f5 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -62,8 +62,7 @@ export class NewPagesComponent { } - answerChoice(i: number, form: any) { - /* hacer condicional si existe o no existe blabla */ + answerChoice(i: number) { if(this.correct_option.includes(i)){ this.correct_option = this.correct_option.filter((element)=> element!=i) @@ -320,6 +319,8 @@ export class NewPagesComponent { this.showForm = false; this.createOrEdit = false; this.toggle = true; + this.isValidInput() + this.showButton = true } addOption() { From 0fd5cc5b940aae07c8492e70eb4fb198e5534978 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 5 Nov 2024 18:51:13 -0300 Subject: [PATCH 154/203] conflictos --- src/app/shared/shared.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 8971ebd..2678a5c 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SideBarComponent } from './components/sideBar/side-bar/side-bar.component'; -import {PopMessageComponent} from './components/pop-message/pop-message.component' +import { PopMessageComponent } from './components/pop-message/pop-message.component'; @NgModule({ declarations: [SideBarComponent, PopMessageComponent], From 159402c04dceaddfc593ce5751b2cd11638958d3 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 5 Nov 2024 19:29:44 -0300 Subject: [PATCH 155/203] correccion --- .../pages/new-pages/new-pages.component.html | 6 +- .../pages/new-pages/new-pages.component.scss | 4 +- .../pages/new-pages/new-pages.component.ts | 162 +++++++++--------- 3 files changed, 85 insertions(+), 87 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 83c3f73..fead134 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -192,7 +192,7 @@

Define la pregunta {{ questions.length + 1 }}/10

- - -
+ + + diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index dc2f92d..577ab13 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -284,8 +284,10 @@ i { .pop-message{ position: relative; - top: 47.3vh; + top: 22.3vh; + left: 0vh; max-width: 80vh; + } diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index bb403f5..d3bf499 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -9,7 +9,10 @@ import { ChangeDetectorRef } from '@angular/core'; styleUrls: ['./new-pages.component.scss'], }) export class NewPagesComponent { - constructor(private formsBuilder: FormBuilder,private cdr: ChangeDetectorRef) {} + constructor( + private formsBuilder: FormBuilder, + private cdr: ChangeDetectorRef + ) {} public selectNameForm = this.formsBuilder.group({ name: ['', Validators.required], description: ['', Validators.required], @@ -38,7 +41,7 @@ export class NewPagesComponent { selectedOption: string = ''; inputType: string = ''; showButton: boolean = false; - pop: boolean = false + pop: boolean = false; showForm: boolean = false; isTrueFalseQuestion: boolean = false; showPlus: boolean = false; @@ -48,91 +51,86 @@ export class NewPagesComponent { createOrEdit: boolean = true; toggle: boolean = true; isFocused: boolean = false; - correct_option: number[] = [] + correct_option: number[] = []; selectedValues: boolean[] = []; - inputsValues: boolean = false + inputsValues: boolean = false; trackByFn(index: number): any { return index; } - closeFn(){ - this.pop = false - console.log('close') + closeFn() { + this.pop = false; } - answerChoice(i: number) { - if(this.correct_option.includes(i)){ - this.correct_option = this.correct_option.filter((element)=> - element!=i) - }else { + if (this.correct_option.includes(i)) { + this.correct_option = this.correct_option.filter(element => element != i); + } else { this.correct_option.push(i); } - console.log(this.correct_option); - } - showInput: boolean = true - selectedRadio: string | null = null; - changeInputType() { - this.selectedValues = Array(this.options.length).fill(false); - this.selectedRadio = null; // Reinicia la selección de radio - this.showInput = false; - setTimeout(() => { - this.showInput = true; - this.cdr.detectChanges(); - }, 50); - } - - - onQuestionTypeChange(selectedType: string, form: any) { - this.correct_option = []; - this.selectedValues = []; - this.showSubmits = true; - if (selectedType === 'Verdadero o falso') { - this.options = ['Verdadero', 'Falso']; - this.inputType = 'radio'; - this.isTrueFalseQuestion = true; - this.showPlus = false; - } else if (selectedType === 'Selección mutiple') { - this.options = ['Opción 1', 'Opción 2', 'Opción 3']; - this.inputType = 'checkbox'; - this.isTrueFalseQuestion = false; - this.showPlus = true; - - } else if (selectedType === 'Casilla') { - this.options = ['Opción 1', 'Opción 2']; - this.inputType = 'radio'; - this.isTrueFalseQuestion = false; - this.showPlus = true; - } else { - this.showPlus = false; + console.log(this.correct_option); + } + showInput: boolean = true; + selectedRadio: string | null = null; + changeInputType() { + this.selectedValues = Array(this.options.length).fill(false); + this.selectedRadio = null; // Reinicia la selección de radio + this.showInput = false; + setTimeout(() => { + this.showInput = true; + this.cdr.detectChanges(); + }, 50); + } - } - - this.changeInputType(); - this.cdr.detectChanges(); + onQuestionTypeChange(selectedType: string, form: any) { + this.correct_option = []; + this.selectedValues = []; + this.showSubmits = true; + if (selectedType === 'Verdadero o falso') { + this.options = ['Verdadero', 'Falso']; + this.inputType = 'radio'; + this.isTrueFalseQuestion = true; + this.showPlus = false; + } else if (selectedType === 'Selección mutiple') { + this.options = ['Opción 1', 'Opción 2', 'Opción 3']; + this.inputType = 'checkbox'; + this.isTrueFalseQuestion = false; + this.showPlus = true; + } else if (selectedType === 'Casilla') { + this.options = ['Opción 1', 'Opción 2']; + this.inputType = 'radio'; + this.isTrueFalseQuestion = false; + this.showPlus = true; + } else { + this.showPlus = false; } - - isValidInput(){ - if(this.selectNameForm.value.name && this.selectNameForm.value.description && - this.selectNameForm.valid){ - this.inputsValues=true - } else { - this.inputsValues=false - } + + this.changeInputType(); + this.cdr.detectChanges(); + } + + isValidInput() { + if ( + this.selectNameForm.value.name && + this.selectNameForm.value.description && + this.selectNameForm.valid + ) { + this.inputsValues = true; + } else { + this.inputsValues = false; } + } async recibirDatos(datos: any) { if ( - datos.celula != 'Selecciona la célula' && datos.modulo != 'Selecciona el modulo' && datos.seniority != 'Seniority' ) { this.showButton = true; - } else { - this.showButton = false + this.showButton = false; } /* modulo */ @@ -187,18 +185,19 @@ export class NewPagesComponent { body: JSON.stringify(prueba), }); if (!response.ok) { - alert(response.status); - throw new Error(`Error: ${response.status}`); + alert(response); + throw new Error(`Error: ${response}`); } const data = await response.json(); this.quizID = data.id; this.showForm = true; this.toggle = false; this.showButton = false; - this.pop= true - setTimeout(()=>{ - this.closeFn() - }, 2000) + this.pop = true; + + setTimeout(() => { + this.closeFn(); + }, 2000); this.questionCategory.name = this.selectNameForm.value.name; this.questionCategory.description = this.selectNameForm.value.description; @@ -227,10 +226,10 @@ export class NewPagesComponent { }); response = await response.json(); this.showButton = false; - this.pop = true - setTimeout(()=>{ - this.pop = false - }, 2000) + this.pop = true; + setTimeout(() => { + this.pop = false; + }, 2000); this.showForm = true; this.questionCategory.name = this.selectNameForm.value.name; this.questionCategory.description = this.selectNameForm.value.description; @@ -256,8 +255,7 @@ export class NewPagesComponent { break; } - - if ( formSection.questionText && this.correct_option.length != 0) { + if (formSection.questionText && this.correct_option.length != 0) { let question = { question: formSection.questionText, seniority: 'junior', @@ -275,7 +273,7 @@ export class NewPagesComponent { link: 'string', is_active: true, /* quiz_id: '168b2a93-7358-48cb-951a-793281c35983', */ - quiz_id: this.quizID, + quiz_id: this.quizID, }; const response = await fetch(`${environment.url}/question`, { @@ -296,8 +294,8 @@ export class NewPagesComponent { this.questions.push(formSection); form.reset(); - this.selectedOption = '' - this.isFocused = false + this.selectedOption = ''; + this.isFocused = false; this.options = []; } else { alert('complete los campos requeridos'); @@ -308,7 +306,6 @@ export class NewPagesComponent { alert('10 preguntas cargadas con exito'); window.location.reload(); } - } catch (error) { alert(error); console.error(error); @@ -319,8 +316,8 @@ export class NewPagesComponent { this.showForm = false; this.createOrEdit = false; this.toggle = true; - this.isValidInput() - this.showButton = true + this.isValidInput(); + this.showButton = true; } addOption() { @@ -331,5 +328,4 @@ export class NewPagesComponent { this.showPlus = false; } } - } From 8bcba2dadc60e5a3b0f16740d6f8f0f5c43c16c0 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Tue, 5 Nov 2024 19:41:34 -0300 Subject: [PATCH 156/203] transparencia --- src/app/modules/all/pages/all-page/all-page.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index a9993c5..c108a31 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -9,7 +9,7 @@ opacity: 0px; overflow: auto; margin-block: 2.5vh; - background-color: rgba(53, 52, 52, 0.5); + background-color: rgb(53, 52, 52); border: 2px solid rgba(241, 121, 197, 1); // background-image: url('../../../../../assets/layout/images/logo.svg'); From 616e33bc3c1bd8332cf8b49a76561a41027aab49 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Wed, 6 Nov 2024 11:32:23 -0300 Subject: [PATCH 157/203] arreglos --- .../pages/view-quiz/view-quiz.component.scss | 25 +++----- .../pages/home-page/home-page.component.scss | 15 ++--- .../welcome-page/welcome-page.component.scss | 22 +++---- .../sideBar/side-bar/side-bar.component.html | 42 ++++++++++++- .../sideBar/side-bar/side-bar.component.scss | 63 ++++++++++++++++++- .../sideBar/side-bar/side-bar.component.ts | 19 ++++-- 6 files changed, 140 insertions(+), 46 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index bee1d2d..eac773e 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -4,27 +4,24 @@ align-items: center; justify-content: flex-start; padding: 2rem; - width: 90%; - max-width: 900px; - height: 90vh; + /* width: 90%; */ + max-width: 95vh; + /* height: 90vh; */ border-radius: 12px; box-shadow: 0px 0px 12.8px rgba(241, 121, 197, 1); background: rgba(56, 53, 53, 1); - border: 2px solid rgba(241, 121, 197, 1); + border: 2px solid rgba(241, 121, 197, 1); background-image: url('../../../../../assets/layout/images/logo.svg'); background-repeat: no-repeat; background-position: center; - background-size: 180px; + background-size: 180px; z-index: 1; font-family: Poppins; - margin: auto; - overflow-y: auto; - margin-top: 10px; - + margin: auto; + overflow-y: auto; } .contenedor { - margin-top: 20px; display: flex; flex-direction: column; align-items: center; @@ -32,7 +29,6 @@ } .content-1 { - display: flex; justify-content: space-between; width: 100%; @@ -63,7 +59,6 @@ justify-content: space-between; flex-wrap: wrap; width: 100%; - margin-top: 20px; } .question-container { @@ -74,11 +69,10 @@ .inline-block { display: inline-block; vertical-align: top; - margin-top: 20px; } - -.descripcion, .namequiz { +.descripcion, +.namequiz { display: flex; flex-direction: column; width: 384px; @@ -90,7 +84,6 @@ font-size: 14px; } - .option-row { display: flex; flex-wrap: wrap; diff --git a/src/app/modules/home/pages/home-page/home-page.component.scss b/src/app/modules/home/pages/home-page/home-page.component.scss index a242cad..1c985e4 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.scss +++ b/src/app/modules/home/pages/home-page/home-page.component.scss @@ -7,6 +7,7 @@ background-color: #121212; min-height: 100vh; display: flex; + align-items: center; background-image: url('../../../../../assets/layout/images/logo.svg'); background-repeat: no-repeat; background-position: center; @@ -15,25 +16,25 @@ } .sidebar-container { - // background: #212121; + background: #212121; box-shadow: 0px 4px 4px 0px #00000040; - height: 100vh; + height: 95vh; width: 250px; /* Ancho fijo para pantallas grandes */ border-radius: 0px 12px 12px 0px; z-index: 9999; transition: width 0.3s ease; /* Suaviza la transición */ } - +/* @media (max-width: 767px) { .sidebar-container { - width: auto; /* Ancho del sidebar en pantallas pequeñas */ - height: auto; /* Permite que la altura se ajuste al contenido */ + width: auto; + height: auto; } router-outlet { - margin-top: 20px; /* Agrega margen superior si el sidebar se oculta */ + margin-top: 20px; } -} +} */ diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index 91e0c9e..7dfb853 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -10,13 +10,10 @@ justify-content: center; gap: 3px; box-shadow: 0px 4px 4px 0px #718ee3, 0px 4px 4px 0px #00000040; - margin-top: 2.5vh; + z-index: 9999; - @media (max-width: 768px) { - width: 20vh; // Ajusta el ancho para pantallas pequeñas - height: auto; // Permite que la altura se ajuste según el contenido - } + } .active-column { @@ -60,10 +57,7 @@ background: linear-gradient(to right, #6a5fff80, #ff5ea680); border: none; - @media (max-width: 768px) { - width: 2.5rem; // Ajusta el tamaño del botón para pantallas pequeñas - height: 2.5rem; - } + } .circle { @@ -93,11 +87,6 @@ background-size: 414px 404px; - @media (max-width: 768px) { - flex-direction: column; // Cambia la dirección en pantallas pequeñas - align-items: center; // Centra los elementos - height: auto; // Permite que la altura se ajuste según el contenido - } } .order-item { @@ -108,3 +97,8 @@ .negro { background-color: gray; } + +.d-flex { + display: flex; + align-items: center; +} diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index 8312c63..ad80df2 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -1,9 +1,46 @@ - + +
+ logo +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
logo @@ -48,3 +85,4 @@
+ --> \ No newline at end of file diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss index d939990..523763f 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss @@ -1,4 +1,60 @@ -.toggle-sidebar { +/* agregado */ + +.sidebar-btns-container { + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + /* background-color: red; */ + height: 60%; +} + +.gestion-btns { + width: 167px; + height: 133px; + display: flex; + flex-direction: column; + justify-content: space-between; +} + +.sidebar-btns { + background-color: #5f5f5f; + width: 166px; + height: 31px; + border-radius: 10px; + padding: 0px 16px 0px 16px; + gap: 16px; + border: solid 1px #333232; + display: flex; + justify-content: flex-start; + align-items: center; +} + +.sidebar-font-btn { + font-family: 'Poppins', sans-serif; + font-weight: 400; + font-style: normal; + font-size: 10px; + display: flex; + justify-content: start; + align-items: flex-start; +} + +.sidebar-btns:hover, +.active-btn { + background-color: #1b1b1bb2; +} + +.side-img { + height: 8rem; +} + +.sidebar-btns i { + color: #5974c7; + font-size: 11.5px; +} + +/* .toggle-sidebar { position: fixed; top: 20px; left: 20px; @@ -16,7 +72,7 @@ } .sidebar { - width: 250px; // Ancho del sidebar + width: 250px; height: 95%; background-color: #212121; position: fixed; @@ -25,7 +81,7 @@ transition: left 0.5s ease; &.active { - left: 0; // Muestra el sidebar + left: 0; } } @@ -93,3 +149,4 @@ height: 7vh; } } + */ \ No newline at end of file diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts index a2cf919..9cde4bb 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts @@ -1,4 +1,15 @@ import { Component } from '@angular/core'; + +@Component({ + selector: 'app-side-bar', + templateUrl: './side-bar.component.html', + styleUrl: './side-bar.component.scss' +}) +export class SideBarComponent { + +} + +/* import { Component } from '@angular/core'; import { AuthService } from '@auth0/auth0-angular'; @Component({ @@ -8,10 +19,10 @@ import { AuthService } from '@auth0/auth0-angular'; }) export class SideBarComponent { isSidebarOpen = false; - private authService: AuthService; // Add this line + private authService: AuthService; constructor(authService: AuthService) { - this.authService = authService; // Initialize the property here + this.authService = authService; } toggleSidebar() { @@ -20,7 +31,7 @@ export class SideBarComponent { logout() { this.authService.logout().subscribe(() => { - window.location.href = ''; // Redirect to the login page + window.location.href = ''; }); } -} \ No newline at end of file +} */ \ No newline at end of file From 05540ad879728e2c8f8e4596cc50c02682b804f9 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Wed, 6 Nov 2024 12:43:59 -0300 Subject: [PATCH 158/203] sidebar --- .../pages/home-page/home-page.component.html | 4 +-- .../pages/home-page/home-page.component.scss | 7 +++-- .../sideBar/side-bar/side-bar.component.html | 9 ++++-- .../sideBar/side-bar/side-bar.component.scss | 28 ++++++++++++++----- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/app/modules/home/pages/home-page/home-page.component.html b/src/app/modules/home/pages/home-page/home-page.component.html index 1cdcf80..bb72a37 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.html +++ b/src/app/modules/home/pages/home-page/home-page.component.html @@ -1,6 +1,6 @@
-
+ -
+
diff --git a/src/app/modules/home/pages/home-page/home-page.component.scss b/src/app/modules/home/pages/home-page/home-page.component.scss index 1c985e4..c4f3f41 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.scss +++ b/src/app/modules/home/pages/home-page/home-page.component.scss @@ -19,10 +19,13 @@ background: #212121; box-shadow: 0px 4px 4px 0px #00000040; height: 95vh; - width: 250px; /* Ancho fijo para pantallas grandes */ + width: 35vh; /* Ancho fijo para pantallas grandes */ border-radius: 0px 12px 12px 0px; z-index: 9999; - + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-around; transition: width 0.3s ease; /* Suaviza la transición */ } /* diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index ad80df2..42fc33b 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -1,5 +1,6 @@ +
-
+
logo
@@ -32,9 +33,13 @@ Configuración +
- +
-
- +
+
+ +
diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index a9993c5..ee66598 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -191,9 +191,9 @@ h2 { .status { font-weight: bold; - transition: .5s ease-in-out; + transition: 0.5s ease-in-out; } -.status:hover{ +.status:hover { cursor: pointer; } .status.Activo { @@ -203,3 +203,26 @@ h2 { .status.Inactivo { color: #ff0000; } +.overlay { + position: fixed; + top: 50%; + left: 54%; + transform: translate(-50%,-50%); + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.5); /* Fondo semitransparente */ + display: flex; + justify-content: center; + align-items: center; + z-index: 1000; +} + +.popup { + // background-color: rgb(66, 66, 66); + // padding: 20px; + border-radius: 8px; + max-width: 80%; + + overflow-y: auto; + z-index: 1001; +} diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 16f21e9..83ae1a6 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -43,7 +43,17 @@ interface Quiz { transition('collapsed => expanded', [animate('300ms ease-out')]), transition('expanded => collapsed', [animate('300ms ease-in')]), ]), + trigger('fadeInOut', [ + transition(':enter', [ + style({ opacity: 0 }), + animate('300ms', style({ opacity: 1 })) + ]), + transition(':leave', [ + animate('300ms', style({ opacity: 0 })) + ]) + ]) ], + }) export class AllPageComponent implements OnInit { @Output() quizSelected = new EventEmitter(); @@ -52,8 +62,10 @@ export class AllPageComponent implements OnInit { module: string = ''; cell: string = ''; quizzes: Quiz[] = []; - selectedQuiz: any; + selectedQuiz: Quiz | null = null isExpanded3: boolean = false; + selectedQuizOnView: Quiz | null = null + showEdit: boolean = false; constructor(private router: Router) {} @@ -136,8 +148,13 @@ export class AllPageComponent implements OnInit { } viewQuiz(quiz: Quiz) { - this.selectedQuiz = quiz; - this.router.navigate(['home/view-quiz', quiz.id]); + this.selectedQuizOnView = quiz; // Esto hace que la ventana emergente se muestre + + console.log('Quiz seleccionado:', quiz); + } + + closeQuiz() { + this.selectedQuizOnView = null; // Esto cierra la ventana emergente } async deleteQuiz(quiz: any) { diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 3237425..4aea273 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -1,84 +1,108 @@ -
-
+
+
+
- -
- -
-
-
-

Nombre del quiz

- -
-
-

Descripcion

- -
+ +
+
+

Nombre del quiz

+ +
+
+

Descripcion

+
- -
- -
-

Módulo

-
-
{{ quizDetails?.cell?.module?.name }}
-
+
+ +
+ +
+

Módulo

+
+
{{ quizDetails?.cell?.module?.name }}
+
- -
-

Célula

-
-
{{ quizDetails?.cell?.name }}
-
+ +
+

Célula

+
+
{{ quizDetails?.cell?.name }}
+
- -
-

Seniority / Nivel

-
-
{{ quizDetails?.seniority }}
-
+ +
+

Seniority / Nivel

+
+
{{ quizDetails?.seniority }}
- -
-

Preguntas:

-
    -
  • -

    Pregunta: {{ question.question }}

    -

    Opciones:

    -
      -
    • -
      -
      - -
      +
      + + +
      +

      Preguntas:

      +
        +
      • +

        Pregunta: {{ question.question }}

        +

        Opciones:

        +
          +
        • +
          +
          + + type="checkbox" + class="checkbox-input" + [checked]="question.correct_option.includes(i)" + disabled + aria-label="Opción correcta" />
          -
          • -
        -
        • -
      -
      + +
+ + + + + +

+ Este quiz no tiene preguntas disponibles. +

+ + + +

Cargando detalles del quiz...

+ diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index bee1d2d..ce29507 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -22,13 +22,16 @@ margin-top: 10px; } - +.wrapper{ + width: 100%; +} .contenedor { - margin-top: 20px; + // margin-top: 20px; display: flex; flex-direction: column; align-items: center; width: 100%; + flex-wrap: wrap; } .content-1 { @@ -75,13 +78,14 @@ display: inline-block; vertical-align: top; margin-top: 20px; + width: 100%; } .descripcion, .namequiz { display: flex; flex-direction: column; - width: 384px; + width: 100%; height: 40px; border-radius: 8px; border: 1px solid #333232; diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts index d734794..2409e25 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.ts +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.ts @@ -1,8 +1,10 @@ -import { Component, OnInit, Output, EventEmitter} from '@angular/core'; +import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { environment } from '@environments/environment'; import { Location } from '@angular/common'; import { Router } from '@angular/router'; +import { QuizService } from '../../../edit/pages/edit-pages/services/quiz.service'; // Importa el servicio + interface User { first_name: string; } @@ -44,45 +46,42 @@ interface Question { styleUrls: ['./view-quiz.component.scss'], }) export class ViewQuizComponent implements OnInit { - quizId: string = ''; quizDetails: Quiz | null = null; @Output() close = new EventEmitter(); + @Input() quizId: string = ''; // Recibe el ID del quiz como Input - constructor(private route: ActivatedRoute, private location: Location, private router: Router ) {} + constructor( + private route: ActivatedRoute, + private location: Location, + private router: Router, + private quizService: QuizService // Inyectamos el servicio + ) {} ngOnInit(): void { - this.quizId = this.route.snapshot.paramMap.get('id') || ''; - this.quizId = this.quizId.replace(/['"]+/g, ''); - console.log('ID del quiz sin comillas:', this.quizId); - this.fetchQuizDetails(); + // Usar quizId desde el Input en vez de la ruta + console.log('Quiz ID recibido en view-quiz:', this.quizId); + if (this.quizId) { + this.fetchQuizDetails(); // Llamar al método para obtener los detalles del quiz + } } - async fetchQuizDetails() { - try { - console.log(`Realizando solicitud a la API con ID: ${this.quizId}`); - const response = await fetch(`${environment.url}/quiz/${this.quizId}`); - if (response.ok) { - const data: Quiz = await response.json(); + fetchQuizDetails() { + this.quizService.getQuizWithQuestions(this.quizId).subscribe( + (data: Quiz) => { this.quizDetails = data; - console.log('Detalles del quiz:', this.quizDetails); - } else { - console.error('Error al obtener detalles del quiz, respuesta no OK.'); + console.log('Detalles del quiz:', this.quizDetails); // Verifica los datos del quiz + }, + (error) => { + console.error('Error al obtener los detalles del quiz:', error); } - } catch (error) { - console.error('Error en la solicitud:', error); - } + ); } + editQuiz(): void { - - + // Lógica para editar el quiz si es necesario } - - goBack(): void { + goBack(): void { this.close.emit(); - - - - - } + } } diff --git a/src/app/modules/auth/pages/auth-page/auth-page.component.ts b/src/app/modules/auth/pages/auth-page/auth-page.component.ts index 7fa04a8..c746141 100644 --- a/src/app/modules/auth/pages/auth-page/auth-page.component.ts +++ b/src/app/modules/auth/pages/auth-page/auth-page.component.ts @@ -2,74 +2,130 @@ import { Component, OnInit } from '@angular/core'; import { AuthService } from '@auth0/auth0-angular'; import { Router } from '@angular/router'; import { environment } from '@environments/environment'; +import { HttpClient } from '@angular/common/http'; +import { catchError, firstValueFrom } from 'rxjs'; + +interface UserData { + email: string; + first_name?: string; + last_name?: string; + photo?: string; + phone_number?: string; + timezone?: string; + gender?: string; + password?: string; + birthdate?: Date; +} @Component({ selector: 'app-auth-page', templateUrl: './auth-page.component.html', - styleUrls: ['./auth-page.component.scss'] + styleUrls: ['./auth-page.component.scss'], }) export class AuthPageComponent implements OnInit { - constructor(private auth: AuthService, private router: Router) {} + constructor( + private auth: AuthService, + private router: Router, + private http: HttpClient + ) {} ngOnInit() { - this.handleRedirectCallback(); + this.handleAuthentication(); } login() { - this.auth.loginWithRedirect(); + this.auth.loginWithRedirect({ + appState: { returnTo: window.location.pathname }, + }); + } - private handleRedirectCallback() { - this.auth.user$.subscribe(usuario => { - if (usuario) { - console.log('Usuario:', usuario); - const userData = { - email: usuario.email, - first_name: usuario.given_name, - last_name: usuario.family_name, - photo: usuario.picture, - phone_number: '', - timezone: '', - gender: '', - password: 'defaultPassword', - }; + private async handleAuthentication() { + try { + const user = await firstValueFrom(this.auth.user$); - // Registro del usuario siempre, independientemente del rol! :) - fetch(`${environment.url}/user`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(userData), - }).then(response => { - if (response.ok) { - console.log('Usuario registrado exitosamente'); - this.handleUserRedirection(usuario); - } else { - response.json().then(data => { - if (data.user) { - console.log('Usuario encontrado:', data.user); - this.handleUserRedirection(data.user); - } else { - console.error('Error al registrar el usuario'); - } - }); - } - }).catch(error => { - console.error('Error en la solicitud:', error); - }); - }else{ + if (!user) { console.log('No hay usuario autenticado.'); + return; } - }); + + const userData: UserData = { + email: user.email, + first_name: user.given_name || '', + last_name: user.family_name || '', + photo: user.picture || '', + phone_number: '', + timezone: Intl.DateTimeFormat().resolvedOptions().timeZone, + gender: '', + password: 'auth0_' + Math.random().toString(36).slice(-8), // Password aleatorio + }; + + try { + const response = await this.registerOrAuthenticateUser(userData); + if (response) { + console.log('Operación exitosa:', response); + await this.handleUserRedirection(user); + } + } catch (error) { + console.error('Error al procesar el usuario:', error); + this.router.navigate(['/error']); + } + } catch (error) { + console.error('Error de autenticación:', error); + this.router.navigate(['/error']); + } + } + + private async registerOrAuthenticateUser(userData: UserData): Promise { + try { + // Usa el endpoint existente del backend + const response = await firstValueFrom( + this.http.post(`${environment.url}/user`, userData).pipe( + catchError(async error => { + if (error.status === 400 && error.error?.user) { + // Si el usuario ya existe, retornamos los datos del usuario>>>>>>>>>>>>> + return error.error; + } + throw error; + }) + ) + ); + + return response; + } catch (error) { + console.error('Error en la operación:', error); + throw error; + } } -//redireccionamiento - private handleUserRedirection(user: any) { - const roles = user['https://miaplicacion.com/roles']; - if (roles && roles.includes('admin')) { - this.router.navigate(['/home']); - } else { - this.router.navigate(['/sign-in']); + + private async handleUserRedirection(user: any) { + try { + // Obtiene los roles desde los metadatos de Auth0 >>>>>>>>>>>>>> + const roles = user['https://miaplicacion.com/roles'] || []; + const isEmailVerified = user.email_verified; + // Si el email no está verificado, redirige a una página de verificación probar!!!! + // if (!isEmailVerified) { + + // this.router.navigate(['/verify-email']); + // return; + // } + + // Redirige según el rol del usuario + if (roles.includes('admin')) { + await this.router.navigate(['/home']); + } else { + await this.router.navigate(['/sign-in']); + } + } catch (error) { + console.error('Error en la redirección:', error); + this.router.navigate(['/error']); } } -} \ No newline at end of file + + // Método para manejar errores de autenticación + private handleAuthError(error: any) { + console.error('Error de autenticación:', error); + + this.router.navigate(['/error']); + } +} diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index d2891f3..9f6ecbf 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -1,6 +1,6 @@
- + volver al listado
@@ -13,63 +13,90 @@

{{ selectNameForm.value.name }}

-
+
- +
- -
- {{ question.get('text').value }} +
+
{{ question.get('text').value }}
+
- -
-
- - - - + +
+
+ + + +
- - - - + + + + +
-
- -
+ +
+ *ngFor=" + let option of question.get('options').controls; + let j = index + " + [formGroupName]="j" + class="option-item"> + (change)="handleOptionSelection(i, j, $event)" /> - + - +
@@ -77,13 +104,68 @@

{{ selectNameForm.value.name }}

-
- - +
+
+ + +
+ + + + + ... + + + + + + ... + + + +
+ + + +
+ +
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss index acd68c0..dafc325 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss @@ -9,14 +9,15 @@ margin-block: 2.5vh; } -a { +.leave { color: white; flex: 0 0 33.33%; + transition: 0.3s ease-in-out; + text-decoration: none; } -a:hover { +.leave:hover { cursor: pointer; - text-decoration: none; color: magenta; } @@ -31,11 +32,11 @@ h1 { flex: 0 0 33.33%; } -.tittle { +.title { display: flex; align-items: center; justify-content: space-between; - margin: 1% 3%; + // margin: 1% 3%; } .content-1 { @@ -63,7 +64,10 @@ h1 { border-radius: 8px; background-color: #282828; } - +#question-container { + font-size: medium; + font-weight: 300; +} input[type='text'], .custom-option-input { @@ -111,6 +115,34 @@ button { transition: background-color 0.3s; background-color: slateblue; } +.edit-button { + display: inline-flex; + align-items: center; + + color: white; + font-size: 14px; + border: none; + border-radius: 5px; + padding: 8px 12px; + cursor: pointer; + transition: + background-color 0.3s, + transform 0.2s; +} + +.edit-button:hover { + background-color: darkviolet; + transform: scale(1.05); +} + +.edit-button:focus { + outline: none; + box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.5); +} + +.edit-button:active { + background-color: darkviolet; +} button:hover { background-color: darkviolet; @@ -152,8 +184,11 @@ button:hover { .buttons { display: flex; align-items: center; - justify-content:space-around; + justify-content: space-around; padding: 20px 0; /* Ajusta el padding según sea necesario */ + position: relative; + bottom: 0px; + margin-top: auto; } .buttons button { @@ -173,7 +208,6 @@ button:hover { .buttons button:disabled { background-color: #888; - } .option-row { // display: flex; @@ -190,15 +224,151 @@ button:hover { margin-bottom: 10px; /* Espacio inferior entre las opciones */ border: 1px solid #444; /* Borde oscuro */ border-radius: 15px; /* Borde redondeado */ - background-color: #282828; /* Color de fondo */ + background-color: #212121ff; /* Color de fondo */ padding: 10px; /* Espacio interno */ - color: #4f4f4f; /* Color de texto gris oscuro */ + color: white; /* Color de texto gris oscuro */ +} +.text-question { + color: white; + display: flex; + justify-content: space-between; } .option-label { - color: #4f4f4f; /* Color gris oscuro para las etiquetas */ + color: white; /* Color gris oscuro para las etiquetas */ } -input[type="radio"] { +input[type='radio'] { margin-right: 5px; /* Espacio entre el input y el texto */ -} \ No newline at end of file +} +#pagination { + display: flex; + justify-content: center; + align-items: center; + gap: 1px; +} + +#pagination button { + background-color: #f1f1f1; + border: 1px solid #ccc; + padding: 5px 10px; + cursor: pointer; +} + +.pagination-button .active { + background-color: #007bff; + color: white; +} + +#pagination button:disabled { + background-color: #ddd; + cursor: not-allowed; +} + +.dot { + background: transparent; + border: none; + font-size: 20px; + cursor: pointer; + color: #ccc; +} + +.dot.active { + color: #007bff; /* Color para el punto activo */ +} + +/* estilos de paginacion*/ + +.pagination-container { + margin-top: auto; + display: flex; + flex-direction: column; + align-items: center; + gap: 1rem; + margin-bottom: auto; + + .pagination-controls { + display: flex; + align-items: center; + gap: 15rem; + justify-content: space-around; /* Centrado de los controles */ + + .pagination-button { + padding: 0.8rem 1rem; + border: none; + border-radius: 4px; + cursor: pointer; + transition: + background-color 0.2s, + transform 0.2s ease; + + &:hover:not(.disabled) { + // background-color: #e0e0e0; + } + + &.disabled { + opacity: 0.5; + // cursor: not-allowed; + } + + i { + font-size: 0.875rem; + } + } + + .page-numbers { + display: flex; + align-items: center; + gap: 0.5rem; + + .page-number { + padding: 0; + font-size: 50px; /* Tamaño adecuado para los puntos */ + background-color: transparent; /* Sin fondo */ + border: none; /* Sin borde */ + color: #434547; /* Color de los puntos */ + cursor: pointer; + transition: + transform 0.2s ease, + color 0.2s ease; + + &:hover { + transform: scale(1.2); /* Aumento de tamaño al pasar el cursor */ + } + + &.active { + color: #000; /* Color del punto activo */ + opacity: 1; /* Asegura que el punto activo no se desvanezca */ + } + } + + .ellipsis { + font-size: 20px; + color: #007bff; + margin: 0 0.25rem; + } + } + } + + .page-info { + color: #666; + font-size: 0.875rem; + } +} + +.question-container { + margin-bottom: 2rem; + // padding: 1rem; + // border: 1px solid #e0e0e0; + border-radius: 8px; + // background-color: white; + // box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); + + .question-header { + margin-bottom: 1rem; + .question-number { + font-weight: 500; + color: #666; + } + } +} diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts index dfd50fe..10a69e0 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts @@ -1,43 +1,20 @@ -import { - Component, - Input, - Output, - EventEmitter, - OnInit, - OnChanges, - SimpleChanges, -} from '@angular/core'; +import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, FormArray } from '@angular/forms'; -import { - trigger, - style, - transition, - animate, - state, -} from '@angular/animations'; import { QuizService } from './services/quiz.service'; @Component({ selector: 'app-edit-pages', templateUrl: './edit-pages.component.html', styleUrls: ['./edit-pages.component.scss'], - animations: [ - trigger('enterState', [ - state('void', style({ transform: 'translateX(-50%)' })), - transition(':enter', [ - animate(300, style({ transform: 'translateX(0)' })), - ]), - ]), - ], }) -export class EditPagesComponent implements OnInit, OnChanges { +export class EditPagesComponent implements OnInit { @Input() quizId: string; @Output() close = new EventEmitter(); - isEditing: boolean = false; selectNameForm: FormGroup; currentPage: number = 0; - questionsPerPage: number = 3; + questionsPerPage: number = 2; // Aumentado a 5 preguntas por página + maxVisiblePages: number = 5; // Número máximo de páginas visibles en la paginación constructor( private formBuilder: FormBuilder, @@ -55,56 +32,59 @@ export class EditPagesComponent implements OnInit, OnChanges { } } - ngOnChanges(changes: SimpleChanges) { - if (changes['quizId'] && changes['quizId'].currentValue) { - this.loadQuiz(); - } - } - private loadQuiz() { if (!this.quizId) { console.error('Quiz ID no proporcionado'); return; } - this.quizService.getQuizWithQuestions(this.quizId).subscribe( - quizData => { + this.quizService.getQuizWithQuestions(this.quizId).subscribe({ + next: (quizData) => { console.log('Respuesta de la API:', quizData); this.selectNameForm.patchValue({ name: quizData.name }); this.populateQuestions(quizData.questions); }, - error => { + error: (error) => { console.error('Error al obtener el cuestionario:', error); } - ); + }); } private populateQuestions(questions: any[]) { - console.log('Preguntas recibidas:', questions); - - const questionForms = questions.map(question => - this.formBuilder.group({ - id: [question.id], - text: [question.question], - type: [question.type], - correct_option: [question.correct_option[0]], // Ajuste aquí - options: this.formBuilder.array( - question.options.map((optionText, index) => + const questionForms = questions.map(question => { + if (question.type === 'true_false') { + const correctAnswer = question.correct_option[0] === 0 ? 'Verdadero' : 'Falso'; + return this.formBuilder.group({ + id: [question.id], + text: [question.question], + type: [question.type], + correct_option: [correctAnswer], + options: this.formBuilder.array([]), + }); + } else { + const optionsArray = this.formBuilder.array( + question.options.map((optionText: string, index: number) => this.formBuilder.group({ - id: [index.toString()], // Usar el índice como ID - text: [optionText], // Asignar el texto directamente - selected: [index === question.correct_option[0]], // Marcar la opción correcta + id: [index], + text: [optionText], + selected: [question.correct_option.includes(index)], }) ) - ), - }) - ); + ); + + return this.formBuilder.group({ + id: [question.id], + text: [question.question], + type: [question.type], + correct_option: [question.correct_option], + options: optionsArray, + }); + } + }); const questionsArray = this.selectNameForm.get('questions') as FormArray; questionsArray.clear(); questionForms.forEach(form => questionsArray.push(form)); - - console.log('Preguntas pobladas:', this.questions.value); } get questions(): FormArray { @@ -123,53 +103,115 @@ export class EditPagesComponent implements OnInit, OnChanges { return Math.ceil(this.questions.length / this.questionsPerPage); } + get visiblePages(): number[] { + const totalPages = this.totalPages; + const current = this.currentPage; + const maxVisible = this.maxVisiblePages; + + if (totalPages <= maxVisible) { + return Array.from({ length: totalPages }, (_, i) => i); + } + + let start = Math.max(0, current - Math.floor(maxVisible / 2)); + let end = Math.min(totalPages - 1, start + maxVisible - 1); + + if (end - start + 1 < maxVisible) { + start = Math.max(0, end - maxVisible + 1); + } + + return Array.from( + { length: end - start + 1 }, + (_, i) => start + i + ); + } + + get showFirstPage(): boolean { + return this.visiblePages[0] > 0; + } + + get showLastPage(): boolean { + return this.visiblePages[this.visiblePages.length - 1] < this.totalPages - 1; + } + + handleOptionSelection(questionIndex: number, optionIndex: number, event: any) { + const question = this.questions.at(questionIndex); + const options = question.get('options') as FormArray; + const questionType = question.get('type').value; + + if (questionType === 'multiple_choice') { + const option = options.at(optionIndex); + option.patchValue({ selected: event.target.checked }); + + const selectedIndices = options.controls + .map((opt, idx) => (opt.get('selected').value ? idx : null)) + .filter(idx => idx !== null); + + question.patchValue({ correct_option: selectedIndices }); + } else { + options.controls.forEach((option, index) => { + option.patchValue({ + selected: index === optionIndex, + }); + }); + question.patchValue({ correct_option: [optionIndex] }); + } + } + + selectCorrectOption(questionIndex: number, optionValue: string) { + const question = this.questions.at(questionIndex); + if (question.get('type').value === 'true_false') { + question.patchValue({ + correct_option: optionValue, + }); + } + } + createQuiz() { + const formValue = this.selectNameForm.value; const updatedQuiz = { id: this.quizId, - name: this.selectNameForm.value.name, - questions: this.questions.value, + name: formValue.name, + questions: formValue.questions.map(question => { + if (question.type === 'true_false') { + const correctOptionNumber = question.correct_option === 'Verdadero' ? 0 : 1; + return { + ...question, + correct_option: [correctOptionNumber], + }; + } + return { + ...question, + correct_option: question.correct_option, + }; + }), }; - this.quizService.updateQuiz(this.quizId, updatedQuiz).subscribe( - response => { + this.quizService.updateQuiz(this.quizId, updatedQuiz).subscribe({ + next: (response) => { console.log('Cambios guardados para el quiz:', response); this.close.emit(); }, - error => { + error: (error) => { console.error('Error al guardar cambios:', error); } - ); + }); } - nextPage() { - if (this.currentPage < this.totalPages - 1) { - this.currentPage++; + goToPage(page: number) { + if (page >= 0 && page < this.totalPages) { + this.currentPage = page; } } - prevPage() { - if (this.currentPage > 0) { - this.currentPage--; - } + nextPage() { + this.goToPage(this.currentPage + 1); } - // Método para seleccionar la opción correcta - selectCorrectOption(questionIndex: number, optionId: string) { - const question = this.questions.at(questionIndex); - const options = question.get('options') as FormArray; - - // Limpiar la selección previa - options.controls.forEach(option => { - option.get('selected').setValue(false); - }); + prevPage() { + this.goToPage(this.currentPage - 1); + } - // Marcar la opción seleccionada - const selectedOption = options.controls.find( - option => option.get('id').value === optionId - ); - if (selectedOption) { - selectedOption.get('selected').setValue(true); - question.get('correct_option').setValue(optionId); - } + trackByFn(index: number): number { + return index; } -} +} \ No newline at end of file diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index 9e012cf..8bf88d1 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -72,6 +72,7 @@ export class WelcomePageComponent { isExpanded2 = false; // Controla la expansión de la columna de "Nuevo" isExpanded3 = false; // Controla la expansión de la columna de "Editar" selectedQuiz: any = null; // Almacena el quiz seleccionado + toggleExpand1() { this.isExpanded1 = !this.isExpanded1; @@ -108,7 +109,7 @@ export class WelcomePageComponent { onQuizSelected(quiz: any) { this.selectedQuiz = quiz; this.isExpanded3 = true; // Expande la columna de edición - this.isExpanded1 = false; // Colapsa la columna de "Todos" + this.isExpanded1 = false; // Colapsa la columna de "Todos" this.isExpanded2 = false; // Colapsa la columna de "Nuevo" } @@ -118,4 +119,7 @@ export class WelcomePageComponent { this.selectedQuiz = null; this.toggleExpand1(); // Limpia el quiz seleccionado } + + + } From a8c8718fdcc74195eeeb74ee8edca83722778fb1 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Sun, 17 Nov 2024 23:24:44 -0300 Subject: [PATCH 161/203] fix filter and search in allQuiz --- .../pages/all-page/all-page.component.html | 16 +-- .../all/pages/all-page/all-page.component.ts | 45 ++++++-- .../all/pages/all-page/all-page.service.ts | 45 ++++++++ .../header-page/header-page.component.html | 104 ++++++++---------- .../header-page/header-page.component.scss | 7 +- .../header-page/header-page.component.ts | 75 ++++++++----- .../header-page/header-page.interface.ts | 15 +++ .../pages/header-page/header-page.service.ts | 18 +++ 8 files changed, 215 insertions(+), 110 deletions(-) create mode 100644 src/app/modules/all/pages/all-page/all-page.service.ts create mode 100644 src/app/shared/components/header-form/pages/header-page/header-page.interface.ts create mode 100644 src/app/shared/components/header-form/pages/header-page/header-page.service.ts diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 64d4854..8d0cf26 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -1,9 +1,9 @@
+ [ngClass]="showForm ? '' : 'absolute-true'" + (datosParaPadre)="recibirDatos($event)" + [mode]="true"> +

Todos los Quiz

@@ -16,11 +16,11 @@

Todos los Quiz

Nombre Q. + Módulo + Célula Seniority Fec. Creación Creador - Módulo - Célula Estado Acciones @@ -28,11 +28,11 @@

Todos los Quiz

{{ quiz?.name }} + {{ quiz?.cell?.module?.name }} + {{ quiz?.cell?.name }} {{ quiz?.seniority }} {{ quiz?.created_at | date:'dd/MM/yyyy' }} {{ quiz?.created_by?.first_name }} - {{ quiz?.cell?.module?.name }} - {{ quiz?.cell?.name }} { + this.quizzes = response.quizzes + console.log(this.quizzes) + }); + } + + recibirDatos(quizCategory:any) { + this.module = quizCategory.module; + this.cell = quizCategory.cell; + this.seniority = quizCategory.seniority; + this.allPageService.getFilteredQuiz({ + module: this.module, + cell: this.cell, + seniority: this.seniority.toLowerCase(), + search: this.searchText + }).subscribe((response:any) => { + this.quizzes = response.quizzes + }) } - // Método para obtener quizzes de la API con búsqueda dinámica + onSearchChange() { + this.allPageService.getFilteredQuiz({ + module: this.module, + cell: this.cell, + seniority: this.seniority.toLowerCase(), + search: this.searchText + }).subscribe((response:any) => { + this.quizzes = response.quizzes + }); + } + /* // Método para obtener quizzes de la API con búsqueda dinámica async fetchAllQuizzes() { try { const params = new URLSearchParams(); @@ -105,15 +135,10 @@ export class AllPageComponent implements OnInit { } catch (error) { console.error('Error al obtener los quizzes:', error); } - } - - - + } */ // Método para actualizar los resultados de la búsqueda al cambiar el texto - onSearchChange() { - this.fetchAllQuizzes(); - } + async toggleActive(quiz: Quiz) { quiz.is_active = !quiz.is_active; diff --git a/src/app/modules/all/pages/all-page/all-page.service.ts b/src/app/modules/all/pages/all-page/all-page.service.ts new file mode 100644 index 0000000..e1bc681 --- /dev/null +++ b/src/app/modules/all/pages/all-page/all-page.service.ts @@ -0,0 +1,45 @@ +import { HttpClient, HttpParams } from '@angular/common/http'; +import { inject, Injectable } from '@angular/core'; +import { environment } from '@environments/environment'; + +@Injectable({ + providedIn: 'root' +}) +export class AllPageService { + + private http = inject(HttpClient) + private urlApi: string = `${environment.url}/quiz` + + constructor() { } + + getAllQuiz() { + return this.http.get(this.urlApi) + } + + getFilteredQuiz(filters: { + module?: string; + cell?: string; + seniority?: string; + search?: string; + } = {}) { + // Crear HttpParams + let params = new HttpParams(); + + if (filters.seniority) { + params = params.append('seniority', filters.seniority); + } + if (filters.module) { + params = params.append('module', filters.module); + } + if (filters.cell) { + params = params.append('cell', filters.cell); + } + if (filters.search) { + params = params.append('search', filters.search); + } + + // Hacer la petición con los parámetros + return this.http.get(this.urlApi, { params }); + } + +} diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index 3ea678a..6b243a5 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -1,79 +1,71 @@
+

Módulo

- {{ - questionCategory?.module - }} -
- - - -
+ + {{quizCategory?.module || 'Selecciona el modulo'}} +
+ @if (showModulo) { +
+ @for (module of modules; track $index) { + + } +
+ }
- +

Célula

{{ questionCategory?.cell }} -
- - - -
+ class="floating" + [style.background-color]="quizCategory?.colorCell"> + {{ quizCategory?.cell || 'Selecciona la célula'}} +
- - + @if (showCelula && cells.length > 0) { +
+ @for (cell of cells;track $index) { + + } +
+ }

Seniority / Nivel

-
- {{ questionCategory?.seniority }} +
+ {{ quizCategory?.seniority || 'Seniority'}} - - -
- - - - -
+ + @if (showSeniority){ +
+ @for (seniority of seniorities; track $index) { + + } +
+ }
+
diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index 2d30724..45cd917 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -147,7 +147,7 @@ h4 { background-color: #5856d6; color: #57462e; } -.semi-sr { +.middle { border-radius: 20px; background-color: #af52de; color: #5e4b30; @@ -157,8 +157,3 @@ h4 { background-color: #ff2d55; color: #423420; } - -.Fullstack { - background-color: #007AFF; - color: #34567B -} diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index 7c316d0..1a1d77c 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -1,6 +1,7 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, inject, Input, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { environment } from '@environments/environment'; +import { HeaderPageService } from './header-page.service'; +import { Module, Cell, Seniority } from './header-page.interface'; @Component({ selector: 'app-header-page', @@ -12,7 +13,11 @@ export class HeaderPageComponent { @Output() datosParaPadre = new EventEmitter(); // cambie a any public selectHeaderForm: FormGroup; constructor(private formsBuilder: FormBuilder) {} - + + private headerPageService = inject(HeaderPageService) + modules: Module[] = [] + cells: Cell[] = [] + ngOnInit(): void { this.selectHeaderForm = this.formsBuilder.group({ @@ -20,6 +25,10 @@ export class HeaderPageComponent { descripcion: [''], modulo: [''], }); + //Consulta los modulos y las celullas que tiene anidadas + this.headerPageService.getModules().subscribe(( response: any) => { + this.modules= response + }) } colorsCells: string[] = [ '#ffcc00', @@ -35,43 +44,47 @@ export class HeaderPageComponent { '#5856d6', '#007aff', ]; - colorsSeniority: string[] = ['#ff2d55', '#af52de', '#5856d6', '#007aff']; + showModulo: boolean = false; showCelula: boolean = false; showSeniority: boolean = false; - questionCategory: any = { - module: 'Selecciona el modulo', - cell: 'Selecciona la célula', - seniority: 'Seniority', + + quizCategory: any = { + module: '', + cell: '', + seniority: '', colorCell: '', }; - opModules: any = []; - opCells: any = []; + + seniorities: Seniority[]=[ + {class: 'trainee', name: 'Trainee'}, + {class: 'junior', name: 'Junior'}, + {class: 'middle', name: 'Middle'}, + {class: 'senior', name: 'Senior'}, + ] + + selectModule(module: Module) { + this.quizCategory.module = module.name + this.cells = module.cell; + this.quizCategory.cell= '' + this.showModulo = false; + this.datosParaPadre.emit(this.quizCategory); - async getModule() { - let response = await fetch(`${environment.url}/modules`); - response = await response.json(); - this.opModules = response; } - async getCells() { - /* no pude reutilizar fn anterior con parametros */ - let response = await fetch(`${environment.url}/cells`); - response = await response.json(); - this.opCells = response; + selectCell(cell: Cell, colorCell: string) { + this.quizCategory.cell = cell.name + this.quizCategory.colorCell = colorCell + this.showCelula = false; + this.datosParaPadre.emit(this.quizCategory); } - - pushQuestionCategory(prop: string, val: string, color: string): void { - this.questionCategory[prop] = val; - if (prop == 'cell') { - this.questionCategory.colorCell = color; - } - - this.datosParaPadre.emit(this.questionCategory); + selectSeniority(seniority: string) { + this.quizCategory.seniority= seniority; + this.showSeniority = false; + this.datosParaPadre.emit(this.quizCategory); } isShowModulo() { if (this.mode) { - this.getModule(); this.showModulo = !this.showModulo; this.showCelula = false; this.showSeniority = false; @@ -79,8 +92,6 @@ export class HeaderPageComponent { } isShowCelula() { if (this.mode) { - this.getCells(); - this.showCelula = !this.showCelula; this.showSeniority = false; this.showModulo = false; @@ -93,4 +104,8 @@ export class HeaderPageComponent { this.showModulo = false; } } + getSelectedSeniorityClass(): string{ + const selected = this.seniorities.find(s => s.name ===this.quizCategory?.seniority) + return selected?.class || '' + } } diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.interface.ts b/src/app/shared/components/header-form/pages/header-page/header-page.interface.ts new file mode 100644 index 0000000..75d976f --- /dev/null +++ b/src/app/shared/components/header-form/pages/header-page/header-page.interface.ts @@ -0,0 +1,15 @@ +export interface Cell { + id: number; + name: string; + } + + export interface Module { + id: number; + name: string; + cell: Cell[] +} + +export interface Seniority { + class: string; + name: string; +} diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.service.ts b/src/app/shared/components/header-form/pages/header-page/header-page.service.ts new file mode 100644 index 0000000..f0dcb0a --- /dev/null +++ b/src/app/shared/components/header-form/pages/header-page/header-page.service.ts @@ -0,0 +1,18 @@ +import { HttpClient } from '@angular/common/http'; +import { inject, Injectable } from '@angular/core'; +import { environment } from '@environments/environment'; + +@Injectable({ + providedIn: 'root' +}) +export class HeaderPageService { + + private http = inject(HttpClient) + private urlApi: string = `${environment.url}/modules` + + constructor() { } + getModules(){ + return this.http.get(this.urlApi) + } + +} From f9888dfef43d32470cd8fe21f124be333f1d9e87 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Sun, 17 Nov 2024 23:36:16 -0500 Subject: [PATCH 162/203] cambios componente edit y solucion creacion de quiz --- .../pages/all-page/all-page.component.scss | 95 +++++++--- .../edit-pages/edit-pages.component.html | 108 ++++++++++-- .../edit-pages/edit-pages.component.scss | 112 +++++++++--- .../pages/edit-pages/edit-pages.component.ts | 163 ++++++++++++++---- .../pages/new-pages/new-pages.component.ts | 115 +++++++----- 5 files changed, 457 insertions(+), 136 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index a3641d5..057b0cb 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -133,37 +133,38 @@ h2 { transform: translateY(-50%); color: #aaa; } -.custom-popup { - background-color: rgba(53, 52, 52, 0.5) !important; +// .custom-popup { +// background-color: rgba(33, 33, 33,) !important; - color: #fff !important; - border-radius: 15px !important ; -} +// color: #fff !important; +// border-radius: 15px !important ; +// } -.custom-title { - font-size: 20px !important; - font-weight: bold !important; - color: #fff !important; -} +// .custom-title { +// font-size: 20px !important; +// font-weight: bold !important; +// color: #fff !important; +// } -.custom-content { - font-size: 14px !important; - color: #cccccc !important; -} +// .custom-content { +// font-size: 14px !important; +// color: #cccccc !important; +// } -.custom-confirm-btn { - background-color: #6c63ff !important; - border-radius: 10px !important; - color: #fff !important; - padding: 10px 20px !important; -} +// .custom-confirm-btn { +// background-color: #6c63ff !important; +// border-radius: 10px !important; +// color: #fff !important; +// padding: 10px 20px !important; +// } -.custom-cancel-btn { - background-color: #4e4e4e !important; - border-radius: 10px !important; - color: #fff !important; - padding: 10px 20px !important; -} +// .custom-cancel-btn { +// background-color: #4e4e4e !important; +// border-radius: 10px !important; +// color: #fff !important; +// padding: 10px 20px !important; +// display: none !important; +// } .input-wrapper input { padding-left: 35px; @@ -226,3 +227,45 @@ h2 { overflow-y: auto; z-index: 1001; } +/* Estilos personalizados para el popup */ +.swal2-popup.custom-popup { + background-color: #2c2c2c !important; /* Fondo oscuro */ + border-radius: 20px; + padding: 20px; + box-shadow: 0 0 15px rgba(0, 0, 0, 0.3); +} + +/* Estilo para el título */ +.swal2-title.custom-title { + color: #ffcc00 !important; /* Color dorado */ + font-family: 'Arial', sans-serif; + font-size: 24px; + font-weight: bold; +} + +/* Estilo para el botón de confirmación (Eliminar) */ +.swal2-confirm.custom-confirm-btn { + background-color: #ff4d4d !important; /* Rojo para el botón de eliminar */ + color: #fff; + border-radius: 8px; + padding: 10px 20px; + border: none; + font-weight: bold; +} + +.swal2-confirm.custom-confirm-btn:hover { + background-color: #ff1a1a !important; /* Rojo más intenso */ +} + +/* Estilo para el botón de cancelación */ +.swal2-cancel.custom-cancel-btn { + background-color: #999 !important; /* Gris para el botón de cancelar */ + color: #fff; + border-radius: 8px; + padding: 10px 20px; + border: none; +} + +.swal2-cancel.custom-cancel-btn:hover { + background-color: #666 !important; /* Gris más oscuro */ +} diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index 9f6ecbf..6fb3e76 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -30,23 +30,19 @@

{{ selectNameForm.value.name }}

{{ question.get('text').value }}
-
-
+
@@ -56,7 +52,7 @@

{{ selectNameForm.value.name }}

@@ -111,7 +107,7 @@

{{ selectNameForm.value.name }}

(click)="prevPage()" [disabled]="currentPage === 0" [class.disabled]="currentPage === 0"> - atras + Atras
@@ -150,7 +146,7 @@

{{ selectNameForm.value.name }}

@@ -159,9 +155,99 @@

{{ selectNameForm.value.name }}

(click)="nextPage()" [disabled]="currentPage >= totalPages - 1" [class.disabled]="currentPage >= totalPages - 1"> - siguiente + Siguiente
+ +
+
+
+

Editar pregunta

+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+
+
+ + +
+ +
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+
@@ -9,6 +9,7 @@

Módulo

{{quizCategory?.module || 'Selecciona el modulo'}}
+ @if (showModulo) {
@for (module of modules; track $index) { @@ -16,35 +17,45 @@

Módulo

class="module-option" (click)="selectModule(module)"> {{ module.name }} - @if(editMode){ - } + @if(editMode){ +
+ + +
+ } - } @if (editMode) { @if (!addModule) { - + + } + @else {
- @if(this.selectHeaderForm.get('modulo')?.errors?.['required']) { + @if(module?.errors?.['required']) { (El modulo no puede quedar vacío) } - @if(this.selectHeaderForm.get('modulo')?.errors?.['minlength']) { + @if(module?.errors?.['minlength']) { (Debe tener como mínimo 3 caracteres) }
- +
} } +
}
@@ -94,4 +105,4 @@

Seniority / Nivel

- + diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index 5484884..bfa21d0 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -1,7 +1,8 @@ import { Component, EventEmitter, inject, Input, Output } from '@angular/core'; -import { FormBuilder, FormGroup, MinLengthValidator, Validators } from '@angular/forms'; +import { FormControl, Validators } from '@angular/forms'; import { HeaderPageService } from './header-page.service'; import { Module, Cell, Seniority } from './header-page.interface'; +import { switchMap } from 'rxjs'; @Component({ selector: 'app-header-page', @@ -10,30 +11,32 @@ import { Module, Cell, Seniority } from './header-page.interface'; }) export class HeaderPageComponent { - @Input() mode: boolean = true; - @Input() editMode: boolean = true ; - @Output() datosParaPadre = new EventEmitter(); // cambie a any - public selectHeaderForm: FormGroup; - constructor(private formsBuilder: FormBuilder) {} + + @Input() editMode: boolean; //cambia modo editable a lectura + @Output() datosParaPadre = new EventEmitter(); //envia al componente padre la seleccion actual private headerPageService = inject(HeaderPageService) + + //Estructura de los dropdown modules: Module[] = [] cells: Cell[] = [] - - ngOnInit(): void { - //Consulta los modulos y las celullas que tiene anidadas - this.headerPageService.getModules().subscribe(( response: any) => { - this.modules= response - }) - } - + seniorities: Seniority[]=[ + {class: 'trainee', name: 'Trainee'}, + {class: 'junior', name: 'Junior'}, + {class: 'middle', name: 'Middle'}, + {class: 'senior', name: 'Senior'}, + ] + //visibilidad de los dropdown showModulo: boolean = false; showCelula: boolean = false; showSeniority: boolean = false; + //visibilidad del input para agregar modulos o celulas addModule: boolean = false; addCell: boolean = false; - newModuleName: string = ''; - + //campos de formulario + module= new FormControl('',[Validators.required, Validators.minLength(3)]); + cell= new FormControl('',[Validators.required, Validators.minLength(3)]); + //seleccion actual de modulo celula y seniority quizCategory: any = { module: '', cell: '', @@ -41,13 +44,19 @@ export class HeaderPageComponent { cellClass: '', }; - seniorities: Seniority[]=[ - {class: 'trainee', name: 'Trainee'}, - {class: 'junior', name: 'Junior'}, - {class: 'middle', name: 'Middle'}, - {class: 'senior', name: 'Senior'}, - ] - + + ngOnInit(): void { + //Consulta los modulos y las celullas que tiene anidadas + this.getCategory() + + } + //obtiene los modulos y celulas de la api + getCategory() { + this.headerPageService.getModules().subscribe(( response: any) => { + this.modules= response + }) + } + //coloca el modulo como seleccionado y carga las celulas que le corresponden selectModule(module: Module) { this.quizCategory.module = module.name this.cells = module.cell; @@ -55,30 +64,27 @@ export class HeaderPageComponent { this.quizCategory.cellClass= '' this.showModulo = false; this.datosParaPadre.emit(this.quizCategory); - - } + } + //coloca la celula como seleccionado y su correspondiente clase selectCell(cell: Cell, index: number) { this.quizCategory.cell = cell.name this.quizCategory.cellClass = this.getCellClass(index) this.showCelula = false; this.datosParaPadre.emit(this.quizCategory); } - + //coloca el seniority como seleccionado selectSeniority(seniority: string) { this.quizCategory.seniority= seniority; this.showSeniority = false; this.datosParaPadre.emit(this.quizCategory); } - + //Crea un nuevo modulo createModule() { - if (this.selectHeaderForm.get('modulo').valid) { - console.log(this.newModuleName) - this.headerPageService.createModule(this.selectHeaderForm.get('modulo').value).subscribe({ + if (this.module.valid) { + this.headerPageService.createModule(this.module.value).subscribe({ next: (newModule) => { - this.editMode = false; - this.headerPageService.getModules().subscribe(( response: any) => { - this.modules= response - }) + this.getCategory() + this.toggleAddModule() }, error: (error) => { console.error('Error al crear módulo', error); @@ -87,46 +93,61 @@ export class HeaderPageComponent { }); } } + //actualiza un modulo + updateModule(id:string) { + if (this.module.valid) { + this.headerPageService.updateModule(id, this.module.value).subscribe() + } + } + //elimina un modulo deleteModule(id: string) { - this.headerPageService.deleteModule(id).subscribe((response:any)=>{}) - this.headerPageService.getModules().subscribe(( response: any) => { - this.modules= response - }) + this.headerPageService.deleteModule(id).pipe( + // Esperar a que termine el delete + switchMap(() => { + // Una vez que termine el delete, obtener la lista actualizada + return this.headerPageService.getModules(); + }) + ).subscribe({ + next: (response: any) => { + this.modules = response; + } + }); } - + //Cambia la visibilidad de modulo, celula y seniority isShowModulo() { - if (this.mode) { this.showModulo = !this.showModulo; this.showCelula = false; this.showSeniority = false; - } } isShowCelula() { - if (this.mode) { this.showCelula = !this.showCelula; this.showSeniority = false; this.showModulo = false; - } } isShowSeniority() { - if (this.mode) { this.showSeniority = !this.showSeniority; this.showCelula = false; this.showModulo = false; - } } - toggleEditMode() { - this.editMode = !this.editMode; - this.newModuleName = ''; + //Cambia la visibilidad del input modulo para agregar un nuevo en el modo edit + toggleAddModule() { + this.addModule = !this.addModule; + this.module.setValue(''); } + //Cambia la visibilidad del input celula para agregar una nueva en el modo edit + toggleAddCell() { + this.addCell = !this.addCell; + this.cell.setValue(''); + } + //Selecciona la clase de seniority que corresponda getSelectedSeniorityClass(): string{ const selected = this.seniorities.find(s => s.name ===this.quizCategory?.seniority) return selected?.class || '' } - + //Selecciona la clase de celula que corresponda getCellClass(index: number): string { - const cellNumber = (index % 10) + 1; // Esto asegura que si hay más de 10 células, los colores se repitan + // Esto asegura que si hay más de 10 células, los colores se repitan + const cellNumber = (index % 10) + 1; return `cell-color-${cellNumber}`; } - } diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.service.ts b/src/app/shared/components/header-form/pages/header-page/header-page.service.ts index b001970..b0cb261 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.service.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.service.ts @@ -19,6 +19,7 @@ export class HeaderPageService { catchError(this.errorHandler) ) } + createModule(name:string) { return this.http.post(`${this.urlApi}/modules`, {name: name}) .pipe( From 4a8f8b2e589599ca0ea956dc92841f993ccb1442 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Sat, 23 Nov 2024 22:04:24 -0300 Subject: [PATCH 167/203] fix bug #35 agustin --- .../pages/all-page/all-page.component.html | 8 +- .../pages/all-page/all-page.component.scss | 261 +++++++++--------- .../all/pages/all-page/all-page.component.ts | 139 +++------- 3 files changed, 162 insertions(+), 246 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index b022504..a60836c 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -57,8 +57,8 @@

Todos los Quiz

-
-
- -
+
+ +
diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index 057b0cb..2f86aea 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -1,40 +1,47 @@ +$background-color: #2a2a2a; +$shadow-color: rgba(0, 217, 255, 0.4); +$input-bg-color: #333; +$text-color: #fff; +$border-radius: 12px; +$transition-time: 0.3s; +$spacing: 20px; + + .quiz-dashboard { padding: 20px; + background-color: #1e1e1e; color: #fff; height: 95vh; - width: 150vh; + width: 150vh; border-radius: 12px; padding: 24px 8px 8px 8px; - gap: 47px; + gap: 47px; opacity: 0px; - overflow: auto; + overflow: auto; margin-block: 2.5vh; - background-color: rgb(53, 52, 52); - - border: 2px solid rgba(241, 121, 197, 1); - // background-image: url('../../../../../assets/layout/images/logo.svg'); - // background-repeat: no-repeat; - // background-position: center; - // background-size: 180px; } -.table-sup { +.table-sup{ font-family: Poppins; font-size: 16px; font-weight: 400; line-height: 24px; letter-spacing: 0.20000000298023224px; text-align: center; - background: rgba(27, 27, 27, 0.5); + } -.table-int { - margin: 0 auto; - flex: auto; - background: rgba(27, 27, 27, 0.5); +.table-int{ + margin: 0 auto; + flex: auto; + + + } h2 { color: #fff; font-size: 1.5rem; margin: 0; + + } .filters { @@ -44,8 +51,7 @@ h2 { } .filters select { - background-color: rgba(53, 52, 52, 0.5); - + background-color: #333; border: 1px solid #444; padding: 10px; color: #fff; @@ -53,10 +59,9 @@ h2 { width: 30%; } -.search-container { +.search-container { top: 0; - background-color: rgba(53, 52, 52, 0.5); - + background-color: #1e1e1e; padding: 10px 20px; display: flex; justify-content: space-between; @@ -65,8 +70,7 @@ h2 { } .search-container input { - background-color: rgba(53, 52, 52, 0.5); - + background-color: #333; border: 1px solid #444; padding: 8px; color: #fff; @@ -108,16 +112,16 @@ h2 { width: 100%; border-collapse: collapse; margin-top: 10px; - background: rgba(27, 27, 27, 0.5); } - .activo { - color: rgba(151, 71, 255, 1); + color:rgba(151, 71, 255, 1); + ; + font-weight: bold; } .inactivo { - color: red; - font-weight: normal; + color: red; + font-weight: normal; } .input-wrapper { @@ -128,144 +132,125 @@ h2 { .input-wrapper i { position: absolute; - left: 10px; + left: 10px; top: 50%; transform: translateY(-50%); - color: #aaa; -} -// .custom-popup { -// background-color: rgba(33, 33, 33,) !important; - -// color: #fff !important; -// border-radius: 15px !important ; -// } - -// .custom-title { -// font-size: 20px !important; -// font-weight: bold !important; -// color: #fff !important; -// } - -// .custom-content { -// font-size: 14px !important; -// color: #cccccc !important; -// } - -// .custom-confirm-btn { -// background-color: #6c63ff !important; -// border-radius: 10px !important; -// color: #fff !important; -// padding: 10px 20px !important; -// } - -// .custom-cancel-btn { -// background-color: #4e4e4e !important; -// border-radius: 10px !important; -// color: #fff !important; -// padding: 10px 20px !important; -// display: none !important; -// } + color: #aaa; +} +.custom-popup { + background-color: #1f1f1f; + color: #fff; + border-radius: 15px; +} + +.custom-title { + font-size: 20px; + font-weight: bold; + color: #fff; +} + +.custom-content { + font-size: 14px; + color: #cccccc; +} + +.custom-confirm-btn { + background-color: #6c63ff; + border-radius: 10px; + color: #fff; + padding: 10px 20px; +} + +.custom-cancel-btn { + background-color: #4e4e4e; + border-radius: 10px; + color: #fff; + padding: 10px 20px; +} .input-wrapper input { - padding-left: 35px; - width: 100%; + padding-left: 35px; + width: 100%; } -.quiz-table th, -.quiz-table td { +.quiz-table th, .quiz-table td { padding: 10px; text-align: left; border-bottom: 1px solid #444; - background-color: rgba(53, 52, 52, 0.5); - text-align: center; // Centrar el texto horizontalmente - padding: 12px; // Espacio alrededor del texto - font-family: 'Poppins'; } -.actions button { - display: flexbox; - background: none; - border: none; - cursor: pointer; - color: white; +.quiz-table th { + background-color: #333; + } - -.status { - font-weight: bold; - transition: 0.5s ease-in-out; -} -.status:hover { - cursor: pointer; -} -.status.Activo { - color: rgba(151, 71, 255, 1); +::ng-deep .custom-delete-popup { + background-color: #1e1e1e; + color: #fff; + border-radius: 50px; + padding: 24px 24px 24px 24px; } -.status.Inactivo { - color: #ff0000; +::ng-deep .custom-delete-title { + font-size: 24px; + padding: 0px 8px; + text-align: center; + opacity: 1; } -.overlay { - position: fixed; - top: 50%; - left: 50%; - transform: translate(-50%,-50%); - width: 100%; - height: 100%; - background-color: rgba(0, 0, 0, 0.5); /* Fondo semitransparente */ - display: flex; - justify-content: center; - align-items: center; - z-index: 1000; + +::ng-deep .custom-delete-confirm-button { + background: rgba(106, 95, 255, 1); + color: #fff; + font-size: 18px; + padding: 12px 24px; + border-radius: 16px; + box-shadow: none; + outline: none; + transition: background-color 0.3s ease; } -.popup { - // background-color: rgb(66, 66, 66); - // padding: 20px; - border-radius: 8px; - max-width: 80%; +::ng-deep .custom-delete-confirm-button:hover { + background-color: #5a47cc; +} - overflow-y: auto; - z-index: 1001; +::ng-deep .swal2-close { + color: #fff; + font-size: 20px; } -/* Estilos personalizados para el popup */ -.swal2-popup.custom-popup { - background-color: #2c2c2c !important; /* Fondo oscuro */ - border-radius: 20px; - padding: 20px; - box-shadow: 0 0 15px rgba(0, 0, 0, 0.3); + +::ng-deep .custom-delete-content { + padding: 24px 0 0 0; + gap: 24px; } -/* Estilo para el título */ -.swal2-title.custom-title { - color: #ffcc00 !important; /* Color dorado */ - font-family: 'Arial', sans-serif; - font-size: 24px; - font-weight: bold; + +.quiz-table td { + background-color: #222; + text-align: center; // Centrar el texto horizontalmente + padding: 12px; // Espacio alrededor del texto + font-family: "Poppins"; + } -/* Estilo para el botón de confirmación (Eliminar) */ -.swal2-confirm.custom-confirm-btn { - background-color: #ff4d4d !important; /* Rojo para el botón de eliminar */ - color: #fff; - border-radius: 8px; - padding: 10px 20px; +.actions button { + display: flexbox; + background: none; border: none; - font-weight: bold; + cursor: pointer; + color: white; + + + } -.swal2-confirm.custom-confirm-btn:hover { - background-color: #ff1a1a !important; /* Rojo más intenso */ +.status { + font-weight: bold; } -/* Estilo para el botón de cancelación */ -.swal2-cancel.custom-cancel-btn { - background-color: #999 !important; /* Gris para el botón de cancelar */ - color: #fff; - border-radius: 8px; - padding: 10px 20px; - border: none; +.status.Activo { + color: rgba(151, 71, 255, 1); + ; } -.swal2-cancel.custom-cancel-btn:hover { - background-color: #666 !important; /* Gris más oscuro */ +.status.Inactivo { + color: #ff0000; } diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index df2fbb6..99d31af 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -44,29 +44,18 @@ interface Quiz { transition('collapsed => expanded', [animate('300ms ease-out')]), transition('expanded => collapsed', [animate('300ms ease-in')]), ]), - trigger('fadeInOut', [ - transition(':enter', [ - style({ opacity: 0 }), - animate('300ms', style({ opacity: 1 })) - ]), - transition(':leave', [ - animate('300ms', style({ opacity: 0 })) - ]) - ]) ], - }) export class AllPageComponent implements OnInit { @Output() quizSelected = new EventEmitter(); - searchText: string = ''; - seniority: string = ''; module: string = ''; cell: string = ''; + seniority: string = ''; + searchText: string = ''; + quizzes: Quiz[] = []; - selectedQuiz: Quiz | null = null + selectedQuiz: any; isExpanded3: boolean = false; - selectedQuizOnView: Quiz | null = null - showEdit: boolean = false; private allPageService = inject(AllPageService) @@ -104,54 +93,7 @@ export class AllPageComponent implements OnInit { this.quizzes = response.quizzes }); } - /* // Método para obtener quizzes de la API con búsqueda dinámica - async fetchAllQuizzes() { - try { - const params = new URLSearchParams(); - - // Solo agregar el parámetro 'search' si se está buscando por nombre del quiz - if (this.searchText) { - params.append('search', this.searchText.toLowerCase()); - console.log(`Buscando por: ${this.searchText.toLowerCase()}`); - } - - // Agregar parámetros solo si existen - if (this.seniority) { - params.append('seniority', this.seniority.toLowerCase()); - console.log(`Filtrando por seniority: ${this.seniority.toLowerCase()}`); - } - if (this.module) { - params.append('module', this.module.toLowerCase()); - console.log(`Filtrando por módulo: ${this.module.toLowerCase()}`); - } - if (this.cell) { - params.append('cell', this.cell.toLowerCase()); - console.log(`Filtrando por célula: ${this.cell.toLowerCase()}`); - } - - // Construir la URL - const url = `${environment.url}/quiz${params.toString() ? '?' + params.toString() : ''}`; - console.log(`URL construida para la consulta: ${url}`); - - // Realizar la consulta - const response = await fetch(url, { method: 'GET' }); - if (!response.ok) { - throw new Error('Error en la consulta: ' + response.status); - } - - // Procesar la respuesta - const data = await response.json(); - this.quizzes = Array.isArray(data.quizzes) ? data.quizzes : []; - console.log('Quizzes filtrados recibidos:', this.quizzes); - - } catch (error) { - console.error('Error al obtener los quizzes:', error); - } - } */ - - // Método para actualizar los resultados de la búsqueda al cambiar el texto - - + async toggleActive(quiz: Quiz) { quiz.is_active = !quiz.is_active; @@ -173,53 +115,42 @@ export class AllPageComponent implements OnInit { } viewQuiz(quiz: Quiz) { - this.selectedQuizOnView = quiz; // Esto hace que la ventana emergente se muestre - - console.log('Quiz seleccionado:', quiz); - } - - closeQuiz() { - this.selectedQuizOnView = null; // Esto cierra la ventana emergente + this.selectedQuiz = quiz; + this.router.navigate(['home/view-quiz', quiz.id]); } - async deleteQuiz(quiz: any) { - try { - const result = await Swal.fire({ - title: '¿Deseas eliminar el registro?', - text: 'Una vez eliminado no se podrá recuperar', - showCancelButton: true, - confirmButtonColor: '#6c63ff', - cancelButtonColor: '#4e4e4e', - confirmButtonText: 'Eliminar', - cancelButtonText: 'Cancelar', - customClass: { - popup: 'custom-popup', - title: 'custom-title', - confirmButton: 'custom-confirm-btn', - cancelButton: 'custom-cancel-btn' - } - }); - - if (result.isConfirmed) { - let response = await fetch(`${environment.url}/quiz/${quiz.id}`, { + async deleteQuiz(quiz: Quiz) { + const result = await Swal.fire({ + title: '¿Deseas eliminar el registro?', + text: 'Una vez eliminado no se podrá recuperar', + showCloseButton: true, + showCancelButton: false, + confirmButtonText: 'Eliminar', + customClass: { + popup: 'custom-delete-popup', + title: 'custom-delete-title', + confirmButton: 'custom-delete-confirm-button', + }, + }); + + if (result.isConfirmed) { + try { + const response = await fetch(`${environment.url}/quiz/${quiz.id}`, { method: 'DELETE', - headers: { - 'Content-Type': 'application/json', - } }); - - if (response.ok) { - Swal.fire('Eliminado', 'El quiz ha sido eliminado.', 'success'); - this.quizzes = this.quizzes.filter(q => q !== quiz); - } else { - Swal.fire('Error', 'Hubo un error al eliminar el quiz.', 'error'); - } + if (!response.ok) throw new Error('Error al eliminar el quiz'); + this.quizzes = this.quizzes.filter((q) => q.id !== quiz.id); + + } catch (error) { + Swal.fire({ + title: 'Error', + text: 'No se pudo eliminar el registro.', + icon: 'error', + confirmButtonText: 'Entendido', + }); } - } catch (error) { - console.error('Error en la solicitud:', error); - Swal.fire('Error', 'Hubo un error en la solicitud.', 'error'); } - } + } editQuiz(quiz: Quiz) { this.selectedQuiz = quiz; From 8783272ceb427e94f2001ec1f9bea4cc123d7af4 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Sun, 24 Nov 2024 14:18:32 -0500 Subject: [PATCH 168/203] este commit es el fronton new con error --- package-lock.json | 262 ++++++++++++------ package.json | 1 + .../pages/new-pages/new-pages.component.html | 3 +- .../pages/new-pages/new-pages.component.scss | 8 +- .../pages/new-pages/new-pages.component.ts | 2 +- src/environments/environment.ts | 2 +- 6 files changed, 187 insertions(+), 91 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d5fda7..2f9e593 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,6 +35,7 @@ "rxjs": "~7.8.1", "sweetalert2": "^11.14.3", "tslib": "^2.5.0", + "webpack": "^5.96.1", "zone.js": "~0.14.0" }, "devDependencies": { @@ -611,6 +612,33 @@ "node": ">=12" } }, + "node_modules/@angular-devkit/build-angular/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "ajv": "^6.9.1" + } + }, "node_modules/@angular-devkit/build-angular/node_modules/esbuild": { "version": "0.20.1", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz", @@ -651,6 +679,63 @@ "@esbuild/win32-x64": "0.20.1" } }, + "node_modules/@angular-devkit/build-angular/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@angular-devkit/build-angular/node_modules/schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, "node_modules/@angular-devkit/build-angular/node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", @@ -658,6 +743,67 @@ "dev": true, "license": "0BSD" }, + "node_modules/@angular-devkit/build-angular/node_modules/webpack": { + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", + "acorn": "^8.7.1", + "acorn-import-attributes": "^1.9.5", + "browserslist": "^4.21.10", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.17.1", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.11", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/watchpack": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/@angular-devkit/build-webpack": { "version": "0.1703.10", "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.10.tgz", @@ -3899,7 +4045,6 @@ "version": "0.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.2.1", @@ -3914,7 +4059,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -3924,7 +4068,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -3934,7 +4077,6 @@ "version": "0.3.6", "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -3945,14 +4087,12 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -5266,11 +5406,30 @@ "@types/node": "*" } }, + "node_modules/@types/eslint": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", + "license": "MIT", + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "license": "MIT", + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true, "license": "MIT" }, "node_modules/@types/express": { @@ -5340,7 +5499,6 @@ "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true, "license": "MIT" }, "node_modules/@types/mime": { @@ -5719,7 +5877,6 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", - "dev": true, "license": "MIT", "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", @@ -5730,28 +5887,24 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-buffer": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", - "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", - "dev": true, "license": "MIT", "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.6", @@ -5763,14 +5916,12 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-wasm-section": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", - "dev": true, "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -5783,7 +5934,6 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dev": true, "license": "MIT", "dependencies": { "@xtuc/ieee754": "^1.2.0" @@ -5793,7 +5943,6 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", - "dev": true, "license": "Apache-2.0", "dependencies": { "@xtuc/long": "4.2.2" @@ -5803,14 +5952,12 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/wasm-edit": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", - "dev": true, "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -5827,7 +5974,6 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", - "dev": true, "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -5841,7 +5987,6 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", - "dev": true, "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -5854,7 +5999,6 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", - "dev": true, "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -5869,7 +6013,6 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", - "dev": true, "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -5880,14 +6023,12 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, "license": "BSD-3-Clause" }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, "license": "Apache-2.0" }, "node_modules/@yarnpkg/lockfile": { @@ -5956,10 +6097,9 @@ } }, "node_modules/acorn": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz", - "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==", - "dev": true, + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -6598,7 +6738,6 @@ "version": "4.24.0", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", - "dev": true, "funding": [ { "type": "opencollective", @@ -6656,7 +6795,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, "license": "MIT" }, "node_modules/bytes": { @@ -6801,7 +6939,6 @@ "version": "1.0.30001669", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz", "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==", - "dev": true, "funding": [ { "type": "opencollective", @@ -6879,7 +7016,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.0" @@ -7060,7 +7196,6 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, "license": "MIT" }, "node_modules/common-path-prefix": { @@ -7943,7 +8078,6 @@ "version": "1.5.39", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.39.tgz", "integrity": "sha512-4xkpSR6CjuiaNyvwiWDI85N9AxsvbPawB8xc7yzLPonYTuP19BVgYweKyUMFtHEZgIcHWMt1ks5Cqx2m+6/Grg==", - "dev": true, "license": "ISC" }, "node_modules/emoji-regex": { @@ -8060,7 +8194,6 @@ "version": "5.17.1", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", - "dev": true, "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", @@ -8176,7 +8309,6 @@ "version": "1.5.4", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", - "dev": true, "license": "MIT" }, "node_modules/esbuild": { @@ -8650,7 +8782,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" @@ -8663,7 +8794,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -8700,7 +8830,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.8.x" @@ -8899,7 +9028,6 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, "license": "MIT" }, "node_modules/fast-glob": { @@ -8923,7 +9051,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, "license": "MIT" }, "node_modules/fast-levenshtein": { @@ -9458,7 +9585,6 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true, "license": "BSD-2-Clause" }, "node_modules/glob/node_modules/brace-expansion": { @@ -9533,7 +9659,6 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, "license": "ISC" }, "node_modules/graphemer": { @@ -10700,7 +10825,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", @@ -10715,7 +10839,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -10725,7 +10848,6 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -11322,7 +11444,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.11.5" @@ -11602,7 +11723,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, "license": "MIT" }, "node_modules/merge2": { @@ -11669,7 +11789,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -11679,7 +11798,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "license": "MIT", "dependencies": { "mime-db": "1.52.0" @@ -12221,7 +12339,6 @@ "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true, "license": "MIT" }, "node_modules/nice-napi": { @@ -12390,7 +12507,6 @@ "version": "2.0.18", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", - "dev": true, "license": "MIT" }, "node_modules/nopt": { @@ -13493,7 +13609,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", - "dev": true, "license": "ISC" }, "node_modules/picomatch": { @@ -14021,7 +14136,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" @@ -14590,7 +14704,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, "funding": [ { "type": "github", @@ -14824,7 +14937,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "dev": true, "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" @@ -15225,7 +15337,6 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", @@ -15236,7 +15347,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -15532,7 +15642,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -15633,7 +15742,6 @@ "version": "5.29.1", "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz", "integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==", - "dev": true, "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -15652,7 +15760,6 @@ "version": "5.3.10", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.20", @@ -15687,7 +15794,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -15704,7 +15810,6 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, "license": "MIT", "peerDependencies": { "ajv": "^6.9.1" @@ -15714,14 +15819,12 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, "license": "MIT" }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", @@ -16126,7 +16229,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", - "dev": true, "funding": [ { "type": "opencollective", @@ -16157,7 +16259,6 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" @@ -16167,7 +16268,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -16774,19 +16874,18 @@ } }, "node_modules/webpack": { - "version": "5.94.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", - "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", - "dev": true, + "version": "5.96.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz", + "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==", "license": "MIT", "dependencies": { - "@types/estree": "^1.0.5", + "@types/eslint-scope": "^3.7.7", + "@types/estree": "^1.0.6", "@webassemblyjs/ast": "^1.12.1", "@webassemblyjs/wasm-edit": "^1.12.1", "@webassemblyjs/wasm-parser": "^1.12.1", - "acorn": "^8.7.1", - "acorn-import-attributes": "^1.9.5", - "browserslist": "^4.21.10", + "acorn": "^8.14.0", + "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", @@ -16991,7 +17090,6 @@ "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, "license": "MIT", "engines": { "node": ">=10.13.0" @@ -17023,7 +17121,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -17040,7 +17137,6 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, "license": "MIT", "peerDependencies": { "ajv": "^6.9.1" @@ -17050,7 +17146,6 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", @@ -17064,7 +17159,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -17074,21 +17168,18 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, "license": "MIT" }, "node_modules/webpack/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, "license": "MIT" }, "node_modules/webpack/node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", @@ -17107,7 +17198,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", - "dev": true, "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", diff --git a/package.json b/package.json index 75bccc9..b951752 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "rxjs": "~7.8.1", "sweetalert2": "^11.14.3", "tslib": "^2.5.0", + "webpack": "^5.96.1", "zone.js": "~0.14.0" }, "devDependencies": { diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index fead134..40ae748 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,4 +1,3 @@ -
@@ -195,4 +194,4 @@

Define la pregunta {{ questions.length + 1 }}/10

- + \ No newline at end of file diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index 577ab13..abb6fab 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -137,7 +137,13 @@ align-items: center; justify-content: space-around; } - +// .question-progress { +// font-size: 14px; +// color: #666; +// padding: 4px 8px; +// border-radius: 4px; +// background-color: #f5f5f5; +// } .custom-label { font-family: Poppins; font-weight: 500; diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 06712d8..ca2fa64 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -366,4 +366,4 @@ export class NewPagesComponent { this.showPlus = false; } } -} +} \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 1e2305f..2aa6f49 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,5 +8,5 @@ export const environment = { redirect_uri: 'http://localhost:4200', }, }, - url: 'https://challenge-be-testing.onrender.com' + url: 'http://localhost:3000' }; From 163dbfa9d77cb0d6d3c75438e7be96b1f8f566e1 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Sun, 24 Nov 2024 15:39:02 -0500 Subject: [PATCH 169/203] creacion de quiz con 10 preguntas anidadas sin mergue de development --- .../pages/home-page/home-page.component.html | 18 +- .../pages/home-page/home-page.component.scss | 23 ++ .../pages/home-page/home-page.component.ts | 43 ++- .../pages/new-pages/new-pages.component.html | 245 ++++++++---------- .../pages/new-pages/new-pages.component.ts | 199 +++++--------- .../welcome-page/welcome-page.component.scss | 2 +- src/environments/environment.ts | 2 +- 7 files changed, 254 insertions(+), 278 deletions(-) diff --git a/src/app/modules/home/pages/home-page/home-page.component.html b/src/app/modules/home/pages/home-page/home-page.component.html index bb72a37..f03c096 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.html +++ b/src/app/modules/home/pages/home-page/home-page.component.html @@ -1,6 +1,16 @@
- - - - +
+
+ +
+
+ Bienvenido, {{ user.name }} +
+ Foto de perfil +
+
+
diff --git a/src/app/modules/home/pages/home-page/home-page.component.scss b/src/app/modules/home/pages/home-page/home-page.component.scss index c4f3f41..4f0b3d8 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.scss +++ b/src/app/modules/home/pages/home-page/home-page.component.scss @@ -28,6 +28,29 @@ justify-content: space-around; transition: width 0.3s ease; /* Suaviza la transición */ } +.profile-picture { + width: 50px; + height: 50px; + border-radius: 50%; + object-fit: cover; +} +.Bienvenida{ +width: auto; +height: auto; +display: flex; +justify-content: center; +align-items: center; +font-size: xx-large; +font-weight:600; + +} +.hidden { + display: none; +} +.mensaje{ + align-self: baseline; + margin: 3%; +} /* @media (max-width: 767px) { .sidebar-container { diff --git a/src/app/modules/home/pages/home-page/home-page.component.ts b/src/app/modules/home/pages/home-page/home-page.component.ts index 6485210..f80c3d3 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.ts +++ b/src/app/modules/home/pages/home-page/home-page.component.ts @@ -1,16 +1,49 @@ -import { Component } from '@angular/core'; +import { Component, AfterViewInit } from '@angular/core'; +import { Observable, fromEvent } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; +import { AuthService } from '@auth0/auth0-angular'; + @Component({ selector: 'app-home-page', templateUrl: './home-page.component.html', - styleUrl: './home-page.component.scss' + styleUrls: ['./home-page.component.scss'], }) -export class HomePageComponent { - user: string = ''; // Aquí puedes cambiar dinámicamente el nombre del usuario +export class HomePageComponent implements AfterViewInit{ + user$ = this.auth.user$ + isMessageHidden = false; + activeSection = 'Todos'; // Sección activa por defecto - activeSection = 'Todos'; // Sección activa por defecto + constructor(private auth: AuthService) {} setActiveSection(section: string) { this.activeSection = section; } + ngAfterViewInit() { + + const welcomeElement = document.getElementById('welcome'); + + if (welcomeElement) { + + fromEvent(welcomeElement, 'click') + .pipe(debounceTime(200)) + .subscribe(() => { + this.isMessageHidden = true; + }); + + + const routerOutlet = welcomeElement.querySelector('router-outlet'); + if (routerOutlet) { + + const observer = new MutationObserver(() => { + this.isMessageHidden = true; + }); + + observer.observe(routerOutlet, { + childList: true, + subtree: true + }); + } + } + } } diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index fead134..704e684 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -1,12 +1,7 @@ -
- -
-
-
+
- + [mode]="toggle"> +
- - -
-
- -
- +
+
+ +
-
-

Define la pregunta {{ questions.length + 1 }}/10

- - -
-
- - -
- -
-
-
-
- +
+

Define la pregunta {{ questions.length + 1 }}/10

+ +
+
+ +
+ +
- - - - -
-
- - - -
-
-
- -
- - +
+
+
- + id="questionText" + class="custom-input" + name="questionText" + placeholder="Escribe una pregunta" + [(ngModel)]="questionText" + required />
- - - +
-
-
- +
+
+
+
+ + +
+
- -
- -
-
- + +
+
+ +
+
-
-
-
- -
- +
+ +
+ +
-
- - - + + + + + + +
\ No newline at end of file diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 06712d8..8046197 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -14,19 +14,14 @@ export class NewPagesComponent { constructor( private formsBuilder: FormBuilder, private cdr: ChangeDetectorRef, - private auth:AuthService - + private auth: AuthService ) {} + public selectNameForm = this.formsBuilder.group({ name: ['', Validators.required], description: ['', Validators.required], }); - isFieldInvalid(field: string): boolean { - const control = this.selectNameForm.get(field); - return control?.invalid && (control.dirty || control.touched); - } - questionTypes: string[] = [ 'Selección mutiple', 'Casilla', @@ -39,7 +34,7 @@ export class NewPagesComponent { }; questionText: string = ''; - questions: any = []; + questions: any[] = []; // Cambiado a array tipado options: string[] = []; selection: number[] = []; selectedOption: string = ''; @@ -50,7 +45,7 @@ export class NewPagesComponent { isTrueFalseQuestion: boolean = false; showPlus: boolean = false; showSubmits: boolean = false; - quizID: number | string = ''; + quizID: string = ''; quizData: any = {}; createOrEdit: boolean = true; toggle: boolean = true; @@ -58,6 +53,12 @@ export class NewPagesComponent { correct_option: number[] = []; selectedValues: boolean[] = []; inputsValues: boolean = false; + temporaryQuestions: any[] = []; // Array para almacenar preguntas temporalmente + + isFieldInvalid(field: string): boolean { + const control = this.selectNameForm.get(field); + return control?.invalid && (control.dirty || control.touched); + } trackByFn(index: number): any { return index; @@ -73,13 +74,14 @@ export class NewPagesComponent { } else { this.correct_option.push(i); } - console.log(this.correct_option); } + showInput: boolean = true; selectedRadio: string | null = null; + changeInputType() { this.selectedValues = Array(this.options.length).fill(false); - this.selectedRadio = null; // Reinicia la selección de radio + this.selectedRadio = null; this.showInput = false; setTimeout(() => { this.showInput = true; @@ -137,25 +139,18 @@ export class NewPagesComponent { this.showButton = false; } - /* modulo */ - let responseModule: any = await fetch(`${environment.url}/modules`); responseModule = await responseModule.json(); - responseModule = responseModule.find( element => element.name == datos.module ); - this.quizData.module = responseModule.id; - /* celula */ - let response: any = await fetch(`${environment.url}/cells`); response = await response.json(); response = response.find(element => datos.cell == element.name); response ? (this.quizData.cell = response.id) : ''; - /* seniority */ if (datos.seniority) { this.quizData.seniority = datos.seniority; } @@ -163,124 +158,61 @@ export class NewPagesComponent { async createQuiz() { try { - // Ajustamos la seniority si es necesario this.quizData.seniority = this.quizData.seniority === 'semi-sr' ? 'middle' : this.quizData.seniority; - - // Obtener el email del usuario autenticado const user = await firstValueFrom(this.auth.user$); - + if (!user?.email) { throw new Error('No se encontró el email del usuario autenticado'); } - - // Obtener el ID del usuario desde el backend usando el email + const userResponse = await fetch(`${environment.url}/user/FindByEmail?email=${user.email}`, { method: 'GET', headers: { 'Content-Type': 'application/json', - }, }); - + if (!userResponse.ok) { throw new Error('Error al obtener el usuario desde el backend'); } - + const userData = await userResponse.json(); if (!userData?.id) { throw new Error('No se encontró el ID del usuario en la base de datos'); } - - // Crear el objeto del quiz con el ID del usuario obtenido - const quizData = { + + // Mostrar el formulario para agregar preguntas + this.showForm = true; + this.toggle = false; + this.showButton = false; + + // Guardar los datos del quiz para usarlos cuando tengamos todas las preguntas + this.quizData = { name: this.selectNameForm.value.name, description: this.selectNameForm.value.description, cell_id: this.quizData.cell, seniority: this.quizData.seniority, challenge_type: 'immediate', - created_by_id: userData.id, // Usamos el ID obtenido dinámicamente - is_active: true, + created_by_id: userData.id, + is_active: true }; - - // Validar que los campos requeridos estén completos - if (!this.selectNameForm.value.description || !this.selectNameForm.value.name) { - alert('Complete los datos requeridos'); - this.showButton = false; - return; - } - - // Crear el quiz - const response = await fetch(`${environment.url}/quiz`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(quizData), - }); - - if (!response.ok) { - throw new Error(`Error al crear el quiz: ${response.statusText}`); - } - - const data = await response.json(); - - // Actualizar el estado del componente - this.quizID = data.id; - this.showForm = true; - this.toggle = false; - this.showButton = false; - this.pop = true; - - setTimeout(() => { - this.closeFn(); - }, 2000); - + this.questionCategory.name = this.selectNameForm.value.name; this.questionCategory.description = this.selectNameForm.value.description; - + } catch (error) { - console.error('Error creando el quiz:', error); - alert(error.message || 'Error al crear el quiz'); + console.error('Error preparando el quiz:', error); + alert(error.message || 'Error al preparar el quiz'); this.showButton = false; } } - - - - async updateQuiz() { - const update = { - name: this.selectNameForm.value.name, - description: this.selectNameForm.value.description, - cell_id: this.quizData.cell, - seniority: this.quizData.seniority, - }; - let response = await fetch(`${environment.url}/quiz/${this.quizID}`, { - method: 'PUT', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(update), - }); - response = await response.json(); - this.showButton = false; - this.pop = true; - setTimeout(() => { - this.pop = false; - }, 2000); - this.showForm = true; - this.questionCategory.name = this.selectNameForm.value.name; - this.questionCategory.description = this.selectNameForm.value.description; - } - - isDisabled(index: number): any { - return this.selection[index] || false; - } async createQuestion(form: any) { try { const formSection = form.value; + // Convertir tipo de pregunta switch (formSection.questionType) { case 'Selección mutiple': formSection.questionType = 'multiple_choice'; @@ -293,8 +225,8 @@ export class NewPagesComponent { break; } - if (formSection.questionText && this.correct_option.length != 0) { - let question = { + if (formSection.questionText && this.correct_option.length !== 0) { + const question = { question: formSection.questionText, seniority: 'junior', type: formSection.questionType, @@ -309,40 +241,49 @@ export class NewPagesComponent { correct_option: this.correct_option, explanation: 'string', link: 'string', - is_active: true, - /* quiz_id: '168b2a93-7358-48cb-951a-793281c35983', */ - quiz_id: this.quizID, + is_active: true }; - const response = await fetch(`${environment.url}/question`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(question), - }); - - const data = await response.json(); - if (!response.ok) { - alert(response); - throw new Error(`Error: ${response.status}`); - } - - console.log(data); - this.questions.push(formSection); + this.temporaryQuestions.push(question); + this.questions.push(formSection); // Para mantener el contador en la UI form.reset(); this.selectedOption = ''; this.isFocused = false; this.options = []; - } else { - alert('complete los campos requeridos'); - console.log(this.correct_option); - } - if (this.questions.length == 10000) { - alert('10 preguntas cargadas con exito'); - window.location.reload(); + // Si tenemos 10 preguntas, crear el quiz con todas las preguntas + if (this.temporaryQuestions.length === 10) { + const quizWithQuestions = { + ...this.quizData, + questions: this.temporaryQuestions + }; + this.showForm = false; + + const response = await fetch(`${environment.url}/quiz/nested`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(quizWithQuestions), + }); + + if (!response.ok) { + throw new Error(`Error: ${response.status}`); + } + + const data = await response.json(); + this.quizID = data.id; + this.pop = true; + + + // setTimeout(() => { + // this.closeFn(); + // window.location.reload(); + // }, 2000); + } + } else { + alert('Complete los campos requeridos'); } } catch (error) { alert(error); @@ -366,4 +307,4 @@ export class NewPagesComponent { this.showPlus = false; } } -} +} \ No newline at end of file diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss index af2d833..b828138 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.scss @@ -10,7 +10,7 @@ justify-content: center; gap: 3px; box-shadow: 0px 4px 4px 0px #718ee3, 0px 4px 4px 0px #00000040; - + cursor: pointer; z-index: 999; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 2aa6f49..1e2305f 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,5 +8,5 @@ export const environment = { redirect_uri: 'http://localhost:4200', }, }, - url: 'http://localhost:3000' + url: 'https://challenge-be-testing.onrender.com' }; From d49b3e342516f3657dac2868c622b4a95f004e67 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Sun, 24 Nov 2024 23:20:52 -0300 Subject: [PATCH 170/203] add module crud --- .../pages/all-page/all-page.component.html | 4 +- .../pages/all-page/all-page.component.scss | 167 ++++++++++++------ .../all/pages/all-page/all-page.component.ts | 67 ++++--- .../header-page/header-page.component.html | 40 ++++- .../header-page/header-page.component.ts | 28 ++- 5 files changed, 201 insertions(+), 105 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 119950d..c760972 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -58,5 +58,7 @@

Todos los Quiz

- + +
diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index c108a31..2f86aea 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -1,40 +1,47 @@ +$background-color: #2a2a2a; +$shadow-color: rgba(0, 217, 255, 0.4); +$input-bg-color: #333; +$text-color: #fff; +$border-radius: 12px; +$transition-time: 0.3s; +$spacing: 20px; + + .quiz-dashboard { padding: 20px; + background-color: #1e1e1e; color: #fff; height: 95vh; - width: 150vh; + width: 150vh; border-radius: 12px; padding: 24px 8px 8px 8px; - gap: 47px; + gap: 47px; opacity: 0px; - overflow: auto; + overflow: auto; margin-block: 2.5vh; - background-color: rgb(53, 52, 52); - - border: 2px solid rgba(241, 121, 197, 1); - // background-image: url('../../../../../assets/layout/images/logo.svg'); - // background-repeat: no-repeat; - // background-position: center; - // background-size: 180px; } -.table-sup { +.table-sup{ font-family: Poppins; font-size: 16px; font-weight: 400; line-height: 24px; letter-spacing: 0.20000000298023224px; text-align: center; - background: rgba(27, 27, 27, 0.5); + } -.table-int { - margin: 0 auto; - flex: auto; - background: rgba(27, 27, 27, 0.5); +.table-int{ + margin: 0 auto; + flex: auto; + + + } h2 { color: #fff; font-size: 1.5rem; margin: 0; + + } .filters { @@ -44,8 +51,7 @@ h2 { } .filters select { - background-color: rgba(53, 52, 52, 0.5); - + background-color: #333; border: 1px solid #444; padding: 10px; color: #fff; @@ -53,10 +59,9 @@ h2 { width: 30%; } -.search-container { +.search-container { top: 0; - background-color: rgba(53, 52, 52, 0.5); - + background-color: #1e1e1e; padding: 10px 20px; display: flex; justify-content: space-between; @@ -65,8 +70,7 @@ h2 { } .search-container input { - background-color: rgba(53, 52, 52, 0.5); - + background-color: #333; border: 1px solid #444; padding: 8px; color: #fff; @@ -108,16 +112,16 @@ h2 { width: 100%; border-collapse: collapse; margin-top: 10px; - background: rgba(27, 27, 27, 0.5); } - .activo { - color: rgba(151, 71, 255, 1); + color:rgba(151, 71, 255, 1); + ; + font-weight: bold; } .inactivo { - color: red; - font-weight: normal; + color: red; + font-weight: normal; } .input-wrapper { @@ -128,57 +132,103 @@ h2 { .input-wrapper i { position: absolute; - left: 10px; + left: 10px; top: 50%; transform: translateY(-50%); - color: #aaa; + color: #aaa; } .custom-popup { - background-color: rgba(53, 52, 52, 0.5) !important; - - color: #fff !important; - border-radius: 15px !important ; + background-color: #1f1f1f; + color: #fff; + border-radius: 15px; } .custom-title { - font-size: 20px !important; - font-weight: bold !important; - color: #fff !important; + font-size: 20px; + font-weight: bold; + color: #fff; } .custom-content { - font-size: 14px !important; - color: #cccccc !important; + font-size: 14px; + color: #cccccc; } .custom-confirm-btn { - background-color: #6c63ff !important; - border-radius: 10px !important; - color: #fff !important; - padding: 10px 20px !important; + background-color: #6c63ff; + border-radius: 10px; + color: #fff; + padding: 10px 20px; } .custom-cancel-btn { - background-color: #4e4e4e !important; - border-radius: 10px !important; - color: #fff !important; - padding: 10px 20px !important; + background-color: #4e4e4e; + border-radius: 10px; + color: #fff; + padding: 10px 20px; } .input-wrapper input { - padding-left: 35px; - width: 100%; + padding-left: 35px; + width: 100%; } -.quiz-table th, -.quiz-table td { +.quiz-table th, .quiz-table td { padding: 10px; text-align: left; border-bottom: 1px solid #444; - background-color: rgba(53, 52, 52, 0.5); +} + +.quiz-table th { + background-color: #333; + +} +::ng-deep .custom-delete-popup { + background-color: #1e1e1e; + color: #fff; + border-radius: 50px; + padding: 24px 24px 24px 24px; +} + +::ng-deep .custom-delete-title { + font-size: 24px; + padding: 0px 8px; + text-align: center; + opacity: 1; +} + +::ng-deep .custom-delete-confirm-button { + background: rgba(106, 95, 255, 1); + color: #fff; + font-size: 18px; + padding: 12px 24px; + border-radius: 16px; + box-shadow: none; + outline: none; + transition: background-color 0.3s ease; +} + +::ng-deep .custom-delete-confirm-button:hover { + background-color: #5a47cc; +} + +::ng-deep .swal2-close { + color: #fff; + font-size: 20px; +} + +::ng-deep .custom-delete-content { + padding: 24px 0 0 0; + gap: 24px; +} + + +.quiz-table td { + background-color: #222; text-align: center; // Centrar el texto horizontalmente - padding: 12px; // Espacio alrededor del texto - font-family: 'Poppins'; + padding: 12px; // Espacio alrededor del texto + font-family: "Poppins"; + } .actions button { @@ -187,17 +237,18 @@ h2 { border: none; cursor: pointer; color: white; + + + } .status { font-weight: bold; - transition: .5s ease-in-out; -} -.status:hover{ - cursor: pointer; } + .status.Activo { color: rgba(151, 71, 255, 1); + ; } .status.Inactivo { diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index ba5e061..99d31af 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -48,10 +48,11 @@ interface Quiz { }) export class AllPageComponent implements OnInit { @Output() quizSelected = new EventEmitter(); - searchText: string = ''; - seniority: string = ''; module: string = ''; cell: string = ''; + seniority: string = ''; + searchText: string = ''; + quizzes: Quiz[] = []; selectedQuiz: any; isExpanded3: boolean = false; @@ -118,44 +119,38 @@ export class AllPageComponent implements OnInit { this.router.navigate(['home/view-quiz', quiz.id]); } - async deleteQuiz(quiz: any) { - try { - const result = await Swal.fire({ - title: '¿Deseas eliminar el registro?', - text: 'Una vez eliminado no se podrá recuperar', - showCancelButton: true, - confirmButtonColor: '#6c63ff', - cancelButtonColor: '#4e4e4e', - confirmButtonText: 'Eliminar', - cancelButtonText: 'Cancelar', - customClass: { - popup: 'custom-popup', - title: 'custom-title', - confirmButton: 'custom-confirm-btn', - cancelButton: 'custom-cancel-btn' - } - }); - - if (result.isConfirmed) { - let response = await fetch(`${environment.url}/quiz/${quiz.id}`, { + async deleteQuiz(quiz: Quiz) { + const result = await Swal.fire({ + title: '¿Deseas eliminar el registro?', + text: 'Una vez eliminado no se podrá recuperar', + showCloseButton: true, + showCancelButton: false, + confirmButtonText: 'Eliminar', + customClass: { + popup: 'custom-delete-popup', + title: 'custom-delete-title', + confirmButton: 'custom-delete-confirm-button', + }, + }); + + if (result.isConfirmed) { + try { + const response = await fetch(`${environment.url}/quiz/${quiz.id}`, { method: 'DELETE', - headers: { - 'Content-Type': 'application/json', - } }); - - if (response.ok) { - Swal.fire('Eliminado', 'El quiz ha sido eliminado.', 'success'); - this.quizzes = this.quizzes.filter(q => q !== quiz); - } else { - Swal.fire('Error', 'Hubo un error al eliminar el quiz.', 'error'); - } + if (!response.ok) throw new Error('Error al eliminar el quiz'); + this.quizzes = this.quizzes.filter((q) => q.id !== quiz.id); + + } catch (error) { + Swal.fire({ + title: 'Error', + text: 'No se pudo eliminar el registro.', + icon: 'error', + confirmButtonText: 'Entendido', + }); } - } catch (error) { - console.error('Error en la solicitud:', error); - Swal.fire('Error', 'Hubo un error en la solicitud.', 'error'); } - } + } editQuiz(quiz: Quiz) { this.selectedQuiz = quiz; diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index 6a2c50c..60d75d1 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -16,12 +16,42 @@

Módulo

- + @if (editingModuleId === module.id) { +
+ + @if(editModuleControl?.errors?.['required']) { + (El módulo no puede quedar vacío) + } + @if(editModuleControl?.errors?.['minlength']) { + (Debe tener como mínimo 3 caracteres) + } +
+ + +
+ } @else { + {{ module.name }} + @if(editMode){ +
+ + +
+ } } } diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index bfa21d0..3592b91 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -35,6 +35,8 @@ export class HeaderPageComponent { addCell: boolean = false; //campos de formulario module= new FormControl('',[Validators.required, Validators.minLength(3)]); + editModuleControl= new FormControl('',[Validators.required, Validators.minLength(3)]); + editingModuleId: string | null = null; cell= new FormControl('',[Validators.required, Validators.minLength(3)]); //seleccion actual de modulo celula y seniority quizCategory: any = { @@ -44,7 +46,6 @@ export class HeaderPageComponent { cellClass: '', }; - ngOnInit(): void { //Consulta los modulos y las celullas que tiene anidadas this.getCategory() @@ -93,12 +94,29 @@ export class HeaderPageComponent { }); } } - //actualiza un modulo - updateModule(id:string) { - if (this.module.valid) { - this.headerPageService.updateModule(id, this.module.value).subscribe() + // Método para iniciar la edición + startEditingModule(event: Event, moduleId: string, currentName: string) { + event.stopPropagation(); + this.editingModuleId = moduleId; + this.editModuleControl.setValue(currentName); + } + // Método para guardar los cambios + saveModuleEdit(moduleId: string) { + if (this.editModuleControl.valid) { + const newName = this.editModuleControl.value; + this.headerPageService.updateModule(moduleId, newName).subscribe() + // Resetear el estado de edición + this.editingModuleId = null; + this.editModuleControl.reset(); + } } + + // Método para cancelar la edición + cancelEditingModule() { + this.editingModuleId = null; + this.editModuleControl.reset(); } + //elimina un modulo deleteModule(id: string) { this.headerPageService.deleteModule(id).pipe( From fc97b032a22a42643b4f8ace4a6889ec4a8fd831 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Sun, 24 Nov 2024 22:07:17 -0500 Subject: [PATCH 171/203] modificaciones edit page --- .../edit-pages/edit-pages.component.html | 40 +++++++++++-------- .../pages/edit-pages/edit-pages.component.ts | 19 ++++----- src/environments/environment.ts | 2 +- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index 6fb3e76..c45a999 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -36,7 +36,9 @@

{{ selectNameForm.value.name }}

-
+
{{ selectNameForm.value.name }} .
- -
- -
+ +
- +
- +
- +
Editar pregunta required />
- +
@@ -231,7 +239,7 @@

Editar pregunta

[readonly]="isTrueFalseQuestion" required />
- +
@@ -239,7 +247,7 @@

Editar pregunta

- +
- @if (showModulo) {
@for (module of modules; track $index) { @@ -98,15 +97,81 @@

Célula

{{ quizCategory?.cell || 'Selecciona la célula'}}
- @if (showCelula && cells.length > 0) { + @if (showCelula && quizCategory.module != '') {
@for (cell of cells;track $index) { + +
+
+ } @else { + {{ cell.name }} + @if(editMode){ +
+ + +
+ } + } + } + @if (editMode) { + @if (!addCell) { + + } + @else { +
+ + @if(cell?.errors?.['required']) { + (La célula no puede quedar vacía) + } + @if(cell?.errors?.['minlength']) { + (Debe tener como mínimo 3 caracteres) + } +
+ + +
+
+ } }
} diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index 3592b91..b51c715 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -38,9 +38,12 @@ export class HeaderPageComponent { editModuleControl= new FormControl('',[Validators.required, Validators.minLength(3)]); editingModuleId: string | null = null; cell= new FormControl('',[Validators.required, Validators.minLength(3)]); + editCellControl= new FormControl('',[Validators.required, Validators.minLength(3)]); + editingCellId: string | null = null; //seleccion actual de modulo celula y seniority quizCategory: any = { module: '', + moduleId: '', cell: '', seniority: '', cellClass: '', @@ -59,7 +62,8 @@ export class HeaderPageComponent { } //coloca el modulo como seleccionado y carga las celulas que le corresponden selectModule(module: Module) { - this.quizCategory.module = module.name + this.quizCategory.module = module.name; + this.quizCategory.moduleId = module.id; this.cells = module.cell; this.quizCategory.cell= '' this.quizCategory.cellClass= '' @@ -83,7 +87,7 @@ export class HeaderPageComponent { createModule() { if (this.module.valid) { this.headerPageService.createModule(this.module.value).subscribe({ - next: (newModule) => { + next: () => { this.getCategory() this.toggleAddModule() }, @@ -131,6 +135,86 @@ export class HeaderPageComponent { } }); } + //Crea una nueva celula + createCell() { + if (this.cell.valid && this.quizCategory.moduleId) { + this.headerPageService.createCell(this.cell.value, this.quizCategory.moduleId).pipe( + switchMap(() => { + // Una vez que termine la creacion, obtener la lista actualizada + return this.headerPageService.getModules();}) + ).subscribe({ + next: (response: any) => { + this.modules = response; + this.toggleAddCell() + for (const module of this.modules) { + if (module.name == this.quizCategory.module) + this.cells = module.cell + } + + }, + error: (error) => { + console.error('Error al crear la célula', error); + // Manejar error (mostrar mensaje al usuario) + } + }); + } + } + // Método para iniciar la edición + startEditingCell(event: Event, cellId: string, currentName: string) { + event.stopPropagation(); + this.editingCellId = cellId; + this.editCellControl.setValue(currentName); + } + // Método para guardar los cambios + saveCellEdit(cellId: string) { + if (this.editCellControl.valid) { + const newName = this.editCellControl.value; + this.headerPageService.updateCell(cellId, newName).pipe( + switchMap(() => { + // Una vez que termine la creacion, obtener la lista actualizada + return this.headerPageService.getModules();}) + ).subscribe({ + next: (response: any) => { + this.modules = response; + for (const module of this.modules) { + if (module.name == this.quizCategory.module) + this.cells = module.cell + } + this.editingCellId = null; + this.editCellControl.reset(); + }, + error: (error) => { + console.error('Error al actualizar la célula', error); + // Manejar error (mostrar mensaje al usuario) + } + }); + } + } + + // Método para cancelar la edición + cancelEditingCell() { + this.editingCellId = null; + this.editCellControl.reset(); + } + + //elimina un modulo + deleteCell(id: string) { + this.headerPageService.deleteCell(id).pipe( + // Esperar a que termine el delete + switchMap(() => { + // Una vez que termine el delete, obtener la lista actualizada + return this.headerPageService.getModules(); + }) + ).subscribe({ + next: (response: any) => { + this.modules = response; + for (const module of this.modules) { + if (module.name == this.quizCategory.module) + this.cells = module.cell + } + } + }); + } //Cambia la visibilidad de modulo, celula y seniority isShowModulo() { this.showModulo = !this.showModulo; diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.service.ts b/src/app/shared/components/header-form/pages/header-page/header-page.service.ts index b0cb261..46e6c68 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.service.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.service.ts @@ -58,10 +58,9 @@ export class HeaderPageService { ) } - updateCell(id: string, name:string, module_id:string) { + updateCell(id: string, name:string) { return this.http.put(`${this.urlApi}/cells/${id}`, { name: name, - module_id: module_id }) } From fbe8af91a0b34d522a0dfb319d2a6bdb27a27155 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Mon, 25 Nov 2024 20:56:09 -0300 Subject: [PATCH 173/203] #49 clickoutside of filter --- .../header-page/header-page.component.html | 8 ++-- .../header-page/header-page.component.ts | 44 +++++++++++++++---- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index a2aaba0..019961c 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -4,13 +4,13 @@

Módulo

-
+
{{quizCategory?.module || 'Selecciona el modulo'}}
@if (showModulo) { -
+
@for (module of modules; track $index) { +
+ + +
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+
+
+ + +
+ +
+ +
+
+ +
+
+
+
+ +
+ +
+ +
+
+
{{ question.get('text').value }}
-
@@ -92,9 +208,6 @@

{{ selectNameForm.value.name }}

option.get('text').value }} -
@@ -102,164 +215,8 @@

{{ selectNameForm.value.name }}

-
-
- - -
- - - - - ... - - - - - - ... - - - -
- - - -
- -
-
-
-

Editar pregunta

- -
- -
-
-
- -
- -
-
- -
-
- -
- -
-
- -
-
-
-
- - -
- -
- -
-
- -
-
-
-
- -
- -
-
-
-
- - +
+
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss index 8033696..bfbf5bd 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss @@ -1,44 +1,46 @@ +$primary-color: magenta; +$secondary-color: darkviolet; +$background-dark: #1e1e1e; +$input-background: #212121; +$border-color: rgba(241, 121, 197, 1); + +// Main Layout .body { display: flex; flex-direction: column; justify-content: center; - background-color: #1e1e1e; + background-color: $background-dark; height: 95vh; padding: 20px; border-radius: 15px; margin-block: 2.5vh; } -.leave { - color: white; - flex: 0 0 33.33%; - transition: 0.3s ease-in-out; - text-decoration: none; -} - -.leave:hover { - cursor: pointer; - color: magenta; -} - -h1 { - color: magenta; - flex: 0 0 33.33%; - text-align: center; - top: 0%; -} - -.empty-space { - flex: 0 0 33.33%; -} - +// Title Section .title { display: flex; align-items: center; justify-content: space-between; - // margin: 1% 3%; + padding: inherit; + + .leave { + color: white; + flex: 0 0 33.33%; + transition: 0.3s ease-in-out; + text-decoration: none; + + &:hover { + cursor: pointer; + color: $primary-color; + } + } + + .empty-space { + flex: 0 0 33.33%; + } } +// Main Content .content-1 { width: 100%; height: 100%; @@ -46,389 +48,147 @@ h1 { background-repeat: no-repeat; background-position: center; background-size: 414px 404px; - background-color: #353434; + background-color: rgba(53, 52, 52, 0.8); + background-blend-mode: overlay; border-radius: 15px; padding: 20px; display: flex; flex-direction: column; - border: 2px solid rgba(241, 121, 197, 1); - box-shadow: 0px 0px 12.8px rgba(241, 121, 197, 1); + border: 2px solid $border-color; + box-shadow: 0px 0px 12.8px $border-color; } -.question { - display: flex; - flex-direction: column; - margin-bottom: 20px; - padding: 15px; - border: 1px solid #444; +// Questions Section +.question-container { + margin-bottom: 2rem; border-radius: 8px; - background-color: #282828; -} -#question-container { - font-size: medium; - font-weight: 300; -} - -input[type='text'], -.custom-option-input { - padding: 10px; - margin-top: 5px; - border: 1px solid #ccc; - border-radius: 5px; - width: 100%; + border: 2.5px solid rgb(61, 36, 160); + position: relative; // Added for popup positioning } -.btn-primary { - background-color: #007bff; - color: white; - padding: 10px 15px; - border: none; - border-radius: 5px; - cursor: pointer; +#questions-scroll { + overflow-y: scroll; } -.btn-primary:hover { - background-color: #0056b3; -} - -.quiz-name-input { - font-size: 24px; - background-color: transparent; - color: white; - border: none; - border-bottom: 2px solid #ccc; - outline: none; - width: 200px; -} - -.quiz-name-input:focus { - border-bottom-color: darkviolet; -} - -button { - padding: 8px 12px; - background-color: #444; - color: white; - border: none; - border-radius: 5px; - cursor: pointer; - transition: background-color 0.3s; - background-color: slateblue; -} -.edit-button { - display: inline-flex; - align-items: center; -background-color: #282828; +// Question Text and Options +.text-question { color: white; - font-size: 14px; - border: none; - border-radius: 5px; - padding: 8px 12px; - cursor: pointer; - transition: - background-color 0.3s, - transform 0.2s; -} - - -.edit-button:hover { - background-color: #373737; - transform: scale(1.05); -} - -.edit-button:focus { - outline: none; - box-shadow: 0 0 0 2px rgba(51, 52, 54, 0.5); -} - -.edit-button:active { - background-color: darkviolet; -} - -button:hover { - background-color: darkviolet; -} - -.buttons { - display: flex; - align-items: center; - justify-content: space-between; - padding: 20%; -} - -/* Estilos para la paginación */ -.pagination-buttons { display: flex; justify-content: space-between; - margin-top: 20px; -} - -.pagination-buttons button { - padding: 10px 20px; - background-color: #444; - color: white; - border: none; - border-radius: 5px; - cursor: pointer; - transition: background-color 0.3s; -} - -.pagination-buttons button:hover { - background-color: darkviolet; -} - -.pagination-buttons button:disabled { - background-color: #888; - cursor: not-allowed; -} - -.buttons { - display: flex; align-items: center; - justify-content: space-around; - padding: 20px 0; - position: relative; - bottom: 0px; - margin-top: auto; -} - -.buttons button { - padding: 10px 15px; - background-color: #444; - color: white; - border: none; - border-radius: 5px; - cursor: pointer; - transition: background-color 0.3s; - background-color: rgb(0, 56, 211); -} - -.buttons button:hover { - background-color: rgb(17, 75, 236); + padding: 10px; } -.buttons button:disabled { - background-color: #888; -} .option-row { - // display: flex; - // flex-wrap: wrap; - // justify-content: space-between; - margin-top: 15px; display: inline; + margin-top: 15px; } .option-item { display: inline-block; - align-items: center; - width: 48%; - margin-bottom: 10px; - border: 1px solid #444; - border-radius: 15px; - background-color: #212121ff; - padding: 10px; - color: white; -} -.text-question { + align-items: center; + width: 48%; + margin-bottom: 10px; + border: 1px solid $input-background; + border-radius: 12px; + background-color: $input-background; + padding: 10px; color: white; - display: flex; - justify-content: space-between; } .option-label { - color: white; -} - -input[type='radio'] { - margin-right: 5px; -} -#pagination { - display: flex; - justify-content: center; - align-items: center; - gap: 1px; -} - -#pagination button { - background-color: #f1f1f1; - border: 1px solid #ccc; - padding: 5px 10px; - cursor: pointer; -} - -.pagination-button .active { - background-color: #007bff; color: white; + margin-left: 5px; } -#pagination button:disabled { - background-color: #ddd; - cursor: not-allowed; -} - -.dot { - background: transparent; +// Edit Button +.edit-button { + background: none; border: none; - font-size: 20px; + color: #6a5fff; cursor: pointer; - color: #ccc; -} + padding: 5px; + transition: color 0.3s ease; -.dot.active { - color: #007bff; + &:hover { + color: #ff5ea6; + } } -/* estilos de paginacion*/ +// Popup Styles +.edit-popup { + position: absolute; + top: 0; + left: 0; + right: 0; + z-index: 1000; + background-color: rgba(0, 0, 0, 0.7); + border-radius: 8px; +} -.pagination-container { - margin-top: auto; - display: flex; - flex-direction: column; - align-items: center; - gap: 1rem; - margin-bottom: auto; +.content-2 { + background-color: rgba(79, 77, 77, 0.95); + border-radius: 8px; + padding: 20px; + margin: 10px; + box-shadow: 0px -3px 12.8px 0px $border-color; - .pagination-controls { + .popup-header { display: flex; + justify-content: space-between; align-items: center; - gap: 15rem; - justify-content: space-around; - - .pagination-button { - padding: 0.8rem 1rem; - border: none; - border-radius: 4px; - cursor: pointer; - width: 84px; - transition: - background-color 0.2s, - transform 0.2s ease; - - &:hover:not(.disabled) { - // background-color: #e0e0e0; - } - - &.disabled { - opacity: 0.5; - // cursor: not-allowed; - } + margin-bottom: 1rem; + color: white; - i { - font-size: 0.875rem; - } + h3 { + margin: 0; } - .save-button{ - border: 2px solid magenta; - } - - .page-numbers { - display: flex; - align-items: center; - gap: 0.5rem; - - .page-number { - padding: 0; - font-size: 50px; - background-color: transparent; - border: none; - color: #434547; - cursor: pointer; - transition: - transform 0.2s ease, - color 0.2s ease; - &:hover { - transform: scale(1.2); - } - - &.active { - color: #000; - opacity: 1; - } - } + .close-button { + background: none; + border: none; + color: white; + cursor: pointer; + font-size: 1.2rem; + padding: 5px; - .ellipsis { - font-size: 20px; - color: #007bff; - margin: 0 0.25rem; + &:hover { + color: #ff5ea6; } } } - - .page-info { - color: #666; - font-size: 0.875rem; - } } -.question-container { - margin-bottom: 2rem; - // padding: 1rem; - // border: 1px solid #e0e0e0; - border-radius: 8px; - // background-color: white; - // box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); - - .question-header { - margin-bottom: 1rem; - .question-number { - font-weight: 500; - color: #666; - } - } -} -.popup-overlay { - position: fixed; - top: 0; - left: 0; +// Form Elements +input[type='text'], +.custom-option-input { + padding: 10px; + margin-top: 5px; + border: 1px solid $input-background; + border-radius: 12px; + background-color: $input-background; width: 100%; - height: 100%; - background-color: rgba(0, 0, 0, 0.5); - display: flex; - justify-content: center; - align-items: center; - z-index: 1000; -} - -.popup-header { - display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 1rem; -} - -.close-button { - background: none; - border: none; color: white; - cursor: pointer; - font-size: 1.2rem; -} - -.close-button:hover { - color: #ff5ea6; } -.content-2 { - position: relative; - background-color: rgba(79, 77, 77); - border-radius: 8px; - padding: 16px; - width: 137vh; - max-height: 90vh; - overflow-y: auto; - box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); +.custom-label { + color: white; + margin-bottom: 5px; + display: block; } -.edit-button { - background: none; +// Save Button +.save-button { + padding: 10px 20px; + background-color: $secondary-color; + color: white; border: none; - color: #6a5fff; + border-radius: 5px; cursor: pointer; - padding: 5px; - transition: color 0.3s ease; -} + transition: background-color 0.3s; + border: 2px solid $primary-color; -.edit-button:hover { - color: #ff5ea6; -} + &:hover { + background-color: darken($secondary-color, 10%); + } +} \ No newline at end of file diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts index bd14288..9206fe0 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts @@ -1,5 +1,10 @@ import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, FormArray, AbstractControl } from '@angular/forms'; +import { + FormBuilder, + FormGroup, + FormArray, + AbstractControl, +} from '@angular/forms'; import { QuizService } from './services/quiz.service'; @Component({ @@ -12,11 +17,9 @@ export class EditPagesComponent implements OnInit { @Output() close = new EventEmitter(); selectNameForm: FormGroup; - currentPage: number = 0; - questionsPerPage: number = 2; - maxVisiblePages: number = 5; showEditForm: boolean = false; currentEditingQuestion: FormGroup | null = null; + currentEditingIndex: number | null = null; selectedOption: string = ''; options: string[] = []; questionTypes: string[] = [ @@ -39,6 +42,7 @@ export class EditPagesComponent implements OnInit { ) { this.selectNameForm = this.formBuilder.group({ name: [''], + description: [''], questions: this.formBuilder.array([]), }); } @@ -56,14 +60,17 @@ export class EditPagesComponent implements OnInit { } this.quizService.getQuizWithQuestions(this.quizId).subscribe({ - next: (quizData) => { + next: quizData => { console.log('Respuesta de la API:', quizData); - this.selectNameForm.patchValue({ name: quizData.name }); + this.selectNameForm.patchValue({ + name: quizData.name, + description: quizData.description, + }); this.populateQuestions(quizData.questions); }, - error: (error) => { + error: error => { console.error('Error al obtener el cuestionario:', error); - } + }, }); } @@ -83,7 +90,7 @@ export class EditPagesComponent implements OnInit { id: [question.id], text: [question.question], type: [question.type], - correct_option: [question.correct_option[0]], + correct_option: [question.correct_option[0]], options: optionsArray, }); }); @@ -97,49 +104,11 @@ export class EditPagesComponent implements OnInit { return this.selectNameForm.get('questions') as FormArray; } - get paginatedQuestions() { - const startIndex = this.currentPage * this.questionsPerPage; - return this.questions.controls.slice( - startIndex, - startIndex + this.questionsPerPage - ); - } - - get totalPages() { - return Math.ceil(this.questions.length / this.questionsPerPage); - } - - get visiblePages(): number[] { - const totalPages = this.totalPages; - const current = this.currentPage; - const maxVisible = this.maxVisiblePages; - - if (totalPages <= maxVisible) { - return Array.from({ length: totalPages }, (_, i) => i); - } - - let start = Math.max(0, current - Math.floor(maxVisible / 2)); - let end = Math.min(totalPages - 1, start + maxVisible - 1); - - if (end - start + 1 < maxVisible) { - start = Math.max(0, end - maxVisible + 1); - } - - return Array.from( - { length: end - start + 1 }, - (_, i) => start + i - ); - } - - get showFirstPage(): boolean { - return this.visiblePages[0] > 0; - } - - get showLastPage(): boolean { - return this.visiblePages[this.visiblePages.length - 1] < this.totalPages - 1; - } - - handleOptionSelection(questionIndex: number, optionIndex: number, event: any) { + handleOptionSelection( + questionIndex: number, + optionIndex: number, + event: any + ) { const question = this.questions.at(questionIndex); const options = question.get('options') as FormArray; const questionType = question.get('type')?.value; @@ -168,7 +137,7 @@ export class EditPagesComponent implements OnInit { if (question.get('type')?.value === 'true_false') { const correctOption = optionValue === 'Verdadero' ? 0 : 1; question.patchValue({ - correct_option: correctOption + correct_option: correctOption, }); } } @@ -178,11 +147,12 @@ export class EditPagesComponent implements OnInit { const updatedQuiz = { id: this.quizId, name: formValue.name, + description: formValue.description, questions: formValue.questions.map(question => { if (question.type === 'true_false') { return { ...question, - correct_option: [question.correct_option], // Convertir a array + correct_option: [question.correct_option], }; } return question; @@ -190,43 +160,28 @@ export class EditPagesComponent implements OnInit { }; this.quizService.updateQuiz(this.quizId, updatedQuiz).subscribe({ - next: (response) => { + next: response => { console.log('Cambios guardados para el quiz:', response); this.close.emit(); }, - error: (error) => { + error: error => { console.error('Error al guardar cambios:', error); - } + }, }); } - goToPage(page: number) { - if (page >= 0 && page < this.totalPages) { - this.currentPage = page; - } - } - - nextPage() { - this.goToPage(this.currentPage + 1); - } - - prevPage() { - this.goToPage(this.currentPage - 1); - } - trackByFn(index: number): number { return index; } - // Show Edit Popup for editing question showEditPopup(questionIndex: number) { const question = this.questions.at(questionIndex) as FormGroup; this.currentEditingQuestion = question; + this.currentEditingIndex = questionIndex; this.showEditForm = true; - - // Set initial values based on question type + const type = question.get('type')?.value; - switch(type) { + switch (type) { case 'multiple_choice': this.selectedOption = 'Selección mutiple'; this.inputType = 'checkbox'; @@ -241,16 +196,18 @@ export class EditPagesComponent implements OnInit { break; } - // Set options const optionsArray = question.get('options') as FormArray; - this.options = optionsArray.controls.map((control: AbstractControl) => control.get('text')?.value); - - // Set correct options + this.options = optionsArray.controls.map( + (control: AbstractControl) => control.get('text')?.value + ); + if (type === 'true_false') { - this.correct_option = [question.get('correct_option')?.value === 'Verdadero' ? 0 : 1]; + this.correct_option = [ + question.get('correct_option')?.value === 'Verdadero' ? 0 : 1, + ]; } else { this.correct_option = optionsArray.controls - .map((control, index) => control.get('selected')?.value ? index : -1) + .map((control, index) => (control.get('selected')?.value ? index : -1)) .filter(index => index !== -1); } @@ -260,16 +217,15 @@ export class EditPagesComponent implements OnInit { this.changeInputType(); } - // Close the edit popup closeEditPopup() { this.showEditForm = false; this.currentEditingQuestion = null; + this.currentEditingIndex = null; this.options = []; this.correct_option = []; this.selectedValues = []; } - // Update the question after edit updateQuestion(form: any) { if (!this.currentEditingQuestion) return; @@ -297,13 +253,42 @@ export class EditPagesComponent implements OnInit { correct_option: this.correct_option, }); - const optionsArray = this.currentEditingQuestion.get('options') as FormArray; + const optionsArray = this.currentEditingQuestion.get( + 'options' + ) as FormArray; this.selectedValues.forEach((isSelected, index) => { optionsArray.at(index).patchValue({ selected: isSelected }); }); + + this.closeEditPopup(); + } + + onQuestionTypeChange(event: any, form: any) { + // Implementar la lógica necesaria para el cambio de tipo de pregunta + } + + addOption() { + this.options.push(''); + this.selectedValues.push(false); + } + + answerChoice(index: number) { + if (this.inputType === 'radio') { + this.selectedValues = this.options.map((_, i) => i === index); + this.correct_option = [index]; + } else { + this.selectedValues[index] = !this.selectedValues[index]; + this.correct_option = this.selectedValues + .map((isSelected, i) => (isSelected ? i : -1)) + .filter(i => i !== -1); + } } changeInputType() { - // Adjust the input type if needed + if (this.selectedOption === 'Selección mutiple') { + this.inputType = 'checkbox'; + } else { + this.inputType = 'radio'; + } } } From 65d603eeccbeae94698850eaf04cfa78d4f4ba19 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Tue, 26 Nov 2024 21:45:12 -0500 Subject: [PATCH 175/203] solucion error creacion quiz y page not found --- src/app/app-routing.module.ts | 2 +- .../pages/new-pages/new-pages.component.ts | 212 +++++++++++------- 2 files changed, 128 insertions(+), 86 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 64953c0..1314e9f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -35,7 +35,7 @@ import { EditPagesComponent } from './modules/edit/pages/edit-pages/edit-pages.c }, { path: '**', - redirectTo: '/notfound', + redirectTo: '', }, ], { diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 8046197..f6256d8 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -34,7 +34,7 @@ export class NewPagesComponent { }; questionText: string = ''; - questions: any[] = []; // Cambiado a array tipado + questions: any[] = []; options: string[] = []; selection: number[] = []; selectedOption: string = ''; @@ -53,7 +53,7 @@ export class NewPagesComponent { correct_option: number[] = []; selectedValues: boolean[] = []; inputsValues: boolean = false; - temporaryQuestions: any[] = []; // Array para almacenar preguntas temporalmente + temporaryQuestions: any[] = []; isFieldInvalid(field: string): boolean { const control = this.selectNameForm.get(field); @@ -70,7 +70,7 @@ export class NewPagesComponent { answerChoice(i: number) { if (this.correct_option.includes(i)) { - this.correct_option = this.correct_option.filter(element => element != i); + this.correct_option = this.correct_option.filter(element => element !== i); } else { this.correct_option.push(i); } @@ -139,20 +139,25 @@ export class NewPagesComponent { this.showButton = false; } - let responseModule: any = await fetch(`${environment.url}/modules`); - responseModule = await responseModule.json(); - responseModule = responseModule.find( - element => element.name == datos.module - ); - this.quizData.module = responseModule.id; - - let response: any = await fetch(`${environment.url}/cells`); - response = await response.json(); - response = response.find(element => datos.cell == element.name); - response ? (this.quizData.cell = response.id) : ''; - - if (datos.seniority) { - this.quizData.seniority = datos.seniority; + try { + let responseModule: any = await fetch(`${environment.url}/modules`); + responseModule = await responseModule.json(); + responseModule = responseModule.find( + element => element.name == datos.module + ); + this.quizData.module = responseModule.id; + + let response: any = await fetch(`${environment.url}/cells`); + response = await response.json(); + response = response.find(element => datos.cell == element.name); + response ? (this.quizData.cell = response.id) : ''; + + if (datos.seniority) { + this.quizData.seniority = datos.seniority; + } + } catch (error) { + console.error('Error fetching data:', error); + alert('Error al obtener datos del módulo o célula'); } } @@ -192,7 +197,7 @@ export class NewPagesComponent { name: this.selectNameForm.value.name, description: this.selectNameForm.value.description, cell_id: this.quizData.cell, - seniority: this.quizData.seniority, + seniority: this.quizData.seniority?.toLowerCase(), challenge_type: 'immediate', created_by_id: userData.id, is_active: true @@ -212,82 +217,119 @@ export class NewPagesComponent { try { const formSection = form.value; - // Convertir tipo de pregunta + // Convert question type + let questionType = ''; switch (formSection.questionType) { case 'Selección mutiple': - formSection.questionType = 'multiple_choice'; + questionType = 'multiple_choice'; break; case 'Verdadero o falso': - formSection.questionType = 'true_false'; + questionType = 'true_false'; break; case 'Casilla': - formSection.questionType = 'simple_choice'; + questionType = 'simple_choice'; break; + default: + throw new Error('Tipo de pregunta no válido'); } - if (formSection.questionText && this.correct_option.length !== 0) { - const question = { - question: formSection.questionText, - seniority: 'junior', - type: formSection.questionType, - options: [ - formSection?.option0, - formSection?.option1, - formSection?.option2, - formSection?.option3, - formSection?.option4, - formSection?.option5, - ].filter(option => option !== undefined && option !== null), - correct_option: this.correct_option, - explanation: 'string', - link: 'string', - is_active: true - }; + // Validate question text and correct options + if (!formSection.questionText) { + alert('Por favor, ingrese el texto de la pregunta'); + return; + } + + if (this.correct_option.length === 0) { + alert('Por favor, seleccione al menos una opción correcta'); + return; + } - this.temporaryQuestions.push(question); - this.questions.push(formSection); // Para mantener el contador en la UI - - form.reset(); - this.selectedOption = ''; - this.isFocused = false; - this.options = []; - - // Si tenemos 10 preguntas, crear el quiz con todas las preguntas - if (this.temporaryQuestions.length === 10) { - const quizWithQuestions = { - ...this.quizData, - questions: this.temporaryQuestions - }; - this.showForm = false; - - const response = await fetch(`${environment.url}/quiz/nested`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(quizWithQuestions), - }); - - if (!response.ok) { - throw new Error(`Error: ${response.status}`); - } - - const data = await response.json(); - this.quizID = data.id; - this.pop = true; - - - // setTimeout(() => { - // this.closeFn(); - // window.location.reload(); - // }, 2000); + // Prepare options, filtering out undefined or empty options + const options = [ + formSection?.option0, + formSection?.option1, + formSection?.option2, + formSection?.option3, + formSection?.option4, + formSection?.option5 + ].filter(option => option !== undefined && option !== null && option.trim() !== ''); + + // Validate options based on question type + if ( + (questionType === 'true_false' && options.length !== 2) || + (questionType === 'simple_choice' && options.length < 2) || + (questionType === 'multiple_choice' && options.length < 3) + ) { + alert('Número de opciones inválido para el tipo de pregunta seleccionado'); + return; + } + + // Validate correct options + const maxOptionIndex = options.length - 1; + const invalidCorrectOptions = this.correct_option.some(opt => opt > maxOptionIndex); + if (invalidCorrectOptions) { + alert('Selección de opciones correctas no válida'); + return; + } + + const question = { + question: formSection.questionText, + seniority: this.quizData.seniority || 'junior', + type: questionType, + options: options, + correct_option: this.correct_option, + explanation: formSection.explanation || '', + link: formSection.link || '', + is_active: true + }; + + this.temporaryQuestions.push(question); + this.questions.push(formSection); + + // Reset form + form.reset(); + this.selectedOption = ''; + this.isFocused = false; + this.options = []; + this.correct_option = []; + + // If we have 10 questions, create the quiz with all questions + if (this.temporaryQuestions.length === 10) { + const quizWithQuestions = { + ...this.quizData, + questions: this.temporaryQuestions + }; + this.showForm = false; + + console.log('Sending quiz data:', JSON.stringify(quizWithQuestions)); + + const response = await fetch(`${environment.url}/quiz/nested`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(quizWithQuestions), + }); + + if (!response.ok) { + const errorText = await response.text(); + console.error('Full error response:', errorText); + throw new Error(`Error: ${response.status} - ${errorText}`); } - } else { - alert('Complete los campos requeridos'); + + const data = await response.json(); + this.quizID = data.id; + this.pop = true; + + // Optional: Add a reload after a delay + // setTimeout(() => { + // this.closeFn(); + // window.location.reload(); + // }, 2000); } } catch (error) { - alert(error); - console.error(error); + console.error('Detailed error:', error); + alert(error.message || 'Error al crear el cuestionario'); } } @@ -300,11 +342,11 @@ export class NewPagesComponent { } addOption() { - if (this.options.length < 5) { - this.options.push(`Opción ${this.options.length + 1}`); - } else { + if (this.options.length < 6) { this.options.push(`Opción ${this.options.length + 1}`); - this.showPlus = false; + if (this.options.length === 6) { + this.showPlus = false; + } } } } \ No newline at end of file From 294096be59dd5a01f82e8dee2d699f3df17f33af Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Tue, 26 Nov 2024 22:02:53 -0500 Subject: [PATCH 176/203] =?UTF-8?q?a=C3=B1adiendo=20comentarios=20a=20new?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../new/pages/new-pages/new-pages.component.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index f6256d8..2d7f08e 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -16,7 +16,7 @@ export class NewPagesComponent { private cdr: ChangeDetectorRef, private auth: AuthService ) {} - +//componente jesus public selectNameForm = this.formsBuilder.group({ name: ['', Validators.required], description: ['', Validators.required], @@ -244,7 +244,7 @@ export class NewPagesComponent { return; } - // Prepare options, filtering out undefined or empty options + // preparar opciones undefined o null const options = [ formSection?.option0, formSection?.option1, @@ -254,7 +254,7 @@ export class NewPagesComponent { formSection?.option5 ].filter(option => option !== undefined && option !== null && option.trim() !== ''); - // Validate options based on question type + // Validacion if ( (questionType === 'true_false' && options.length !== 2) || (questionType === 'simple_choice' && options.length < 2) || @@ -264,7 +264,7 @@ export class NewPagesComponent { return; } - // Validate correct options + //validacion const maxOptionIndex = options.length - 1; const invalidCorrectOptions = this.correct_option.some(opt => opt > maxOptionIndex); if (invalidCorrectOptions) { @@ -293,7 +293,7 @@ export class NewPagesComponent { this.options = []; this.correct_option = []; - // If we have 10 questions, create the quiz with all questions + //con las 10 preguntas enviamos el quiz if (this.temporaryQuestions.length === 10) { const quizWithQuestions = { ...this.quizData, @@ -321,7 +321,7 @@ export class NewPagesComponent { this.quizID = data.id; this.pop = true; - // Optional: Add a reload after a delay + // setTimeout(() => { // this.closeFn(); // window.location.reload(); From 531de90f7160f8012f59a904d89b6507a8308dd6 Mon Sep 17 00:00:00 2001 From: Agustin Dardanelli Date: Fri, 29 Nov 2024 18:50:22 -0300 Subject: [PATCH 177/203] Mejorando el estilos de view-page --- .../pages/view-quiz/view-quiz.component.html | 6 +++ .../pages/view-quiz/view-quiz.component.scss | 43 +++++++++++-------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.html b/src/app/modules/all/pages/view-quiz/view-quiz.component.html index 4aea273..392ce86 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.html +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.html @@ -100,6 +100,12 @@

Pregunta: {{ question.question }}

Este quiz no tiene preguntas disponibles.

+ + +
+ + +
diff --git a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss index fb57cd7..4db5b18 100644 --- a/src/app/modules/all/pages/view-quiz/view-quiz.component.scss +++ b/src/app/modules/all/pages/view-quiz/view-quiz.component.scss @@ -1,30 +1,26 @@ .normal-container { - display: flex; - flex-direction: column; - align-items: center; - justify-content: flex-start; - padding: 2rem; - width: 100%; - max-width: 95vh; - height: 90vh; - border-radius: 12px; + width: 804px; + height: 600px; + padding: 25px 16px; + gap: 17px; + border-radius: 8px 0px 0px 0px; box-shadow: 0px 0px 12.8px rgba(241, 121, 197, 1); background: rgba(56, 53, 53, 1); border: 2px solid rgba(241, 121, 197, 1); background-image: url('../../../../../assets/layout/images/logo.svg'); background-repeat: no-repeat; background-position: center; - background-size: 180px; + background-size: 200px; z-index: 1; font-family: Poppins; - margin: auto; overflow-y: auto; } -.wrapper{ - width: 100%; + +.wrapper { + width: 100%; } + .contenedor { - // margin-top: 20px; display: flex; flex-direction: column; align-items: center; @@ -70,10 +66,11 @@ flex-direction: column; gap: 15px; } + .inline-block { display: inline-block; vertical-align: top; - margin-top: 20px; + margin-top: 20px; width: 100%; } @@ -114,7 +111,7 @@ .button-container { display: flex; align-items: center; - justify-content: space-between; /* Para separarlos a cada extremo del contenedor */ + justify-content: space-between; } .btn-plus { @@ -128,5 +125,17 @@ } .btn-circle { - margin-left: auto; /* Envía el botón de cerrar a la derecha */ + margin-left: auto; +} + +.btn-delete{ + background: rgba(106, 95, 255, 1); + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); + + } +.btn-edit{ + border: 1.4px solid rgba(112, 111, 229, 1) !important; + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); + +} \ No newline at end of file From d368e981df55a9bc061333e71a726e3cd1a38f8b Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Sun, 1 Dec 2024 14:10:56 -0300 Subject: [PATCH 178/203] fix validators to correct_option and inputs --- .../all/pages/all-page/all-page.component.ts | 98 ++++---- .../all/pages/all-page/all-page.service.ts | 8 + .../pages/new-pages/new-pages.component.html | 24 +- .../pages/new-pages/new-pages.component.ts | 212 ++++++++---------- .../new/pages/new-pages/new-pages.service.ts | 18 ++ src/app/modules/new/pages/new-pages/try.js | 0 .../header-page/header-page.component.html | 9 +- .../header-page/header-page.component.ts | 17 +- 8 files changed, 187 insertions(+), 199 deletions(-) create mode 100644 src/app/modules/new/pages/new-pages/new-pages.service.ts delete mode 100644 src/app/modules/new/pages/new-pages/try.js diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 2644a2d..1b15d39 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -71,7 +71,6 @@ export class AllPageComponent implements OnInit { ngOnInit(): void { this.allPageService.getAllQuiz().subscribe((response: any) => { this.quizzes = response.quizzes; - console.log(this.quizzes); }); } @@ -79,16 +78,7 @@ export class AllPageComponent implements OnInit { this.module = quizCategory.module; this.cell = quizCategory.cell; this.seniority = quizCategory.seniority; - this.allPageService - .getFilteredQuiz({ - module: this.module, - cell: this.cell, - seniority: this.seniority.toLowerCase(), - search: this.searchText, - }) - .subscribe((response: any) => { - this.quizzes = response.quizzes; - }); + this.onSearchChange() } onSearchChange() { @@ -104,40 +94,25 @@ export class AllPageComponent implements OnInit { }); } - async toggleActive(quiz: Quiz) { + toggleActive(quiz: Quiz) { quiz.is_active = !quiz.is_active; - - try { - const response = await fetch(`${environment.url}/quiz/${quiz.id}`, { - method: 'PUT', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ is_active: quiz.is_active }), - }); - - if (!response.ok) { - throw new Error( - 'Error al actualizar el estado del quiz: ' + response.status - ); + this.allPageService.toggleIsActiveQuiz(quiz.id, quiz.is_active).subscribe({ + next: (response) => { + console.log('Se actualizo el estado del quiz correctamente', response) + }, + error: (error) => { + console.error('Error al actualizar el estado del quiz:', error) } - } catch (error) { - console.error('Error al actualizar el estado del quiz:', error); - } + }) } viewQuiz(quiz: Quiz) { - this.selectedQuizOnView = quiz; // Esto hace que la ventana emergente se muestre - - console.log('Quiz seleccionado:', quiz); - } - - closeQuiz() { - this.selectedQuizOnView = null; // Esto cierra la ventana emergente + this.selectedQuiz = quiz; + this.router.navigate(['home/view-quiz', quiz.id]); } - async deleteQuiz(quiz: Quiz) { - const result = await Swal.fire({ + deleteQuiz(quiz: Quiz) { + Swal.fire({ title: '¿Deseas eliminar el registro?', text: 'Una vez eliminado no se podrá recuperar', showCloseButton: true, @@ -148,24 +123,39 @@ export class AllPageComponent implements OnInit { title: 'custom-delete-title', confirmButton: 'custom-delete-confirm-button', }, - }); - - if (result.isConfirmed) { - try { - const response = await fetch(`${environment.url}/quiz/${quiz.id}`, { - method: 'DELETE', - }); - if (!response.ok) throw new Error('Error al eliminar el quiz'); - this.quizzes = this.quizzes.filter(q => q.id !== quiz.id); - } catch (error) { - Swal.fire({ - title: 'Error', - text: 'No se pudo eliminar el registro.', - icon: 'error', - confirmButtonText: 'Entendido', + }).then((result) => { + if (result.isConfirmed) { + this.allPageService.deleteQuiz(quiz.id).subscribe({ + next: () => { + this.quizzes = this.quizzes.filter((q) => q.id !== quiz.id); + Swal.fire({ + title: 'Eliminado', + text: 'El registro ha sido eliminado.', + icon: 'success', + confirmButtonText: 'Entendido', + customClass: { + popup: 'custom-delete-popup', + title: 'custom-delete-title', + confirmButton: 'custom-delete-confirm-button', + }, + }); + }, + error: () => { + Swal.fire({ + title: 'Error', + text: 'No se pudo eliminar el registro.', + icon: 'error', + confirmButtonText: 'Entendido', + customClass: { + popup: 'custom-delete-popup', + title: 'custom-delete-title', + confirmButton: 'custom-delete-confirm-button', + }, + }); + } }); } - } + }); } editQuiz(quiz: Quiz) { diff --git a/src/app/modules/all/pages/all-page/all-page.service.ts b/src/app/modules/all/pages/all-page/all-page.service.ts index e1bc681..a85a3e3 100644 --- a/src/app/modules/all/pages/all-page/all-page.service.ts +++ b/src/app/modules/all/pages/all-page/all-page.service.ts @@ -42,4 +42,12 @@ export class AllPageService { return this.http.get(this.urlApi, { params }); } + toggleIsActiveQuiz(id: string, is_active:boolean) { + return this.http.put(`${this.urlApi}/${id}`, {is_active: is_active}); + } + + deleteQuiz(id: string) { + return this.http.delete(`${this.urlApi}/${id}`) + } } + diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 2c8237f..ade997b 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -14,7 +14,6 @@ : 'Nombre del Quiz' " formControlName="name" - (input)="isValidInput()" [ngClass]="{ notice: isFieldInvalid('name') }" />
@@ -48,11 +42,13 @@
+ @if(selectNameForm.valid && showButton) { + + }
-
- -
-

Define la pregunta {{ questions.length + 1 }}/10

@@ -115,7 +111,7 @@

Define la pregunta {{ questions.length + 1 }}/10

[(ngModel)]="selectedRadio" [value]="option" name="radioGroup" - (click)="answerChoice(i)" /> + (click)="answerChoiceRadio(i)" /> Define la pregunta {{ questions.length + 1 }}/10 class="custom-option-input mb-3" [(ngModel)]="options[i]" name="option{{ i }}" + [placeholder]="'Opción ' + (i + 1)" [readonly]="isTrueFalseQuestion" required /> +
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 849c5d2..2af072e 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { environment } from '@environments/environment'; import { ChangeDetectorRef } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { AuthService } from '@auth0/auth0-angular'; +import { NewPageService } from './new-pages.service'; @Component({ selector: 'app-new-pages', @@ -14,12 +15,16 @@ export class NewPagesComponent { constructor( private formsBuilder: FormBuilder, private cdr: ChangeDetectorRef, - private auth: AuthService + private auth: AuthService, + private newPageService : NewPageService ) {} public selectNameForm = this.formsBuilder.group({ - name: ['', Validators.required], - description: ['', Validators.required], + name: ['', [Validators.required, Validators.minLength(3)]], + description: [''], + module: ['', [Validators.required]], + cell: ['', [Validators.required]], + seniority: ['', [Validators.required]], }); questionTypes: string[] = [ @@ -33,20 +38,30 @@ export class NewPagesComponent { seniority: 'Seniority', }; + quizData = { + name: '', + description: '', + module: '', + cell_id: '', + seniority: '', + challenge_type: '', + created_by_id: '', + is_active: true, + }; + questionText: string = ''; questions: any[] = []; options: string[] = []; selection: number[] = []; selectedOption: string = ''; inputType: string = ''; - showButton: boolean = false; + showButton: boolean = true; pop: boolean = false; showForm: boolean = false; isTrueFalseQuestion: boolean = false; showPlus: boolean = false; showSubmits: boolean = false; quizID: string = ''; - quizData: any = {}; createOrEdit: boolean = true; toggle: boolean = true; isFocused: boolean = false; @@ -54,12 +69,62 @@ export class NewPagesComponent { selectedValues: boolean[] = []; inputsValues: boolean = false; temporaryQuestions: any[] = []; + + showInput: boolean = true; + selectedRadio: string | null = null; + recibirDatos(datos: any) { + this.selectNameForm.get('module').setValue(datos.module); + this.selectNameForm.get('cell').setValue(datos.cell); + this.selectNameForm.get('seniority').setValue(datos.seniority); + this.quizData.module= datos.moduleId, + this.quizData.cell_id= datos.cellId, + this.quizData.seniority= datos.seniority.toLowerCase() + } + isFieldInvalid(field: string): boolean { const control = this.selectNameForm.get(field); - return control?.invalid && (control.dirty || control.touched); + return control.invalid && (control.dirty || control.touched); } + isValidInput() { + return this.selectNameForm.valid + } + + async createQuiz() { + try { + const user = await firstValueFrom(this.auth.user$); + if (!user?.email) { + throw new Error('No se encontró el email del usuario autenticado'); + } + + this.newPageService.findUserByEmail(user.email).subscribe({ + next: (response: any)=>{ + this.quizData.created_by_id = response.id; + }, + error: (error)=>{ + console.error('Error al obtener el usuario desde el backend') + } + }) + + // Mostrar el formulario para agregar preguntas + this.showButton = false; + this.showForm = true; + this.toggle = false; + this.showButton = false; + + // Guardar los datos del quiz para usarlos cuando tengamos todas las preguntas + this.quizData.name= this.selectNameForm.value.name; + this.quizData.challenge_type= 'immediate', + this.quizData.description= this.selectNameForm.value.description; + } + catch (error) { + console.error('Error preparando el quiz:', error); + alert(error.message || 'Error al preparar el quiz'); + this.showButton = false; + } + } + trackByFn(index: number): any { return index; } @@ -78,9 +143,10 @@ export class NewPagesComponent { } } - showInput: boolean = true; - selectedRadio: string | null = null; - + answerChoiceRadio(i: number) { + // Para radio buttons, simplemente estableces la opción seleccionada + this.correct_option = [i]; +} changeInputType() { this.selectedValues = Array(this.options.length).fill(false); this.selectedRadio = null; @@ -101,12 +167,12 @@ export class NewPagesComponent { this.isTrueFalseQuestion = true; this.showPlus = false; } else if (selectedType === 'Selección mutiple') { - this.options = ['Opción 1', 'Opción 2', 'Opción 3']; + this.options = ['', '', '']; this.inputType = 'checkbox'; this.isTrueFalseQuestion = false; this.showPlus = true; } else if (selectedType === 'Casilla') { - this.options = ['Opción 1', 'Opción 2']; + this.options = ['', '']; this.inputType = 'radio'; this.isTrueFalseQuestion = false; this.showPlus = true; @@ -118,108 +184,6 @@ export class NewPagesComponent { this.cdr.detectChanges(); } - isValidInput() { - if ( - this.selectNameForm.value.name && - this.selectNameForm.value.description && - this.selectNameForm.valid - ) { - this.inputsValues = true; - } else { - this.inputsValues = false; - } - } - - async recibirDatos(datos: any) { - if ( - datos.celula != '' && - datos.modulo != '' && - datos.seniority != '' - ) { - this.showButton = true; - } else { - this.showButton = false; - } - - try { - let responseModule: any = await fetch(`${environment.url}/modules`); - responseModule = await responseModule.json(); - responseModule = responseModule.find( - element => element.name == datos.module - ); - this.quizData.module = responseModule.id; - - let response: any = await fetch(`${environment.url}/cells`); - response = await response.json(); - response = response.find(element => datos.cell == element.name); - response ? (this.quizData.cell = response.id) : ''; - - if (datos.seniority) { - this.quizData.seniority = datos.seniority; - } - } catch (error) { - console.error('Error fetching data:', error); - alert('Error al obtener datos del módulo o célula'); - } - } - - async createQuiz() { - try { - this.quizData.seniority = - this.quizData.seniority === 'semi-sr' - ? 'middle' - : this.quizData.seniority; - const user = await firstValueFrom(this.auth.user$); - - if (!user?.email) { - throw new Error('No se encontró el email del usuario autenticado'); - } - - const userResponse = await fetch( - `${environment.url}/user/FindByEmail?email=${user.email}`, - { - method: 'GET', - headers: { - 'Content-Type': 'application/json', - }, - } - ); - - if (!userResponse.ok) { - throw new Error('Error al obtener el usuario desde el backend'); - } - - const userData = await userResponse.json(); - - if (!userData?.id) { - throw new Error('No se encontró el ID del usuario en la base de datos'); - } - - // Mostrar el formulario para agregar preguntas - this.showForm = true; - this.toggle = false; - this.showButton = false; - - // Guardar los datos del quiz para usarlos cuando tengamos todas las preguntas - this.quizData = { - name: this.selectNameForm.value.name, - description: this.selectNameForm.value.description, - cell_id: this.quizData.cell, - seniority: this.quizData.seniority?.toLowerCase(), - challenge_type: 'immediate', - created_by_id: userData.id, - is_active: true, - }; - - this.questionCategory.name = this.selectNameForm.value.name; - this.questionCategory.description = this.selectNameForm.value.description; - } catch (error) { - console.error('Error preparando el quiz:', error); - alert(error.message || 'Error al preparar el quiz'); - this.showButton = false; - } - } - async createQuestion(form: any) { try { const formSection = form.value; @@ -245,11 +209,17 @@ export class NewPagesComponent { alert('Por favor, ingrese el texto de la pregunta'); return; } - - if (this.correct_option.length === 0) { - alert('Por favor, seleccione al menos una opción correcta'); + console.log(this.correct_option) + if (questionType === 'multiple_choice') { + if (this.correct_option.length < 2) { + alert('Por favor, seleccione al menos dos opciones correctas'); return; - } + } + } else{ + if (this.correct_option.length === 0) { + alert('Por favor, seleccione una opción correcta'); + return; + }} // Prepare options, filtering out undefined or empty options const options = [ @@ -334,12 +304,6 @@ export class NewPagesComponent { const data = await response.json(); this.quizID = data.id; this.pop = true; - - // Optional: Add a reload after a delay - // setTimeout(() => { - // this.closeFn(); - // window.location.reload(); - // }, 2000); } } catch (error) { console.error('Detailed error:', error); diff --git a/src/app/modules/new/pages/new-pages/new-pages.service.ts b/src/app/modules/new/pages/new-pages/new-pages.service.ts new file mode 100644 index 0000000..b897de1 --- /dev/null +++ b/src/app/modules/new/pages/new-pages/new-pages.service.ts @@ -0,0 +1,18 @@ +import { HttpClient, HttpParams } from '@angular/common/http'; +import { inject, Injectable } from '@angular/core'; +import { environment } from '@environments/environment'; + +@Injectable({ + providedIn: 'root' +}) +export class NewPageService { + + private http = inject(HttpClient) + private urlApi: string = `${environment.url}` + + constructor() { } + + findUserByEmail(email: string) { + return this.http.get(`${this.urlApi}/user/FindByEmail?email=${email}`) + } +} \ No newline at end of file diff --git a/src/app/modules/new/pages/new-pages/try.js b/src/app/modules/new/pages/new-pages/try.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index 019961c..f849080 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -4,6 +4,9 @@

Módulo

+
{{quizCategory?.module || 'Selecciona el modulo'}} @@ -46,9 +49,6 @@

Módulo

-
} } @@ -135,9 +135,6 @@

Célula

-
} } diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index 77ac746..e8c7618 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -46,8 +46,9 @@ export class HeaderPageComponent { module: '', moduleId: '', cell: '', - seniority: '', + cellId: '', cellClass: '', + seniority: '', }; ngOnInit(): void { @@ -61,6 +62,17 @@ export class HeaderPageComponent { this.modules= response }) } + + //Coloca los valores de modulo, celula y seniority vacios + resetValue() { + this.quizCategory.module = ''; + this.quizCategory.moduleId = ''; + this.quizCategory.cell = ''; + this.quizCategory.seniority = ''; + this.quizCategory.cellClass = ''; + this.datosParaPadre.emit(this.quizCategory); + } + //coloca el modulo como seleccionado y carga las celulas que le corresponden selectModule(module: Module) { this.quizCategory.module = module.name; @@ -74,6 +86,7 @@ export class HeaderPageComponent { //coloca la celula como seleccionado y su correspondiente clase selectCell(cell: Cell, index: number) { this.quizCategory.cell = cell.name + this.quizCategory.cellId = cell.id this.quizCategory.cellClass = this.getCellClass(index) this.showCelula = false; this.datosParaPadre.emit(this.quizCategory); @@ -259,7 +272,7 @@ export class HeaderPageComponent { this.showModulo = false; } } - //Cambia la visibilidad del input modulo para agregar un nuevo en el modo edit + //Cambia la visibilidad del input modulo para agregar uno nuevo en el modo edit toggleAddModule() { this.addModule = !this.addModule; this.module.setValue(''); From 57f98001ca153e45ed2cdbd165935be70f6a11e5 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Sun, 1 Dec 2024 21:06:35 -0500 Subject: [PATCH 179/203] componente edit --- angular.json | 3 +- src/_redirects | 1 + .../pages/all-page/all-page.component.scss | 1 + .../edit-pages/edit-pages.component.html | 185 +++++++++--------- .../edit-pages/edit-pages.component.scss | 12 +- .../pages/edit-pages/edit-pages.component.ts | 38 +++- 6 files changed, 134 insertions(+), 106 deletions(-) create mode 100644 src/_redirects diff --git a/angular.json b/angular.json index 6f0cbe5..ef3b350 100644 --- a/angular.json +++ b/angular.json @@ -30,7 +30,8 @@ "assets": [ "src/favicon.ico", "src/assets", - "src/mockServiceWorker.js" + "src/mockServiceWorker.js", + "src/_redirects" ], "styles": [ "node_modules/bootstrap/dist/css/bootstrap.min.css","src/styles.scss"], "scripts": [ "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"] diff --git a/src/_redirects b/src/_redirects new file mode 100644 index 0000000..ad37e2c --- /dev/null +++ b/src/_redirects @@ -0,0 +1 @@ +/* /index.html 200 diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index a3f2964..fda6d8e 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -266,6 +266,7 @@ h2 { .status { font-weight: bold; + cursor: pointer; } .status.Activo { diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index 879b4aa..3dbe41d 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -43,107 +43,102 @@ [formGroupName]="i" class="question-container"> -
-
-
-

Editar pregunta

- -
- - -
-
- -
- -
-
+ +
+
+
+

Editar pregunta

+ +
-
-
- -
- -
-
+ +
+
+
+ +
+ +
+
-
-
-
-
- - -
- -
+
+ + +
+
-
-
- -
-
-
-
+
+
+
+
+ + +
+ +
-
- -
- +
+
+
+
+
+ +
+ +
+
+ +
+
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss index bfbf5bd..0962b88 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss @@ -127,11 +127,15 @@ $border-color: rgba(241, 121, 197, 1); } .content-2 { - background-color: rgba(79, 77, 77, 0.95); + width: 137vh; + padding: 16px 0px 0px 0px; + gap: 17px; + font-family: Poppins; border-radius: 8px; - padding: 20px; - margin: 10px; - box-shadow: 0px -3px 12.8px 0px $border-color; + padding: 16px; + opacity: 0px; + background-color: #4f4d4d73; + box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); .popup-header { display: flex; diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts index 9206fe0..3bcb2fd 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts @@ -263,7 +263,31 @@ export class EditPagesComponent implements OnInit { this.closeEditPopup(); } - onQuestionTypeChange(event: any, form: any) { + onQuestionTypeChange(selectedType: any, form: any) { + this.correct_option = []; + this.selectedValues = []; + this.showSubmits = true; + if (selectedType === 'Verdadero o falso') { + this.options = ['Verdadero', 'Falso']; + this.inputType = 'radio'; + this.isTrueFalseQuestion = true; + this.showPlus = false; + } else if (selectedType === 'Selección mutiple') { + this.options = ['Opción 1', 'Opción 2', 'Opción 3']; + this.inputType = 'checkbox'; + this.isTrueFalseQuestion = false; + this.showPlus = true; + } else if (selectedType === 'Casilla') { + this.options = ['Opción 1', 'Opción 2']; + this.inputType = 'radio'; + this.isTrueFalseQuestion = false; + this.showPlus = true; + } else { + this.showPlus = false; + } + + this.changeInputType(); + this.cdr.detectChanges(); // Implementar la lógica necesaria para el cambio de tipo de pregunta } @@ -285,10 +309,12 @@ export class EditPagesComponent implements OnInit { } changeInputType() { - if (this.selectedOption === 'Selección mutiple') { - this.inputType = 'checkbox'; - } else { - this.inputType = 'radio'; - } + this.selectedValues = Array(this.options.length).fill(false); + this.selectedRadio = null; + this.showInput = false; + setTimeout(() => { + this.showInput = true; + this.cdr.detectChanges(); + }, 50); } } From 95759745a522a553dfd8e7e3d537a8b5eb3fb57c Mon Sep 17 00:00:00 2001 From: nassahel Date: Mon, 2 Dec 2024 12:45:41 -0300 Subject: [PATCH 180/203] acomodados iconos de select y solucionado desplazamiento hacia la derecha --- .../header-page/header-page.component.html | 364 ++++++++---------- .../header-page/header-page.component.scss | 41 +- 2 files changed, 206 insertions(+), 199 deletions(-) diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index 019961c..13db5ea 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -1,203 +1,181 @@ - -
-
- -
-

Módulo

-
- - {{quizCategory?.module || 'Selecciona el modulo'}} - -
- @if (showModulo) { -
- @for (module of modules; track $index) { - - -
-
- } @else { - {{ module.name }} - @if(editMode){ -
- - -
- } - } - - } - @if (editMode) { - @if (!addModule) { - - } - @else { -
- - @if(module?.errors?.['required']) { - (El modulo no puede quedar vacío) - } - @if(module?.errors?.['minlength']) { - (Debe tener como mínimo 3 caracteres) - } -
- - -
-
- } - } - -
- } +
+
+ +
+

Módulo

+
+ + {{quizCategory?.module || 'Selecciona el modulo'}} +
- -
-

Célula

-
- - {{ quizCategory?.cell || 'Selecciona la célula'}} - -
- @if (showCelula && quizCategory.module != '') { -
- @for (cell of cells;track $index) { - - -
-
- } @else { - {{ cell.name }} - @if(editMode){ -
- - -
- } - } - - } - @if (editMode) { - @if (!addCell) { - - } - @else { -
- - @if(cell?.errors?.['required']) { - (La célula no puede quedar vacía) - } - @if(cell?.errors?.['minlength']) { - (Debe tener como mínimo 3 caracteres) - } -
- - -
-
- } + @if (showModulo) { +
+ @for (module of modules; track $index) { + + +
+
+ } @else { +
+
+ {{ module.name }} +
+ @if(editMode){ +
+ + +
}
+ + } + } -
- -
-

Seniority / Nivel

-
- {{ quizCategory?.seniority || 'Seniority'}} - + @if (editMode) { + @if (!addModule) { + + } + @else { +
+ + @if(module?.errors?.['required']) { + (El modulo no puede quedar vacío) + } + @if(module?.errors?.['minlength']) { + (Debe tener como mínimo 3 caracteres) + } +
+ + +
- - @if (showSeniority){ -
- @for (seniority of seniorities; track $index) { - - } + } + } + +
+ } +
+ +
+

Célula

+
+ + {{ quizCategory?.cell || 'Selecciona la célula'}} + +
+ @if (showCelula && quizCategory.module != '') { +
+ @for (cell of cells;track $index) { + + +
+
+ } @else { +
+
+ {{ cell.name }} +
+ @if(editMode){ +
+ +
+ } +
+ } + + } + @if (editMode) { + @if (!addCell) { + + } + @else { +
+ + @if(cell?.errors?.['required']) { + (La célula no puede quedar vacía) + } + @if(cell?.errors?.['minlength']) { + (Debe tener como mínimo 3 caracteres) } +
+ + +
+
+ } + }
- + } +
+ +
+

Seniority / Nivel

+
+ {{ quizCategory?.seniority || 'Seniority'}} + +
+ + @if (showSeniority){ +
+ @for (seniority of seniorities; track $index) { + + } +
+ }
-
+
+
\ No newline at end of file diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index b9910aa..b07fd38 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -15,6 +15,7 @@ margin: 0; padding-top: 8px; } + .input-name, .text-description { border-radius: 8px; @@ -47,7 +48,7 @@ flex-wrap: wrap; justify-content: space-between; width: 135vh; - + position: relative; border-radius: 12px; padding: 0.8rem; } @@ -61,8 +62,8 @@ } .option-floating { - position: absolute; -z-index: 100000; + // position: absolute; + z-index: 100000; width: 41vh; background-color: #303030; display: flex; @@ -94,20 +95,36 @@ z-index: 100000; .floating-seniority { position: absolute; top: 11vh; - right: 1.6vh; + // right: 1.6vh; } .floating-module { position: absolute; top: 11vh; - right: 92.5vh; + // right: 92.5vh; } + .floating-cell { position: absolute; top: 11vh; - right: 47vh; + // right: 47vh; } +.actions-btn { + all: unset; + margin-left: auto; +} + +.module-container { + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + padding-right: .5rem; +} + + + .floating { border: none; padding-left: 0.8rem; @@ -142,16 +159,19 @@ h4 { background-color: #007aff; color: #795f3a; } + .junior { border-radius: 20px; background-color: #5856d6; color: #57462e; } + .middle { border-radius: 20px; background-color: #af52de; color: #5e4b30; } + .senior { border-radius: 20px; background-color: #ff2d55; @@ -162,38 +182,47 @@ h4 { background-color: #ffcc00; color: #8E7E3D; } + .cell-color-2 { background-color: #ff9500; color: #795F3A; } + .cell-color-3 { background-color: #34c759; color: #367044; } + .cell-color-4 { background-color: #00c7be; color: #3B6866; } + .cell-color-5 { background-color: #30b0c7; color: #3E6870; } + .cell-color-6 { background-color: #32ade6; color: #487489; } + .cell-color-7 { background-color: #007aff; color: #34567B; } + .cell-color-8 { background-color: #5856D6; color: #2D2C5C; } + .cell-color-9 { background-color: #AF52DE; color: #62327A; } + .cell-color-10 { background-color: #FF2D55; color: #97263B; From a8937d75b3d617c0d7b8dbf14dd2e205e28fa41a Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Mon, 2 Dec 2024 17:50:23 -0300 Subject: [PATCH 181/203] fix inputs in new quiz and create alertService --- .../pages/new-pages/new-pages.component.html | 10 +- .../pages/new-pages/new-pages.component.ts | 32 +++--- .../shared/components/alert/alert.service.ts | 102 ++++++++++++++++++ src/styles.scss | 38 +++++++ 4 files changed, 163 insertions(+), 19 deletions(-) create mode 100644 src/app/shared/components/alert/alert.service.ts diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index ade997b..f502d45 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -109,7 +109,7 @@

Define la pregunta {{ questions.length + 1 }}/10

type="radio" class="checkbox-input" [(ngModel)]="selectedRadio" - [value]="option" + [value]="option || 'Opción ' + (i + 1)" name="radioGroup" (click)="answerChoiceRadio(i)" /> Define la pregunta {{ questions.length + 1 }}/10 type="checkbox" class="checkbox-input" [(ngModel)]="selectedValues[i]" - (click)="answerChoice(i)" - [name]="'checkbox' + i" /> + [name]="'checkbox' + i" + (click)="answerChoice(i)"/>
Define la pregunta {{ questions.length + 1 }}/10 [placeholder]="'Opción ' + (i + 1)" [readonly]="isTrueFalseQuestion" required /> -
@@ -139,7 +138,8 @@

Define la pregunta {{ questions.length + 1 }}/10

type="text" class="custom-option-input" name="agregate" - placeholder="Añadir una nueva opción" /> + placeholder="Añadir una nueva opción" + disabled/>
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 2af072e..20db9fc 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -5,6 +5,7 @@ import { ChangeDetectorRef } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { AuthService } from '@auth0/auth0-angular'; import { NewPageService } from './new-pages.service'; +import { AlertService } from 'src/app/shared/components/alert/alert.service'; @Component({ selector: 'app-new-pages', @@ -16,7 +17,8 @@ export class NewPagesComponent { private formsBuilder: FormBuilder, private cdr: ChangeDetectorRef, private auth: AuthService, - private newPageService : NewPageService + private newPageService: NewPageService, + private alertService: AlertService, ) {} public selectNameForm = this.formsBuilder.group({ @@ -92,6 +94,7 @@ export class NewPagesComponent { } async createQuiz() { + // Conseguir el User_id del usuario autenticado try { const user = await firstValueFrom(this.auth.user$); if (!user?.email) { @@ -120,7 +123,7 @@ export class NewPagesComponent { } catch (error) { console.error('Error preparando el quiz:', error); - alert(error.message || 'Error al preparar el quiz'); + this.alertService.showError(error.message || 'Error al preparar el quiz'); this.showButton = false; } } @@ -162,7 +165,7 @@ export class NewPagesComponent { this.selectedValues = []; this.showSubmits = true; if (selectedType === 'Verdadero o falso') { - this.options = ['Verdadero', 'Falso']; + this.options = ['Falso', 'Verdadero']; this.inputType = 'radio'; this.isTrueFalseQuestion = true; this.showPlus = false; @@ -206,18 +209,18 @@ export class NewPagesComponent { // Validate question text and correct options if (!formSection.questionText) { - alert('Por favor, ingrese el texto de la pregunta'); + this.alertService.showWarning('Por favor, ingrese el texto de la pregunta'); return; } console.log(this.correct_option) if (questionType === 'multiple_choice') { if (this.correct_option.length < 2) { - alert('Por favor, seleccione al menos dos opciones correctas'); + this.alertService.showWarning('Por favor, seleccione al menos dos opciones correctas'); return; } } else{ if (this.correct_option.length === 0) { - alert('Por favor, seleccione una opción correcta'); + this.alertService.showWarning('Por favor, seleccione una opción correcta'); return; }} @@ -237,11 +240,11 @@ export class NewPagesComponent { // Validate options based on question type if ( (questionType === 'true_false' && options.length !== 2) || - (questionType === 'simple_choice' && options.length < 2) || - (questionType === 'multiple_choice' && options.length < 3) + (questionType === 'simple_choice' && options.length !== this.options.length) || + (questionType === 'multiple_choice' && options.length !== this.options.length) ) { - alert( - 'Número de opciones inválido para el tipo de pregunta seleccionado' + this.alertService.showWarning( + 'Ingrese el texto en todas las opciones' ); return; } @@ -252,13 +255,13 @@ export class NewPagesComponent { opt => opt > maxOptionIndex ); if (invalidCorrectOptions) { - alert('Selección de opciones correctas no válida'); + this.alertService.showWarning('Selección de opciones correctas no válida'); return; } const question = { question: formSection.questionText, - seniority: this.quizData.seniority || 'junior', + seniority: this.quizData.seniority, type: questionType, options: options, correct_option: this.correct_option, @@ -268,6 +271,7 @@ export class NewPagesComponent { }; this.temporaryQuestions.push(question); + this.pop = true; this.questions.push(formSection); // Reset form @@ -307,7 +311,7 @@ export class NewPagesComponent { } } catch (error) { console.error('Detailed error:', error); - alert(error.message || 'Error al crear el cuestionario'); + this.alertService.showError(error.message || 'Error al crear el cuestionario'); } } @@ -321,7 +325,7 @@ export class NewPagesComponent { addOption() { if (this.options.length < 6) { - this.options.push(`Opción ${this.options.length + 1}`); + this.options.push(''); if (this.options.length === 6) { this.showPlus = false; } diff --git a/src/app/shared/components/alert/alert.service.ts b/src/app/shared/components/alert/alert.service.ts new file mode 100644 index 0000000..dfed3a0 --- /dev/null +++ b/src/app/shared/components/alert/alert.service.ts @@ -0,0 +1,102 @@ +import { Injectable } from '@angular/core'; +import Swal, { SweetAlertIcon } from 'sweetalert2'; + +@Injectable({ + providedIn: 'root' +}) +export class AlertService { + // Método genérico para mostrar alertas + private showAlert( + title: string, + text: string, + icon: SweetAlertIcon, + confirmButtonText: string = 'Aceptar' + ) { + Swal.fire({ + title: title, + text: text, + icon: icon, + confirmButtonText: confirmButtonText, + customClass: { + popup: 'custom-delete-popup', + title: 'custom-delete-title', + confirmButton: 'custom-delete-confirm-button', + }, + buttonsStyling: false + }); + } + + // Método para mostrar alertas de error + showError(message: string, title: string = 'Error') { + this.showAlert(title, message, 'error'); + } + + // Método para mostrar alertas de éxito + showSuccess(message: string, title: string = 'Éxito') { + this.showAlert(title, message, 'success'); + } + + // Método para mostrar alertas de advertencia + showWarning(message: string, title: string = 'Advertencia') { + this.showAlert(title, message, 'warning'); + } + + // Método para confirmaciones + showConfirm( + title: string, + text: string, + onConfirm: () => void, + confirmButtonText: string = 'Confirmar', + cancelButtonText: string = 'Cancelar' + ) { + Swal.fire({ + title: title, + text: text, + icon: 'question', + showCancelButton: true, + confirmButtonText: confirmButtonText, + cancelButtonText: cancelButtonText, + customClass: { + popup: 'custom-delete-popup', + title: 'custom-delete-title', + confirmButton: 'custom-delete-confirm-button', + }, + buttonsStyling: false + }).then((result) => { + if (result.isConfirmed) { + onConfirm(); + } + }); + } + + // Método para alertas con entrada de texto + showPrompt( + title: string, + text: string, + onConfirm: (value: string) => void + ) { + Swal.fire({ + title: title, + text: text, + input: 'text', + inputAttributes: { + autocapitalize: 'off' + }, + showCancelButton: true, + confirmButtonText: 'Aceptar', + cancelButtonText: 'Cancelar', + customClass: { + popup: 'my-custom-popup-class', + title: 'my-custom-title-class', + htmlContainer: 'my-custom-text-class', + confirmButton: 'btn btn-primary me-2', + cancelButton: 'btn btn-secondary' + }, + buttonsStyling: false + }).then((result) => { + if (result.isConfirmed && result.value) { + onConfirm(result.value); + } + }); + } +} \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index 76d2090..8d784bf 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,5 +1,43 @@ /* You can add global styles to this file, and also import other style files */ +::ng-deep .custom-delete-popup { + background-color: #1e1e1e; + color: #fff; + border-radius: 50px; + padding: 24px 24px 24px 24px; + } + + ::ng-deep .custom-delete-title { + font-size: 24px; + padding: 0px 8px; + text-align: center; + opacity: 1; + } + + ::ng-deep .custom-delete-confirm-button { + background: rgba(106, 95, 255, 1); + color: #fff; + font-size: 18px; + padding: 12px 24px; + border-radius: 16px; + box-shadow: none; + outline: none; + transition: background-color 0.3s ease; + } + + ::ng-deep .custom-delete-confirm-button:hover { + background-color: #5a47cc; + } + + ::ng-deep .swal2-close { + color: #fff; + font-size: 20px; + } + + ::ng-deep .custom-delete-content { + padding: 24px 0 0 0; + gap: 24px; + } $gutter: 1rem; //for primeflex grid system @import 'assets/layout/styles/layout/layout.scss'; From 3834ee598a7d32e7085ade73b1a303d8df426c7b Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Mon, 2 Dec 2024 22:20:20 -0300 Subject: [PATCH 182/203] fix header-page.component.html --- .../header-form/pages/header-page/header-page.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index cb640ce..73fdc04 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -53,7 +53,7 @@

Módulo

@if(editMode){
- From 976409911bc747b720e9d11d8ccfdab3b38e71e9 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Tue, 3 Dec 2024 18:05:00 -0300 Subject: [PATCH 183/203] redirect createdQuiz to all --- .../all/pages/all-page/all-page.component.ts | 23 ++++++++++++++++--- .../pages/new-pages/new-pages.component.html | 4 ++-- .../pages/new-pages/new-pages.component.ts | 8 ++++++- .../welcome-page/welcome-page.component.html | 8 +++---- .../welcome-page/welcome-page.component.ts | 5 ++++ .../shared/components/alert/alert.service.ts | 4 ++-- 6 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index bf6b3c8..4e07c23 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -9,7 +9,7 @@ import { } from '@angular/animations'; import { Output, EventEmitter } from '@angular/core'; import Swal from 'sweetalert2'; -import { environment } from '@environments/environment'; +import { AlertService } from 'src/app/shared/components/alert/alert.service'; import { AllPageService } from './all-page.service'; interface User { @@ -67,7 +67,9 @@ export class AllPageComponent implements OnInit { showEdit: boolean = false; private allPageService = inject(AllPageService); - constructor(private router: Router) {} + constructor(private router: Router, + private alertService: AlertService, + ) {} ngOnInit(): void { this.allPageService.getAllQuiz().subscribe((response: any) => { @@ -115,7 +117,22 @@ export class AllPageComponent implements OnInit { } deleteQuiz(quiz: Quiz) { - Swal.fire({ + this.alertService.showConfirm( + '¿Deseas eliminar el registro?', + 'Una vez eliminado no se podrá recuperar', + () => { + // Acción de confirmación + this.allPageService.deleteQuiz(quiz.id).subscribe( + () => { + this.quizzes = this.quizzes.filter(q => q.id !== quiz.id); + }, + ), + () => { + // Lógica cuando se cancela + }, + 'Eliminar' + }) + alert.Swal.fire({ title: '¿Deseas eliminar el registro?', text: 'Una vez eliminado no se podrá recuperar', showCloseButton: true, diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index f502d45..394b434 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -15,11 +15,11 @@ " formControlName="name" [ngClass]="{ notice: isFieldInvalid('name') }" /> -
+
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 20db9fc..3246641 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, EventEmitter, Output } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { environment } from '@environments/environment'; import { ChangeDetectorRef } from '@angular/core'; @@ -6,6 +6,7 @@ import { firstValueFrom } from 'rxjs'; import { AuthService } from '@auth0/auth0-angular'; import { NewPageService } from './new-pages.service'; import { AlertService } from 'src/app/shared/components/alert/alert.service'; +import { Router } from '@angular/router'; @Component({ selector: 'app-new-pages', @@ -19,8 +20,11 @@ export class NewPagesComponent { private auth: AuthService, private newPageService: NewPageService, private alertService: AlertService, + private router: Router, ) {} + @Output() quizCreated = new EventEmitter(); + public selectNameForm = this.formsBuilder.group({ name: ['', [Validators.required, Validators.minLength(3)]], description: [''], @@ -283,6 +287,7 @@ export class NewPagesComponent { // If we have 10 questions, create the quiz with all questions if (this.temporaryQuestions.length === 10) { + this.quizData.name= this.selectNameForm.value.name; const quizWithQuestions = { ...this.quizData, questions: this.temporaryQuestions, @@ -308,6 +313,7 @@ export class NewPagesComponent { const data = await response.json(); this.quizID = data.id; this.pop = true; + this.quizCreated.emit(); } } catch (error) { console.error('Detailed error:', error); diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html index 2382dea..9d9f5ec 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.html @@ -42,11 +42,11 @@
- + +
- - -
diff --git a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts index 8bf88d1..c2141ef 100644 --- a/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts +++ b/src/app/modules/welcome/pages/welcome-page/welcome-page.component.ts @@ -120,6 +120,11 @@ export class WelcomePageComponent { this.toggleExpand1(); // Limpia el quiz seleccionado } + // Cuando se crea un nuevo quiz colapsa nuevo y abre todos + onQuizCreated() { + this.isExpanded2 = false; // Contraer Nuevo + this.isExpanded1 = true; // Expandir Todos + } } diff --git a/src/app/shared/components/alert/alert.service.ts b/src/app/shared/components/alert/alert.service.ts index dfed3a0..d998cc1 100644 --- a/src/app/shared/components/alert/alert.service.ts +++ b/src/app/shared/components/alert/alert.service.ts @@ -53,9 +53,9 @@ export class AlertService { title: title, text: text, icon: 'question', - showCancelButton: true, + showCloseButton: true, + showCancelButton: false, confirmButtonText: confirmButtonText, - cancelButtonText: cancelButtonText, customClass: { popup: 'custom-delete-popup', title: 'custom-delete-title', From e3adc166e174c6b4080478d2e518613d0f335b4d Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Tue, 3 Dec 2024 23:45:41 -0300 Subject: [PATCH 184/203] fix alert service style --- angular.json | 2 +- .../pages/all-page/all-page.component.html | 1 + .../pages/all-page/all-page.component.scss | 49 +------------- .../all/pages/all-page/all-page.component.ts | 59 ++++------------- .../pages/new-pages/new-pages.component.html | 24 ++----- .../pages/new-pages/new-pages.component.scss | 2 +- .../pages/new-pages/new-pages.component.ts | 10 +-- .../shared/components/alert/alert.service.ts | 1 - .../header-page/header-page.component.html | 8 ++- .../header-page/header-page.component.ts | 1 + src/styles.scss | 64 +++++++++---------- 11 files changed, 59 insertions(+), 162 deletions(-) diff --git a/angular.json b/angular.json index ef3b350..658ebf4 100644 --- a/angular.json +++ b/angular.json @@ -33,7 +33,7 @@ "src/mockServiceWorker.js", "src/_redirects" ], - "styles": [ "node_modules/bootstrap/dist/css/bootstrap.min.css","src/styles.scss"], + "styles": [ "node_modules/bootstrap/dist/css/bootstrap.min.css","src/styles.scss","node_modules/sweetalert2/dist/sweetalert2.min.css"], "scripts": [ "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"] }, "configurations": { diff --git a/src/app/modules/all/pages/all-page/all-page.component.html b/src/app/modules/all/pages/all-page/all-page.component.html index 73ba454..f3065e6 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.html +++ b/src/app/modules/all/pages/all-page/all-page.component.html @@ -2,6 +2,7 @@
diff --git a/src/app/modules/all/pages/all-page/all-page.component.scss b/src/app/modules/all/pages/all-page/all-page.component.scss index fda6d8e..10a13e3 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.scss +++ b/src/app/modules/all/pages/all-page/all-page.component.scss @@ -32,16 +32,11 @@ $spacing: 20px; .table-int{ margin: 0 auto; flex: auto; - - - } h2 { color: #fff; font-size: 1.5rem; margin: 0; - - } .filters { @@ -205,52 +200,13 @@ h2 { background-color: #333; } -::ng-deep .custom-delete-popup { - background-color: #1e1e1e; - color: #fff; - border-radius: 50px; - padding: 24px 24px 24px 24px; -} - -::ng-deep .custom-delete-title { - font-size: 24px; - padding: 0px 8px; - text-align: center; - opacity: 1; -} - -::ng-deep .custom-delete-confirm-button { - background: rgba(106, 95, 255, 1); - color: #fff; - font-size: 18px; - padding: 12px 24px; - border-radius: 16px; - box-shadow: none; - outline: none; - transition: background-color 0.3s ease; -} - -::ng-deep .custom-delete-confirm-button:hover { - background-color: #5a47cc; -} - -::ng-deep .swal2-close { - color: #fff; - font-size: 20px; -} - -::ng-deep .custom-delete-content { - padding: 24px 0 0 0; - gap: 24px; -} .quiz-table td { background-color: #222; text-align: center; // Centrar el texto horizontalmente padding: 12px; // Espacio alrededor del texto - font-family: "Poppins"; - + font-family: "Poppins"; } .actions button { @@ -259,9 +215,6 @@ h2 { border: none; cursor: pointer; color: white; - - - } .status { diff --git a/src/app/modules/all/pages/all-page/all-page.component.ts b/src/app/modules/all/pages/all-page/all-page.component.ts index 4e07c23..ae3cbea 100644 --- a/src/app/modules/all/pages/all-page/all-page.component.ts +++ b/src/app/modules/all/pages/all-page/all-page.component.ts @@ -122,60 +122,23 @@ export class AllPageComponent implements OnInit { 'Una vez eliminado no se podrá recuperar', () => { // Acción de confirmación - this.allPageService.deleteQuiz(quiz.id).subscribe( - () => { - this.quizzes = this.quizzes.filter(q => q.id !== quiz.id); - }, - ), - () => { - // Lógica cuando se cancela - }, - 'Eliminar' - }) - alert.Swal.fire({ - title: '¿Deseas eliminar el registro?', - text: 'Una vez eliminado no se podrá recuperar', - showCloseButton: true, - showCancelButton: false, - confirmButtonText: 'Eliminar', - customClass: { - popup: 'custom-delete-popup', - title: 'custom-delete-title', - confirmButton: 'custom-delete-confirm-button', - }, - }).then(result => { - if (result.isConfirmed) { this.allPageService.deleteQuiz(quiz.id).subscribe({ next: () => { this.quizzes = this.quizzes.filter(q => q.id !== quiz.id); - Swal.fire({ - title: 'Eliminado', - text: 'El registro ha sido eliminado.', - icon: 'success', - confirmButtonText: 'Entendido', - customClass: { - popup: 'custom-delete-popup', - title: 'custom-delete-title', - confirmButton: 'custom-delete-confirm-button', - }, - }); + this.alertService.showSuccess( + 'Eliminado', + 'El registro ha sido eliminado.') }, error: () => { - Swal.fire({ - title: 'Error', - text: 'No se pudo eliminar el registro.', - icon: 'error', - confirmButtonText: 'Entendido', - customClass: { - popup: 'custom-delete-popup', - title: 'custom-delete-title', - confirmButton: 'custom-delete-confirm-button', - }, - }); + this.alertService.showError( + 'Error', + 'No se pudo eliminar el registro.', + ) }, - }); - } - }); + }) + }, + 'Eliminar' + ) } editQuiz(quiz: Quiz) { diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 394b434..0351a32 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -8,26 +8,20 @@ - + formControlName="name"/>
-
+
@@ -36,6 +30,7 @@
@@ -153,15 +148,4 @@

Define la pregunta {{ questions.length + 1 }}/10

- - - -
diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.scss b/src/app/modules/new/pages/new-pages/new-pages.component.scss index abb6fab..b836c60 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.scss +++ b/src/app/modules/new/pages/new-pages/new-pages.component.scss @@ -65,7 +65,7 @@ .quiz-container-true { flex-wrap: wrap; width: 137vh; - height: 22vh; + height: 28vh; border-radius: 8px; padding: .4rem .4rem 1rem .4rem; font-size: 14px; diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.ts b/src/app/modules/new/pages/new-pages/new-pages.component.ts index 3246641..4a3907a 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.ts +++ b/src/app/modules/new/pages/new-pages/new-pages.component.ts @@ -62,7 +62,6 @@ export class NewPagesComponent { selectedOption: string = ''; inputType: string = ''; showButton: boolean = true; - pop: boolean = false; showForm: boolean = false; isTrueFalseQuestion: boolean = false; showPlus: boolean = false; @@ -118,7 +117,6 @@ export class NewPagesComponent { this.showButton = false; this.showForm = true; this.toggle = false; - this.showButton = false; // Guardar los datos del quiz para usarlos cuando tengamos todas las preguntas this.quizData.name= this.selectNameForm.value.name; @@ -136,10 +134,6 @@ export class NewPagesComponent { return index; } - closeFn() { - this.pop = false; - } - answerChoice(i: number) { if (this.correct_option.includes(i)) { this.correct_option = this.correct_option.filter( @@ -275,7 +269,6 @@ export class NewPagesComponent { }; this.temporaryQuestions.push(question); - this.pop = true; this.questions.push(formSection); // Reset form @@ -288,6 +281,7 @@ export class NewPagesComponent { // If we have 10 questions, create the quiz with all questions if (this.temporaryQuestions.length === 10) { this.quizData.name= this.selectNameForm.value.name; + this.quizData.description= this.selectNameForm.value.description; const quizWithQuestions = { ...this.quizData, questions: this.temporaryQuestions, @@ -312,7 +306,7 @@ export class NewPagesComponent { const data = await response.json(); this.quizID = data.id; - this.pop = true; + this.alertService.showSuccess('Cuestionario creado correctamente') this.quizCreated.emit(); } } catch (error) { diff --git a/src/app/shared/components/alert/alert.service.ts b/src/app/shared/components/alert/alert.service.ts index d998cc1..7e647dc 100644 --- a/src/app/shared/components/alert/alert.service.ts +++ b/src/app/shared/components/alert/alert.service.ts @@ -52,7 +52,6 @@ export class AlertService { Swal.fire({ title: title, text: text, - icon: 'question', showCloseButton: true, showCancelButton: false, confirmButtonText: confirmButtonText, diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index 73fdc04..b91f415 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -4,9 +4,11 @@

Módulo

- + @if(resetButton) { + + }
{{quizCategory?.module || 'Selecciona el modulo'}} diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index e8c7618..da4f579 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -13,6 +13,7 @@ import { switchMap } from 'rxjs'; export class HeaderPageComponent { @Input() editMode: boolean; //cambia modo editable a lectura + @Input() resetButton: boolean; //visivilidad del boton reset @Output() datosParaPadre = new EventEmitter(); //envia al componente padre la seleccion actual private headerPageService = inject(HeaderPageService) diff --git a/src/styles.scss b/src/styles.scss index 8d784bf..6e44488 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,43 +1,43 @@ /* You can add global styles to this file, and also import other style files */ -::ng-deep .custom-delete-popup { +.custom-delete-popup { background-color: #1e1e1e; color: #fff; border-radius: 50px; padding: 24px 24px 24px 24px; } - ::ng-deep .custom-delete-title { - font-size: 24px; - padding: 0px 8px; - text-align: center; - opacity: 1; - } - - ::ng-deep .custom-delete-confirm-button { - background: rgba(106, 95, 255, 1); - color: #fff; - font-size: 18px; - padding: 12px 24px; - border-radius: 16px; - box-shadow: none; - outline: none; - transition: background-color 0.3s ease; - } - - ::ng-deep .custom-delete-confirm-button:hover { - background-color: #5a47cc; - } - - ::ng-deep .swal2-close { - color: #fff; - font-size: 20px; - } - - ::ng-deep .custom-delete-content { - padding: 24px 0 0 0; - gap: 24px; - } +.custom-delete-title { + font-size: 24px; + padding: 0px 8px; + text-align: center; + opacity: 1; +} + +.custom-delete-confirm-button { + background: rgba(106, 95, 255, 1); + color: #fff; + font-size: 18px; + padding: 12px 24px; + border-radius: 16px; + box-shadow: none; + outline: none; + transition: background-color 0.3s ease; +} + +.custom-delete-confirm-button:hover { + background-color: #5a47cc; +} + +.swal2-close { + color: #fff; + font-size: 20px; +} + +.custom-delete-content { + padding: 24px 0 0 0; + gap: 24px; +} $gutter: 1rem; //for primeflex grid system @import 'assets/layout/styles/layout/layout.scss'; From 3c5cd2590d99901f57d371b1f345d9309a359463 Mon Sep 17 00:00:00 2001 From: nassahel Date: Wed, 4 Dec 2024 16:29:14 -0300 Subject: [PATCH 185/203] corregidos estilos de boton limpiar campos --- .../header-form/pages/header-page/header-page.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index 30b600c..1716a02 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -124,13 +124,13 @@ } .btn-plus { - height: 2rem; + height: 1.9rem; // width: 2rem; display: flex; align-items: center; font-size: .8rem; border-radius: 8px; - padding: 8px; + padding: 0 15px; background: linear-gradient(to right, #6a5fff80, #ff5ea680); border: none; } From de97190a511421de09908504623f26f2dd3aec06 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Fri, 6 Dec 2024 22:51:34 -0500 Subject: [PATCH 186/203] optimizacion componente edit --- .../edit-pages/edit-pages.component.html | 259 ++++++++++-------- .../edit-pages/edit-pages.component.scss | 193 +++++++++++-- 2 files changed, 307 insertions(+), 145 deletions(-) diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index 3dbe41d..a10015a 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -1,8 +1,8 @@ -
- volver al listado + +
volver al listado
@@ -16,7 +16,7 @@ formControlName="name" class="custom-input" placeholder="Nombre del quiz" - style="width: max-content;" /> + style="width: max-content" />
- - +
@@ -43,102 +40,112 @@ [formGroupName]="i" class="question-container"> - -
-
-
-

Editar pregunta

- -
-
-
-
-
- -
- -
-
+
+
+
+ +
-
- - -
-
+ +
+
+
+ +
+ +
+
-
-
-
-
- - -
- -
+
+ + +
+
-
-
- +
+
+
+
+ + +
+ +
+ +
+
+ +
+
+
+
+ +
+ + +
+
+
-
-
- -
- -
-
- -
-
@@ -155,21 +162,29 @@

Editar pregunta

class="option-row">
- +
+ +
+
- +
+ +
+
@@ -191,15 +206,18 @@

Editar pregunta

[formGroupName]="j" class="option-item"> - +
+ +
-
- -
- +
+ +
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss index 0962b88..1086ea2 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss @@ -21,13 +21,15 @@ $border-color: rgba(241, 121, 197, 1); display: flex; align-items: center; justify-content: space-between; - padding: inherit; + padding: 20px; .leave { color: white; flex: 0 0 33.33%; transition: 0.3s ease-in-out; text-decoration: none; + display: flex; + align-items: flex-end; &:hover { cursor: pointer; @@ -48,7 +50,7 @@ $border-color: rgba(241, 121, 197, 1); background-repeat: no-repeat; background-position: center; background-size: 414px 404px; - background-color: rgba(53, 52, 52, 0.8); + background-color: #353434; background-blend-mode: overlay; border-radius: 15px; padding: 20px; @@ -63,11 +65,17 @@ $border-color: rgba(241, 121, 197, 1); margin-bottom: 2rem; border-radius: 8px; border: 2.5px solid rgb(61, 36, 160); - position: relative; // Added for popup positioning + position: relative; +} +.question-container-edit{ + margin-bottom: 2rem; + border-radius: 8px; + position: relative; } #questions-scroll { overflow-y: scroll; + margin-top: 10px; } // Question Text and Options @@ -85,15 +93,16 @@ $border-color: rgba(241, 121, 197, 1); } .option-item { - display: inline-block; + display: inline-flex; align-items: center; width: 48%; margin-bottom: 10px; border: 1px solid $input-background; border-radius: 12px; background-color: $input-background; - padding: 10px; + padding: 5px; color: white; + margin-inline: 5px; } .option-label { @@ -103,12 +112,13 @@ $border-color: rgba(241, 121, 197, 1); // Edit Button .edit-button { - background: none; + background: rgb(58 54 54); border: none; - color: #6a5fff; + color: none; cursor: pointer; padding: 5px; transition: color 0.3s ease; + border-radius: 5px; &:hover { color: #ff5ea6; @@ -127,15 +137,18 @@ $border-color: rgba(241, 121, 197, 1); } .content-2 { - width: 137vh; + height: 500px; padding: 16px 0px 0px 0px; gap: 17px; font-family: Poppins; border-radius: 8px; padding: 16px; opacity: 0px; - background-color: #4f4d4d73; + background-color: #353434; box-shadow: 0px -3px 12.8px 0px rgba(241, 121, 197, 1); + animation: fadeIn 0.5s ease-in-out forwards; + animation-delay: 0.2s; // Delay the animation to allow the background to fade in first + z-index: 99999; .popup-header { display: flex; @@ -147,19 +160,6 @@ $border-color: rgba(241, 121, 197, 1); h3 { margin: 0; } - - .close-button { - background: none; - border: none; - color: white; - cursor: pointer; - font-size: 1.2rem; - padding: 5px; - - &:hover { - color: #ff5ea6; - } - } } } @@ -184,15 +184,158 @@ input[type='text'], // Save Button .save-button { padding: 10px 20px; - background-color: $secondary-color; + background: linear-gradient( + to right, + rgba(106, 95, 255, 0.5019607843), + rgba(255, 94, 166, 0.5019607843) + ); color: white; border: none; border-radius: 5px; cursor: pointer; transition: background-color 0.3s; - border: 2px solid $primary-color; &:hover { background-color: darken($secondary-color, 10%); } -} \ No newline at end of file +} +//edit + +.custom-label { + font-family: Poppins; + font-weight: 500; + font-size: 14px; + color: rgba(255, 255, 255, 1); +} + +.custom-select { + width: 60.5vh; + height: 28px; + border: none; + opacity: 0px; + padding: 0 0 0 8px; + + background: rgba(32, 32, 32, 1); + color: rgba(194, 187, 187, 0.6); +} +// .custom-input { +// width: 61vh; +// height: 4vh; +// border: none; +// gap: 0px; +// padding: 0px 8px 0px 8px; +// opacity: 0px; +// background: rgba(32, 32, 32, 1); +// border-radius: 8px; +// } + +.custom-option-group { + margin-bottom: 10px; +} + +// .option-row { +// width: 130vh; +// display: flex; +// justify-content: space-around; +// flex-wrap: wrap; +// } + +.custom-option-input { + width: 57vh; + height: 4vh; + border-radius: 8px; + background-color: #202020; + border: none; + color: gray; + border-radius: 0 8px 8px 0px; + cursor: pointer; +} + +.checkbox-container { + width: 4vh; + height: 4vh; + background-color: #303030; + border-radius: 8px 0 0 8px; + display: inline-flex; + justify-content: center; + align-items: center; + padding: 0; +} + +.checkbox-input { + font-size: large; +} + +.custom-radio { + padding: 0 0 0 8px; + width: 378px; +} + +.custom-add-option-btn { + width: 60vh; + gap: 5px; + border-radius: 8px; + padding: 5px; + color: #d8d6d6; +} + +.custom-btn-submit { + width: 91px; + height: 42px; + padding: 3px; + background-color: rgba(106, 95, 255, 1); + box-shadow: 0px 4px 4px 0px #00000026; + cursor: pointer; + border-radius: 8px; + border: 1.4px solid #706fe5; + font-size: 12px; + color: #ffff; +} +.close-button { + width: 91px; + height: 42px; + padding: 3px; + background-color: transparent; + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.1490196078); + cursor: pointer; + border-radius: 8px; + border: 1.4px solid #706fe5; + font-size: 12px; + color: #706fe5; +} + +.custom-btn-save { + width: 12vh; + height: 42px; + padding: 0.3rem; + top: 80vh; + right: 40vh; + position: absolute; + background-color: rgba(106, 95, 255, 1); + box-shadow: 0px 4px 4px 0px #00000026; + cursor: pointer; + border-radius: 8px; + border: 1.4px solid #706fe5; + font-size: 12px; + color: #ffff; +} + +.custom-btn-new-question { + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15); + width: 91px; + height: 42px; + padding: 8px; + border-radius: 8px; + border: 1.4px solid #5f5f5f; + font-size: 12px; + background: rgba(95, 95, 95, 1); + color: rgba(126, 126, 126, 1); + display: flex; + justify-content: center; + align-items: center; +} + +.label-input { + display: flex; + justify-content: flex-start; +} From 73cae2188ead524e98b3341f5ea653aa3a3f5d36 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Sun, 8 Dec 2024 20:15:22 -0300 Subject: [PATCH 187/203] start create component question-container and question --- src/app/app-routing.module.ts | 8 ++ src/app/modules/new/new.module.ts | 2 + .../pages/new-pages/new-pages.component.html | 5 +- .../welcome-candidato.component.html | 5 ++ .../welcome-candidato.component.scss | 4 + .../welcome-candidato.component.spec.ts | 23 ++++++ .../welcome-candidato.component.ts | 14 ++++ .../welcome-candidato.module.ts | 15 ++++ src/app/modules/welcome/welcome.module.ts | 1 + .../header-page/header-page.component.html | 25 ++++-- .../sideBar/side-bar/side-bar.component.html | 64 +++++++-------- .../question-container.component.html | 12 +++ .../question-container.component.scss | 28 +++++++ .../question-container.component.spec.ts | 23 ++++++ .../question-container.component.ts | 47 +++++++++++ .../question-container/question-interface.ts | 22 ++++++ .../question-container/question.service.ts | 16 ++++ .../shared/question/question.component.html | 33 ++++++++ .../shared/question/question.component.scss | 79 +++++++++++++++++++ src/app/shared/question/question.component.ts | 30 +++++++ 20 files changed, 416 insertions(+), 40 deletions(-) create mode 100644 src/app/modules/welcome-candidato/welcome-candidato.component.html create mode 100644 src/app/modules/welcome-candidato/welcome-candidato.component.scss create mode 100644 src/app/modules/welcome-candidato/welcome-candidato.component.spec.ts create mode 100644 src/app/modules/welcome-candidato/welcome-candidato.component.ts create mode 100644 src/app/modules/welcome-candidato/welcome-candidato.module.ts create mode 100644 src/app/shared/question-container/question-container.component.html create mode 100644 src/app/shared/question-container/question-container.component.scss create mode 100644 src/app/shared/question-container/question-container.component.spec.ts create mode 100644 src/app/shared/question-container/question-container.component.ts create mode 100644 src/app/shared/question-container/question-interface.ts create mode 100644 src/app/shared/question-container/question.service.ts create mode 100644 src/app/shared/question/question.component.html create mode 100644 src/app/shared/question/question.component.scss create mode 100644 src/app/shared/question/question.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1314e9f..465c2f5 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -8,6 +8,7 @@ import { HomePageComponent } from './modules/home/pages/home-page/home-page.comp import { AuthGuard } from '@auth0/auth0-angular'; import { RoleGuard } from '../app/modules/guards/role.guard'; // Importa el guardia de roles import { EditPagesComponent } from './modules/edit/pages/edit-pages/edit-pages.component'; +import { WelcomeCandidatoComponent } from './modules/welcome-candidato/welcome-candidato.component'; @NgModule({ imports: [ @@ -21,6 +22,13 @@ import { EditPagesComponent } from './modules/edit/pages/edit-pages/edit-pages.c loadChildren: () => import('./modules/home/home.module').then(m => m.HomeModule), }, + { + path: 'candidato', + component: WelcomeCandidatoComponent, + //canActivate: [AuthGuard,RoleGuard], + loadChildren: () => + import('./modules/welcome-candidato/welcome-candidato.module').then(m => m.WelcomeCandidatoModule), + }, // { path: 'edit', component: EditPagesComponent }, // { path: 'edit/:name', component: EditPagesComponent }, { diff --git a/src/app/modules/new/new.module.ts b/src/app/modules/new/new.module.ts index 2de4f07..cea77d8 100644 --- a/src/app/modules/new/new.module.ts +++ b/src/app/modules/new/new.module.ts @@ -5,6 +5,7 @@ import { NewRoutingModule } from './new-routing.module'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { SharedModule } from 'src/app/shared/shared.module'; import { HeaderFormModule } from 'src/app/shared/components/header-form/header-form.module'; +import { QuestionComponent } from 'src/app/shared/question/question.component'; @NgModule({ declarations: [NewPagesComponent], @@ -15,6 +16,7 @@ import { HeaderFormModule } from 'src/app/shared/components/header-form/header-f ReactiveFormsModule, SharedModule, HeaderFormModule, + QuestionComponent, ], exports: [NewPagesComponent], }) diff --git a/src/app/modules/new/pages/new-pages/new-pages.component.html b/src/app/modules/new/pages/new-pages/new-pages.component.html index 540da3f..7578c8f 100644 --- a/src/app/modules/new/pages/new-pages/new-pages.component.html +++ b/src/app/modules/new/pages/new-pages/new-pages.component.html @@ -36,13 +36,14 @@
- + @if(selectNameForm.valid && showButton) { } +

Define la pregunta {{ questions.length + 1 }}/10

@@ -121,7 +122,7 @@

Define la pregunta {{ questions.length + 1 }}/10

[(ngModel)]="options[i]" name="option{{ i }}" [placeholder]="'Opción ' + (i + 1)" - [readonly]="isTrueFalseQuestion" + disabled required />
diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.html b/src/app/modules/welcome-candidato/welcome-candidato.component.html new file mode 100644 index 0000000..dc454c0 --- /dev/null +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.html @@ -0,0 +1,5 @@ +
+ + + +
\ No newline at end of file diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.scss b/src/app/modules/welcome-candidato/welcome-candidato.component.scss new file mode 100644 index 0000000..61df69b --- /dev/null +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.scss @@ -0,0 +1,4 @@ +.layout-container { + display: flex; + height: 100vh; + } \ No newline at end of file diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.spec.ts b/src/app/modules/welcome-candidato/welcome-candidato.component.spec.ts new file mode 100644 index 0000000..cc3296b --- /dev/null +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WelcomeCandidatoComponent } from './welcome-candidato.component'; + +describe('WelcomeCandidatoComponent', () => { + let component: WelcomeCandidatoComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [WelcomeCandidatoComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(WelcomeCandidatoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.ts b/src/app/modules/welcome-candidato/welcome-candidato.component.ts new file mode 100644 index 0000000..ce64eaf --- /dev/null +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.ts @@ -0,0 +1,14 @@ +import { Component } from '@angular/core'; +import { SharedModule } from "../../shared/shared.module"; +import { QuestionContainerComponent } from "../../shared/question-container/question-container.component"; + +@Component({ + selector: 'app-welcome-candidato', + standalone: true, + imports: [SharedModule, QuestionContainerComponent], + templateUrl: './welcome-candidato.component.html', + styleUrl: './welcome-candidato.component.scss' +}) +export class WelcomeCandidatoComponent { + +} diff --git a/src/app/modules/welcome-candidato/welcome-candidato.module.ts b/src/app/modules/welcome-candidato/welcome-candidato.module.ts new file mode 100644 index 0000000..77ecd4b --- /dev/null +++ b/src/app/modules/welcome-candidato/welcome-candidato.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SideBarComponent } from 'src/app/shared/components/sideBar/side-bar/side-bar.component'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { QuestionContainerComponent } from 'src/app/shared/question-container/question-container.component'; + +@NgModule({ + declarations: [], + imports: [ + CommonModule, + SharedModule, + QuestionContainerComponent + ] +}) +export class WelcomeCandidatoModule { } diff --git a/src/app/modules/welcome/welcome.module.ts b/src/app/modules/welcome/welcome.module.ts index ef9b768..7bdc263 100644 --- a/src/app/modules/welcome/welcome.module.ts +++ b/src/app/modules/welcome/welcome.module.ts @@ -5,6 +5,7 @@ import { WelcomePageComponent } from './pages/welcome-page/welcome-page.componen import { AllModule } from '../all/all.module'; import { EditModule } from '../edit/edit.module'; import { NewModule } from '../new/new.module'; +import { QuestionComponent } from 'src/app/shared/question/question.component'; @NgModule({ declarations: [WelcomePageComponent], diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.html b/src/app/shared/components/header-form/pages/header-page/header-page.component.html index a912d51..39605af 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.html +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.html @@ -14,8 +14,10 @@

Módulo

+
+
+
+ +
+ +
+ +
+ +
+ +
- -
- -
-
- -
- - -
-
+
+ + +
+
\ No newline at end of file diff --git a/src/app/shared/question-container/question-container.component.scss b/src/app/shared/question-container/question-container.component.scss index 84bac15..517dc52 100644 --- a/src/app/shared/question-container/question-container.component.scss +++ b/src/app/shared/question-container/question-container.component.scss @@ -1,16 +1,27 @@ -.question-container{ - width: 1152px; - height: 623px; +.question-container { + width: 80vw; + height: 95vh; padding: 24px 8px 8px 8px; gap: 47px; border-radius: 12px 0px 0px 0px; opacity: 0px; display: flex; - align-items: center; + flex-direction: column; + // align-items: center; justify-content: center; + background-color: #212121; + margin: 0 1rem; + border-radius: .8rem; + backdrop-filter: blur(4px); + box-shadow: 0px 4px 4px 0px #00000040; + + // box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.25); + + // box-shadow: 0px 4px 9.5px 6px rgba(0, 0, 0, 0.25); + } -.counter-container{ +.counter-container { width: 108px; height: 36px; padding: 8px 0px 0px 0px; @@ -25,4 +36,12 @@ text-underline-position: from-font; text-decoration-skip-ink: none; +} + + +.button-container { + width: 804px; + margin: 0 auto; + text-align: end; + padding-right: 1rem; } \ No newline at end of file diff --git a/src/app/shared/question-container/question-container.component.ts b/src/app/shared/question-container/question-container.component.ts index db7a9db..84d6439 100644 --- a/src/app/shared/question-container/question-container.component.ts +++ b/src/app/shared/question-container/question-container.component.ts @@ -3,11 +3,12 @@ import { QuestionComponent } from '../question/question.component'; import { DatePipe } from '@angular/common'; import { QuestionService } from './question.service'; import { Question, ResponseQuestion } from './question-interface'; +import { BlueButtonComponent } from '../components/blue-button/blue-button.component'; @Component({ selector: 'app-question-container', standalone: true, - imports: [QuestionComponent, DatePipe], + imports: [QuestionComponent, DatePipe, BlueButtonComponent], templateUrl: './question-container.component.html', styleUrl: './question-container.component.scss' }) diff --git a/src/app/shared/question/question.component.html b/src/app/shared/question/question.component.html index f9b20c0..2c99bb9 100644 --- a/src/app/shared/question/question.component.html +++ b/src/app/shared/question/question.component.html @@ -1,33 +1,20 @@ -
+
Pregunta {{question.questionNumber }}
-
-
- {{ question.question }} -
+
+

{{ question.question }}

-
- @for(option of question.options; track $index){ -
-
- -
- -
- } + @for(option of question.options; track $index){ +
+
+ +
+ +
+ }
\ No newline at end of file diff --git a/src/app/shared/question/question.component.scss b/src/app/shared/question/question.component.scss index 67b26a2..80d9364 100644 --- a/src/app/shared/question/question.component.scss +++ b/src/app/shared/question/question.component.scss @@ -1,3 +1,10 @@ + +.form-group { + display: flex; + flex-wrap: wrap; + gap: 1rem; +} + .question-container { height: 278px; width: 804px; @@ -8,7 +15,8 @@ color: #FFFFFF; font-family: Poppins; backdrop-filter: blur(4px); - display: flexbox; + margin-bottom: 3rem; + margin: 0 auto; } .question-container-true { @@ -21,59 +29,54 @@ } .question-number { - width: 120px; - height: 28px; - gap: 0px; - opacity: 0px; + // width: 120px; + // height: 28px; + // gap: 0px; + // opacity: 0px; + // line-height: 28px; + // text-align: center; + // text-underline-position: from-font; + // text-decoration-skip-ink: none; font-size: 22px; font-weight: 400; - line-height: 28px; - text-align: center; - text-underline-position: from-font; - text-decoration-skip-ink: none; + margin-bottom: 2rem; } .question-container-text { - width: 772px; - height: 56px; - gap: 17px; - opacity: 0px; + background: #202020; + font-size: .9rem; + font-weight: 300; + padding: .5rem; + border-radius: 8px; + margin-bottom: 1rem; +} +.checkbox-container { + display: flex; + align-items: center; + border-radius: 8px; + overflow: hidden; } + .checkbox-input { width: 28px; height: 28px; - gap: 10px; - opacity: 0px; + display: flex; + align-items: center; + justify-content: center; background: #303030; - border-radius: 8px 0px 0px 8px; color: #6A6AE8 } + .question-option-text { width: 349px; height: 28px; - gap: 5px; - border-radius: 0px 8px 8px 0px; - opacity: 0px; border: none; background: #202020; cursor: pointer; + padding: 0 .7rem; } -.question-text { - width: 772px; - height: 28px; - padding: 0px 0px 0px 8px; - gap: 5px; - opacity: 0px; - background: #202020; - font-size: 10px; - font-weight: 300; - line-height: 11.68px; - text-align: left; - text-underline-position: from-font; - text-decoration-skip-ink: none; -} \ No newline at end of file From 4d6bdaa940685d0a35d7e528ead0f8ad80c9e8ee Mon Sep 17 00:00:00 2001 From: nassahel Date: Mon, 9 Dec 2024 01:12:28 -0300 Subject: [PATCH 191/203] se agrego titulo del componente question-container --- .../question-container.component.html | 14 +++- .../question-container.component.scss | 40 ++++++++-- src/index.html | 75 +++++++++---------- 3 files changed, 80 insertions(+), 49 deletions(-) diff --git a/src/app/shared/question-container/question-container.component.html b/src/app/shared/question-container/question-container.component.html index 98b47cb..1fa136f 100644 --- a/src/app/shared/question-container/question-container.component.html +++ b/src/app/shared/question-container/question-container.component.html @@ -1,7 +1,17 @@
-
- {{ counter | date:'mm:ss' }} +
+

Preguntas de práctica

+
+
+

Preguntas de selección simple.

+
+
+ {{ counter | date:'mm:ss' }} +
+
+
+ - - - - + + + TrainIt + + + + + + + + + - - - - + + + + + + + + + + + + + \ No newline at end of file From 0be626f8b3b87a7a32ae131edc61c7d4a1b14b83 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Mon, 9 Dec 2024 17:09:44 -0300 Subject: [PATCH 192/203] fix side bar --- .../sideBar/side-bar/side-bar.component.ts | 64 ++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts index 9cde4bb..0203cf6 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts @@ -1,12 +1,74 @@ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; +export type UserRole = 'admin' | 'candidate' | 'hr'; + +interface SidebarItem { + icon: string; + label: string; + route?: string; + type?: 'image' | 'icon'; +} @Component({ selector: 'app-side-bar', templateUrl: './side-bar.component.html', styleUrl: './side-bar.component.scss' }) export class SideBarComponent { + @Input() role: UserRole = 'admin'; + private adminItems: SidebarItem[] = [ + { + icon: '../../../../../assets/demo/images/dos/Vector.png', + label: 'Gestión Quizz', + type: 'image' + }, + { + icon: '../../../../../assets/demo/images/tres/Vector.png', + label: 'Gestión Challenge', + type: 'image' + }, + { + icon: '../../../../../assets/demo/images/cuatro/Administrador/Crear Quizz/Vector.png', + label: 'Gestionar Candidatos', + type: 'image' + }, + { + icon: 'bi bi-trophy', + label: 'Salir', + type: 'icon' + } + ]; + + private candidateItems: SidebarItem[] = [ + { + icon: '../../../../../assets/demo/images/dos/Vector.png', + label: 'Gestión Quizz', + type: 'image' + }, + { + icon: '../../../../../assets/demo/images/tres/Vector.png', + label: 'Gestión Challenge', + type: 'image' + }, + { + icon: '../../../../../assets/demo/images/cuatro/Administrador/Crear Quizz/Vector.png', + label: 'Gestionar Candidatos', + type: 'image' + }, + { + icon: 'bi bi-trophy', + label: 'Salir', + type: 'icon' + } + ]; + // Método para obtener los items según el rol + get sidebarItems(): SidebarItem[] { + switch(this.role) { + case 'admin': return this.adminItems; + case 'candidate': return this.candidateItems; + default: return []; + } + } } /* import { Component } from '@angular/core'; From 7d8c1f5948d99a851898bdce57ebc8c534be9113 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Mon, 9 Dec 2024 21:52:40 -0500 Subject: [PATCH 193/203] modificaciones edit-page --- .../edit-pages/edit-pages.component.html | 8 ++- .../edit-pages/edit-pages.component.scss | 1 + .../pages/edit-pages/edit-pages.component.ts | 20 ++++++ .../header-page/header-page.component.scss | 2 +- .../header-page/header-page.component.ts | 63 +++++++++++++++++-- 5 files changed, 86 insertions(+), 8 deletions(-) diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html index c12eb02..15127df 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.html +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.html @@ -27,7 +27,11 @@
- + +
@@ -230,7 +234,7 @@
+ style="display: flex; justify-content: space-around">
diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss index 05e5fbd..bca7076 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.scss @@ -209,6 +209,7 @@ input[type='text'], border-radius: 5px; cursor: pointer; transition: background-color 0.3s; + margin-left: 50%; &:hover { background-color: darken($secondary-color, 10%); diff --git a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts index 5b3bbb8..503a5c1 100644 --- a/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts +++ b/src/app/modules/edit/pages/edit-pages/edit-pages.component.ts @@ -35,6 +35,7 @@ export class EditPagesComponent implements OnInit { selectedValues: boolean[] = []; correct_option: number[] = []; selectedRadio: string | null = null; + initialQuizCategory: any = null; constructor( private formBuilder: FormBuilder, @@ -66,6 +67,21 @@ export class EditPagesComponent implements OnInit { name: quizData.name, description: quizData.description, }); + + const quizCategory = { + module: quizData.module?.value || '', + moduleId: quizData.module?.id || '', + cell: quizData.cell?.name || '', + cellId: quizData.cell?.id || '', + cellClass: quizData.cell + ? this.getCellClass(quizData.cell.index) + : '', + seniority: quizData.seniority || '', + }; + + console.log('Quiz Category:', quizCategory); + this.initialQuizCategory = quizCategory; + this.populateQuestions(quizData.questions); }, error: error => { @@ -73,6 +89,10 @@ export class EditPagesComponent implements OnInit { }, }); } + private getCellClass(index: number): string { + const cellNumber = (index % 10) + 1; + return `cell-color-${cellNumber}`; + } private populateQuestions(questions: any[]) { const questionForms = questions.map(question => { diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss index 1716a02..4b6d54e 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.scss +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.scss @@ -145,7 +145,7 @@ } h4 { - margin: 0; + margin: 0 !important; font-size: 16px; } diff --git a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts index da4f579..3743b12 100644 --- a/src/app/shared/components/header-form/pages/header-page/header-page.component.ts +++ b/src/app/shared/components/header-form/pages/header-page/header-page.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, EventEmitter, HostListener, inject, Input, Output } from '@angular/core'; +import { Component, ElementRef, EventEmitter, HostListener, inject, Input, OnInit, Output } from '@angular/core'; import { FormControl, Validators } from '@angular/forms'; import { HeaderPageService } from './header-page.service'; import { Module, Cell, Seniority } from './header-page.interface'; @@ -11,7 +11,7 @@ import { switchMap } from 'rxjs'; }) export class HeaderPageComponent { - + @Input() initialCategory: any; //recibe la seleccion actual del componente padre @Input() editMode: boolean; //cambia modo editable a lectura @Input() resetButton: boolean; //visivilidad del boton reset @Output() datosParaPadre = new EventEmitter(); //envia al componente padre la seleccion actual @@ -53,9 +53,62 @@ export class HeaderPageComponent { }; ngOnInit(): void { - //Consulta los modulos y las celullas que tiene anidadas - this.getCategory() - + // Consulta los modulos y las celullas que tiene anidadas + this.getCategory(); + + // If initial category is provided, set it after modules are loaded + if (this.initialCategory) { + this.setInitialCategory(); + } + } + + setInitialCategory() { + // Increase delay and add error handling + setTimeout(() => { + if (!this.initialCategory) { + console.warn('No initial category provided'); + return; + } + + console.log('Initial Category:', this.initialCategory); + console.log('Available Modules:', this.modules); + + if (this.initialCategory.module) { + // Use find with more robust matching + const module = this.modules.find(m => + m.name.trim().toLowerCase() === this.initialCategory.module.trim().toLowerCase() + ); + + if (module) { + console.log('Found Module:', module); + + // Select the module + this.selectModule(module); + + // If cell is provided + if (this.initialCategory.cell) { + const cell = module.cell.find(c => + c.name.trim().toLowerCase() === this.initialCategory.cell.trim().toLowerCase() + ); + + if (cell) { + const cellIndex = module.cell.indexOf(cell); + console.log('Found Cell:', cell, 'at index', cellIndex); + this.selectCell(cell, cellIndex); + } else { + console.warn('Cell not found:', this.initialCategory.cell); + } + } + + // If seniority is provided + if (this.initialCategory.seniority) { + this.selectSeniority(this.initialCategory.seniority); + } + } else { + console.warn('Module not found:', this.initialCategory.module); + } + } + }, 300); // Increased delay to 300ms } //obtiene los modulos y celulas de la api getCategory() { From 68af148ac256754d3b1e674d192e0350982e36d2 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Tue, 10 Dec 2024 09:41:02 -0300 Subject: [PATCH 194/203] fix sidebar --- .../welcome-candidato.module.ts | 1 - .../sideBar/side-bar/side-bar.component.html | 29 +++++++------------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/app/modules/welcome-candidato/welcome-candidato.module.ts b/src/app/modules/welcome-candidato/welcome-candidato.module.ts index 77ecd4b..1d9c289 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.module.ts +++ b/src/app/modules/welcome-candidato/welcome-candidato.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SideBarComponent } from 'src/app/shared/components/sideBar/side-bar/side-bar.component'; import { SharedModule } from 'src/app/shared/shared.module'; import { QuestionContainerComponent } from 'src/app/shared/question-container/question-container.component'; diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index 23297f0..4cce369 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -6,28 +6,21 @@
-
+ + @for (item of sidebarItems; track $index) { -
- -
- -
- -
- -
+ }
+
}
-
diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts index 0203cf6..d0e491b 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; - +import { AuthService } from '@auth0/auth0-angular'; export type UserRole = 'admin' | 'candidate' | 'hr'; interface SidebarItem { @@ -15,6 +15,10 @@ interface SidebarItem { }) export class SideBarComponent { @Input() role: UserRole = 'admin'; + isSidebarOpen: boolean = true; + + constructor( + private authService: AuthService) {} private adminItems: SidebarItem[] = [ { @@ -32,34 +36,26 @@ export class SideBarComponent { label: 'Gestionar Candidatos', type: 'image' }, - { - icon: 'bi bi-trophy', - label: 'Salir', - type: 'icon' - } + ]; private candidateItems: SidebarItem[] = [ { - icon: '../../../../../assets/demo/images/dos/Vector.png', - label: 'Gestión Quizz', + icon: '../../../../../assets/demo/candidate/sidebar/inicio.png', + label: 'Inicio', type: 'image' }, { - icon: '../../../../../assets/demo/images/tres/Vector.png', - label: 'Gestión Challenge', + icon: '../../../../../assets/demo/candidate/sidebar/challenge.png', + label: 'Challenge', type: 'image' }, { icon: '../../../../../assets/demo/images/cuatro/Administrador/Crear Quizz/Vector.png', - label: 'Gestionar Candidatos', + label: 'Mis Challenge', type: 'image' }, - { - icon: 'bi bi-trophy', - label: 'Salir', - type: 'icon' - } + ]; // Método para obtener los items según el rol get sidebarItems(): SidebarItem[] { @@ -69,8 +65,17 @@ export class SideBarComponent { default: return []; } } -} + + toggleSidebar() { + this.isSidebarOpen = !this.isSidebarOpen; + } + logout() { + this.authService.logout().subscribe(() => { + window.location.href = ''; + }); + } +} /* import { Component } from '@angular/core'; import { AuthService } from '@auth0/auth0-angular'; diff --git a/src/assets/demo/images/candidate/sidebar/Challenge.png b/src/assets/demo/images/candidate/sidebar/Challenge.png new file mode 100644 index 0000000000000000000000000000000000000000..497e9ea027c3eadc19869c88b21d3a0cac21d1a8 GIT binary patch literal 691 zcmV;k0!;mhP)E6Co^yLY$NY3#?$QEeQ&<`-u!%vkYOLXHzg0C1Pn!ej~D|cp8dQy4AOis>ElVq z?*VX|0rwKU7-r1T`S{D>FcYxR_KRq6A|9o9lf#JN7b2dS z3Py%+Eh|(8&>CM>u66IYQxe_c|#% z0ka@%xDGoS8)#{+fw|V`{HYRp+_oDC!|~_Gafa4cV}fAOHXW002ovPDHLkV1l)AGhzS$ literal 0 HcmV?d00001 diff --git a/src/assets/demo/images/candidate/sidebar/MisChallenge.png b/src/assets/demo/images/candidate/sidebar/MisChallenge.png new file mode 100644 index 0000000000000000000000000000000000000000..894714d55c2ad3a70b988a0ccb7f82ca3e254b80 GIT binary patch literal 513 zcmV+c0{;DpP)n|HXP&0E%hY^R8qBPia)Z|c7 z6onz6s@DFvK{+|mGm{|QqSdtkjn1n{NE;{%%&TUW2w|QIEUU@zW*yt0V4QBnr{1b= z=3aME3v5ZhLcpNvOhQ`#v_qqF(FttH8<7i)T`R=TNGLy!ttga=!jc#M@ckT0Wnea_ zCBq|3z_+ax^_ucAF*YDS3{bPRqFxJM8{%Z$Ipg4CFtui2L5#I1HfYuvJNoyllplMm zHlZK(uCMxdrn(?-^!gvlA`CzWO3AJfB_s>x_}j`GUG6)ip7LnXnbgDDWcoZO$%&AsW4FWPCD7hX+hVx%K=j0(T%kQK%QF-zSzPPx)$?>aa^KGH`zuTVRD>r>K mAqjs7UtO_zN3nTNHthfzYqmVi1zHsV0000 Date: Wed, 11 Dec 2024 10:51:39 -0300 Subject: [PATCH 196/203] =?UTF-8?q?modulo=20creado=20:=20=20dasboard-page?= =?UTF-8?q?=20,=20bloque=202=20,=20falta=20dise=C3=B1o=20y=20logica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 9 +- src/app/modules/all/all.module.ts | 24 ++-- .../candidato-dashboard-routing.module.ts | 13 ++ .../candidato-dashboard.module.ts | 18 +++ .../dashboard-page.component.html | 15 ++ .../dashboard-page.component.scss | 128 ++++++++++++++++++ .../dashboard-page.component.spec.ts | 23 ++++ .../dashboard-page.component.ts | 23 ++++ .../pages/home-page/home-page.component.html | 4 +- src/assets/backend.png | Bin 0 -> 43791 bytes src/assets/frontend.png | Bin 0 -> 39746 bytes src/assets/fullstack.png | Bin 0 -> 47783 bytes src/assets/qa.png | Bin 0 -> 47295 bytes src/assets/scrum.png | Bin 0 -> 11546 bytes src/assets/ui.png | Bin 0 -> 41259 bytes 15 files changed, 246 insertions(+), 11 deletions(-) create mode 100644 src/app/modules/candidato-dashboard/candidato-dashboard-routing.module.ts create mode 100644 src/app/modules/candidato-dashboard/candidato-dashboard.module.ts create mode 100644 src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.html create mode 100644 src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.scss create mode 100644 src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.spec.ts create mode 100644 src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.ts create mode 100644 src/assets/backend.png create mode 100644 src/assets/frontend.png create mode 100644 src/assets/fullstack.png create mode 100644 src/assets/qa.png create mode 100644 src/assets/scrum.png create mode 100644 src/assets/ui.png diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1314e9f..62400c3 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -8,7 +8,7 @@ import { HomePageComponent } from './modules/home/pages/home-page/home-page.comp import { AuthGuard } from '@auth0/auth0-angular'; import { RoleGuard } from '../app/modules/guards/role.guard'; // Importa el guardia de roles import { EditPagesComponent } from './modules/edit/pages/edit-pages/edit-pages.component'; - +import { CandidatoDashboardModule } from './modules/candidato-dashboard/candidato-dashboard.module'; @NgModule({ imports: [ RouterModule.forRoot( @@ -23,6 +23,13 @@ import { EditPagesComponent } from './modules/edit/pages/edit-pages/edit-pages.c }, // { path: 'edit', component: EditPagesComponent }, // { path: 'edit/:name', component: EditPagesComponent }, + { + path: 'candidato', // Define la ruta para /candidato + loadChildren: () => + import('./modules/candidato-dashboard/candidato-dashboard.module').then( + (m) => m.CandidatoDashboardModule + ), + }, { path: '', component: AuthPageComponent, diff --git a/src/app/modules/all/all.module.ts b/src/app/modules/all/all.module.ts index 7dea988..f9a5d9f 100644 --- a/src/app/modules/all/all.module.ts +++ b/src/app/modules/all/all.module.ts @@ -1,30 +1,37 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { AllPageComponent } from './pages/all-page/all-page.component'; -import { ViewQuizComponent } from './pages/view-quiz/view-quiz.component'; // Asegúrate de importar el componente +import { ViewQuizComponent } from './pages/view-quiz/view-quiz.component'; import { AllRoutingModule } from './all-routing.module'; import { RouterModule, Routes } from '@angular/router'; import { FormsModule } from '@angular/forms'; import { HeaderFormModule } from 'src/app/shared/components/header-form/header-form.module'; import { EditModule } from '../edit/edit.module'; import { EditPagesComponent } from '../edit/pages/edit-pages/edit-pages.component'; - +import { CandidatoDashboardModule } from '../candidato-dashboard/candidato-dashboard.module'; const routes: Routes = [ { path: 'view-quiz/:id', // Define la ruta con el parámetro 'id' - component: ViewQuizComponent + component: ViewQuizComponent, }, { path: 'edit-pages/:id', // Define la ruta con el parámetro 'id' - component: EditPagesComponent + component: EditPagesComponent, }, + // { + // path: 'candidato', // Define la ruta para /candidato + // loadChildren: () => + // import('../candidato-dashboard/candidato-dashboard.module').then( + // (m) => m.CandidatoDashboardModule + // ), + // }, ]; @NgModule({ declarations: [ AllPageComponent, - ViewQuizComponent // Asegúrate de declarar el componente aquí + ViewQuizComponent, ], imports: [ CommonModule, @@ -32,11 +39,12 @@ const routes: Routes = [ FormsModule, HeaderFormModule, EditModule, - RouterModule.forChild(routes) // Cambia forRoot por forChild + CandidatoDashboardModule, // Importa el módulo + RouterModule.forChild(routes), // Cambia forRoot por forChild ], exports: [ AllPageComponent, - ViewQuizComponent // Puedes exportar si es necesario - ] + ViewQuizComponent, + ], }) export class AllModule {} diff --git a/src/app/modules/candidato-dashboard/candidato-dashboard-routing.module.ts b/src/app/modules/candidato-dashboard/candidato-dashboard-routing.module.ts new file mode 100644 index 0000000..5b4df8e --- /dev/null +++ b/src/app/modules/candidato-dashboard/candidato-dashboard-routing.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { DashboardPageComponent } from './dashboard-page/dashboard-page.component'; + +const routes: Routes = [ + { path: '', component: DashboardPageComponent } // Ruta principal del módulo +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], // Importa las rutas + exports: [RouterModule] // Exporta el módulo de enrutamiento +}) +export class CandidatoDashboardRoutingModule {} diff --git a/src/app/modules/candidato-dashboard/candidato-dashboard.module.ts b/src/app/modules/candidato-dashboard/candidato-dashboard.module.ts new file mode 100644 index 0000000..72af15d --- /dev/null +++ b/src/app/modules/candidato-dashboard/candidato-dashboard.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { DashboardPageComponent } from './dashboard-page/dashboard-page.component'; +import { CandidatoDashboardRoutingModule } from './candidato-dashboard-routing.module'; + +@NgModule({ + declarations: [ + DashboardPageComponent, // Declara el componente + ], + imports: [ + CommonModule, + CandidatoDashboardRoutingModule, // Importa el módulo de enrutamiento + ], + exports: [ + DashboardPageComponent, // Exporta el componente para que sea reutilizable + ], +}) +export class CandidatoDashboardModule {} diff --git a/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.html b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.html new file mode 100644 index 0000000..4b6ed60 --- /dev/null +++ b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.html @@ -0,0 +1,15 @@ +
+
+

Bienvenido {{ userName }}

+

{{ currentDate }}

+
+
+
+ {{ item.title}} + +
+
+
+ Volver al listado +
+
diff --git a/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.scss b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.scss new file mode 100644 index 0000000..7f24d12 --- /dev/null +++ b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.scss @@ -0,0 +1,128 @@ +.dashboard-container { + width: 100%; + max-width: 1034px; + height: 551px; + padding: 16px 0 0; + gap: 58px; + margin: 0 auto; + display: flex; + flex-direction: column; + align-items: center; + position: relative; + opacity: 1; +} + +.header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 20px; + width: 100%; +} + +.header h1 { + font-size: 2rem; + margin: 0; +} + +.header span { + color: #55aaff; +} + +.header .date { + font-size: 1rem; + color: #ccc; + margin-left: 20px; +} + +.grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 20px; + width: 100%; + justify-content: center; + align-items: center; + flex: 1; +} + +.card { + width: 206px; + height: 250px; + border-radius: 16px; + position: relative; + transition: transform 0.3s ease, box-shadow 0.3s ease; +} + +.card:hover { + transform: scale(1.05); + box-shadow: 0 4px 20px rgba(0, 0, 0, 0.5); +} + +.card img { + width: 152px; + height: 143px; +} + +.card .title { + visibility: hidden; + color: white; + transform: translateY(10px); + transition: opacity 0.3s, transform 0.6s; + width: 206px; + height: 90px; + gap: 0px; + opacity: 0; + font-family: Poppins; + font-size: 36px; + font-weight: 700; + line-height: 45px; + letter-spacing: 0.2px; + text-align: center; + text-decoration-skip-ink: none; +} + +.card:hover .title { + opacity: 1; + visibility: visible; + transform: translateY(0); +} + + +.footer { + width: 100%; + display: flex; + justify-content: center; + margin-top: 20px; +} + +.footer .btn-custom { + display: flex; + padding: 8px 16px; + background-color: transparent; + color: #55aaff; + border-radius: 50px; + font-size: 1rem; + text-decoration: none; + transition: transform 0.3s ease, background-color 0.3s ease, color 0.3s ease; +} + +.footer .btn-custom:hover { + color: violet; + transform: scale(1.1); + + +} + +.footer .btn-custom i { + margin-right: 8px; + //styleName: TrainIt/Label/Small; +font-family: Poppins; +font-size: 10px; +font-weight: 400; +line-height: 16px; +letter-spacing: -0.02em; +text-align: left; +text-underline-position: from-font; +text-decoration-skip-ink: none; + +} diff --git a/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.spec.ts b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.spec.ts new file mode 100644 index 0000000..9574349 --- /dev/null +++ b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DashboardPageComponent } from './dashboard-page.component'; + +describe('DashboardPageComponent', () => { + let component: DashboardPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [DashboardPageComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(DashboardPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.ts b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.ts new file mode 100644 index 0000000..c84f15a --- /dev/null +++ b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.ts @@ -0,0 +1,23 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-dashboard-page', + templateUrl: './dashboard-page.component.html', + styleUrls: ['./dashboard-page.component.scss'] +}) +export class DashboardPageComponent implements OnInit { + userName: string = 'Usuario'; // Puedes obtener el nombre de usuario desde algún servicio + currentDate: string = new Date().toLocaleDateString(); // Fecha actual + items: any[] = [ + { title: 'Diseño UX', icon: 'assets/ui.png' }, + { title: 'Frontend', icon: 'assets/frontend.png' }, + { title: 'Backend', icon: 'assets/backend.png' }, + { title: 'Fullstack', icon: 'assets/fullstack.png' }, + { title: 'PM', icon: 'assets/qa.png' }, + { title: 'QA', icon: 'assets/scrum.png' } + ]; + + constructor() {} + + ngOnInit(): void {} +} diff --git a/src/app/modules/home/pages/home-page/home-page.component.html b/src/app/modules/home/pages/home-page/home-page.component.html index f03c096..6949d66 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.html +++ b/src/app/modules/home/pages/home-page/home-page.component.html @@ -3,7 +3,7 @@
-
+
diff --git a/src/assets/backend.png b/src/assets/backend.png new file mode 100644 index 0000000000000000000000000000000000000000..7def960656221fc539193ecc5f6436ecb78536d6 GIT binary patch literal 43791 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

c=t@1JROE#`M!z<$rUiAZ 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 literal 0 HcmV?d00001 diff --git a/src/assets/frontend.png b/src/assets/frontend.png new file mode 100644 index 0000000000000000000000000000000000000000..ab1b40c9a934c34c3f74158532d6e161060bb767 GIT binary patch literal 39746 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 literal 0 HcmV?d00001 diff --git a/src/assets/fullstack.png b/src/assets/fullstack.png new file mode 100644 index 0000000000000000000000000000000000000000..a93d6c4fedc3b7739fd7e18591743da5a2c16125 GIT binary patch literal 47783 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ΜYo(e+f5qf%8WnPR=Z!lv$1Xj~f6HWce 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 literal 0 HcmV?d00001 diff --git a/src/assets/qa.png b/src/assets/qa.png new file mode 100644 index 0000000000000000000000000000000000000000..f6589819c5a35a00dab670e5421c6c70e8154803 GIT binary patch literal 47295 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 R0s;OUJ!on6#^l27{{jc{jc5P> literal 0 HcmV?d00001 diff --git a/src/assets/scrum.png b/src/assets/scrum.png new file mode 100644 index 0000000000000000000000000000000000000000..324b53e63da98e60b4acaadda71643c0b306582e GIT binary patch literal 11546 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 I1JhUk3x@p_V*mgE literal 0 HcmV?d00001 diff --git a/src/assets/ui.png b/src/assets/ui.png new file mode 100644 index 0000000000000000000000000000000000000000..dfd0460ebe57fec7f5af156906a0ede7b5cbe562 GIT binary patch literal 41259 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 Date: Wed, 11 Dec 2024 18:02:24 -0300 Subject: [PATCH 197/203] fix sidebar style --- .../pages/home-page/home-page.component.html | 5 ++- .../welcome-candidato.component.html | 3 +- .../sideBar/side-bar/side-bar.component.html | 27 +++++++++----- .../sideBar/side-bar/side-bar.component.scss | 35 +++++++++++++++++-- .../sideBar/side-bar/side-bar.component.ts | 15 +++++--- 5 files changed, 66 insertions(+), 19 deletions(-) diff --git a/src/app/modules/home/pages/home-page/home-page.component.html b/src/app/modules/home/pages/home-page/home-page.component.html index f03c096..ce72344 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.html +++ b/src/app/modules/home/pages/home-page/home-page.component.html @@ -1,5 +1,8 @@

-
+
diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.html b/src/app/modules/welcome-candidato/welcome-candidato.component.html index 21ddbb7..1dd6dbf 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.component.html +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.html @@ -1,6 +1,7 @@
+ role="candidate" + [extended]="false"> diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index d12fec0..49b7def 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -1,22 +1,28 @@ -
+
- logo + logo
@for (item of sidebarItems; track $index) { - }
@@ -24,19 +30,22 @@
-
diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss index d75c98f..287afc4 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss @@ -3,7 +3,7 @@ background: #212121; box-shadow: 0px 4px 4px 0px #00000040; height: 95vh; - width: 31vh; /* Ancho fijo para pantallas grandes */ + width: 60px; /* Ancho fijo para pantallas grandes */ border-radius: 0px 12px 12px 0px; z-index: 9999; display: flex; @@ -13,6 +13,20 @@ transition: width 0.3s ease; /* Suaviza la transición */ } + +.sidebar-container-extended { + background: #212121; + box-shadow: 0px 4px 4px 0px #00000040; + height: 95vh; + width: 31vh; /* Ancho fijo para pantallas grandes */ + border-radius: 0px 12px 12px 0px; + z-index: 9999; + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-around; + transition: width 0.3s ease; /* Suaviza la transición */ +} .sidebar-btns-container { display: flex; flex-direction: column; @@ -33,7 +47,19 @@ .sidebar-btns { background-color: #5F5F5F; - width: 28vh; + width: 50px; + height: 5vh; + border-radius: 10px; + padding: 0px 16px 0px 16px; + gap: 16px; + border: solid 1px #333232; + display: flex; + justify-content: flex-start; + align-items: center; +} +.sidebar-btns-extended { + background-color: #5F5F5F; + width: 30vh; height: 5vh; border-radius: 10px; padding: 0px 16px 0px 16px; @@ -60,9 +86,12 @@ } .side-img { + width: 40px; + height: 41px; +} +.side-img-extended { height: 6rem; } - .sidebar-btns i { color: #5974c7; font-size: 11.5px; diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts index d0e491b..cf63d27 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.ts +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.ts @@ -1,4 +1,5 @@ import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; import { AuthService } from '@auth0/auth0-angular'; export type UserRole = 'admin' | 'candidate' | 'hr'; @@ -15,10 +16,14 @@ interface SidebarItem { }) export class SideBarComponent { @Input() role: UserRole = 'admin'; + @Input() extended: boolean = true ; + isSidebarOpen: boolean = true; constructor( - private authService: AuthService) {} + private authService: AuthService, + private router: Router, + ) {} private adminItems: SidebarItem[] = [ { @@ -41,17 +46,17 @@ export class SideBarComponent { private candidateItems: SidebarItem[] = [ { - icon: '../../../../../assets/demo/candidate/sidebar/inicio.png', + icon: '../../../../../assets/demo/images/candidate/sidebar/inicio.png', label: 'Inicio', type: 'image' }, { - icon: '../../../../../assets/demo/candidate/sidebar/challenge.png', + icon: '../../../../../assets/demo/images/candidate/sidebar/Challenge.png', label: 'Challenge', type: 'image' }, { - icon: '../../../../../assets/demo/images/cuatro/Administrador/Crear Quizz/Vector.png', + icon: '../../../../../assets/demo/images/candidate/sidebar/MisChallenge.png', label: 'Mis Challenge', type: 'image' }, @@ -72,7 +77,7 @@ export class SideBarComponent { logout() { this.authService.logout().subscribe(() => { - window.location.href = ''; + this.router.navigate(['']); }); } } From 208d9eaa848d705b077439aa3e1ec0e1cc28be27 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Wed, 11 Dec 2024 20:32:14 -0500 Subject: [PATCH 198/203] edit componente --- src/app/modules/edit/pages/edit-pages/services/quiz.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts b/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts index e945636..80a6708 100644 --- a/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts +++ b/src/app/modules/edit/pages/edit-pages/services/quiz.service.ts @@ -25,7 +25,7 @@ export class QuizService { // Método para actualizar un cuestionario updateQuiz(id: string, quizData: any): Observable { - return this.http.put(`${this.apiUrl}/nested/${id}`, quizData).pipe( + return this.http.put(`${this.apiUrl}/${id}`, quizData).pipe( catchError(error => { console.error('Error al actualizar el cuestionario:', error); return throwError(error); From b034665d9c6ff5fda4b3b6f06f8b50fa812cdaf1 Mon Sep 17 00:00:00 2001 From: JavierBrizuela Date: Fri, 13 Dec 2024 01:25:02 -0300 Subject: [PATCH 199/203] add question test --- .../welcome-candidato.component.html | 59 ++++++++----- .../welcome-candidato.component.scss | 8 +- .../welcome-candidato.component.ts | 4 + .../question-container-test.component.html | 1 + .../question-container-test.component.scss | 0 .../question-container-test.component.spec.ts | 23 ++++++ .../question-container-test.component.ts | 12 +++ .../question-container.component.html | 18 ++-- .../question-container.component.ts | 82 +++++++++++++++---- src/app/shared/question/question.component.ts | 6 +- 10 files changed, 161 insertions(+), 52 deletions(-) create mode 100644 src/app/shared/question-container-test/question-container-test.component.html create mode 100644 src/app/shared/question-container-test/question-container-test.component.scss create mode 100644 src/app/shared/question-container-test/question-container-test.component.spec.ts create mode 100644 src/app/shared/question-container-test/question-container-test.component.ts diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.html b/src/app/modules/welcome-candidato/welcome-candidato.component.html index c6ba257..7541218 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.component.html +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.html @@ -4,31 +4,46 @@ role="candidate" [extended]="false"> -
-
+ @if (step === 1) { +
Bienvenido al Challenge TrainIT
+
+ Gracias por tu interés en formar parte de la comunidad TrainIT. Bienvenido a nuestro Challenge TrainIT. + Completar este Challenge le permitirá demostrar las habilidades requeridas para este rol +
+
+ +
  • Este Challenge consta de 10 preguntas sencillas (Selección simple, múlitple y Verdadero/Falso).
    • +
  • Completarlo te dará la oportunidad de mostrar tus habilidades.
    • +
  • La evaluación está cronometrada. Se muestra un temporizador.
    • +
  • Recomendamos completar la evaluación de una sola vez.
    • +
    + Buena Suerte! +
    +
    + + +
    -
    - Gracias por tu interés en formar parte de la comunidad TrainIT. Bienvenido a nuestro Challenge TrainIT. - Completar este Challenge le permitirá demostrar las habilidades requeridas para este rol -
    -
    - Este Challenge consta de 10 preguntas sencillas (Selección simple, múlitple y Verdadero/Falso). - Completarlo te dará la oportunidad de mostrar tus habilidades. - La evaluación está cronometrada. Se muestra un temporizador. - Recomendamos completar la evaluación de una sola vez. - - - Buena Suerte! -
    - -
    - + } + @if (step === 2) { + + + } + @if (step === 3) { + colocar fondo logo y cuenta regresiva + {{ nextStep() }} + } + @if (step === 4) { + + + }
    \ No newline at end of file diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.scss b/src/app/modules/welcome-candidato/welcome-candidato.component.scss index fb1f2c8..1c0d9c5 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.component.scss +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.scss @@ -34,8 +34,14 @@ border: 1px solid #333232; font-size: .9rem; font-weight: 300; - padding: 8px 0px 0px 16px; + padding: 8px 0px 0px 64px; border-radius: 8px 0px 0px 0px; margin-bottom: 1rem; } +.button-container { + width: 804px; + margin: 0 auto; + text-align: end; + padding-right: 1rem; +} diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.ts b/src/app/modules/welcome-candidato/welcome-candidato.component.ts index 059cb4c..5039141 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.component.ts +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.ts @@ -11,5 +11,9 @@ import { BlueButtonComponent } from 'src/app/shared/components/blue-button/blue- styleUrl: './welcome-candidato.component.scss' }) export class WelcomeCandidatoComponent { + step: number = 1; + nextStep() { + this.step ++; + } } diff --git a/src/app/shared/question-container-test/question-container-test.component.html b/src/app/shared/question-container-test/question-container-test.component.html new file mode 100644 index 0000000..89a4044 --- /dev/null +++ b/src/app/shared/question-container-test/question-container-test.component.html @@ -0,0 +1 @@ +

    question-container-test works!

    diff --git a/src/app/shared/question-container-test/question-container-test.component.scss b/src/app/shared/question-container-test/question-container-test.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/shared/question-container-test/question-container-test.component.spec.ts b/src/app/shared/question-container-test/question-container-test.component.spec.ts new file mode 100644 index 0000000..d4f1457 --- /dev/null +++ b/src/app/shared/question-container-test/question-container-test.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { QuestionContainerTestComponent } from './question-container-test.component'; + +describe('QuestionContainerTestComponent', () => { + let component: QuestionContainerTestComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [QuestionContainerTestComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(QuestionContainerTestComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/question-container-test/question-container-test.component.ts b/src/app/shared/question-container-test/question-container-test.component.ts new file mode 100644 index 0000000..3c0dada --- /dev/null +++ b/src/app/shared/question-container-test/question-container-test.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-question-container-test', + standalone: true, + imports: [], + templateUrl: './question-container-test.component.html', + styleUrl: './question-container-test.component.scss' +}) +export class QuestionContainerTestComponent { + +} diff --git a/src/app/shared/question-container/question-container.component.html b/src/app/shared/question-container/question-container.component.html index 1fa136f..f0fb38e 100644 --- a/src/app/shared/question-container/question-container.component.html +++ b/src/app/shared/question-container/question-container.component.html @@ -1,22 +1,22 @@
    -
    -

    Preguntas de práctica

    + +
    +

    Preguntas de práctica

    -
    -

    Preguntas de selección simple.

    +
    +

    Preguntas de verdadero y falso.

    +

    Preguntas de selección simple.

    +

    Preguntas de selección múltiple.

    {{ counter | date:'mm:ss' }}
    -
    - + - +
    diff --git a/src/app/shared/question-container/question-container.component.ts b/src/app/shared/question-container/question-container.component.ts index 84d6439..a24037f 100644 --- a/src/app/shared/question-container/question-container.component.ts +++ b/src/app/shared/question-container/question-container.component.ts @@ -1,6 +1,6 @@ -import { Component, inject, OnInit } from '@angular/core'; +import { Component, EventEmitter, inject, Input, OnInit, Output } from '@angular/core'; import { QuestionComponent } from '../question/question.component'; -import { DatePipe } from '@angular/common'; +import { CommonModule, DatePipe } from '@angular/common'; import { QuestionService } from './question.service'; import { Question, ResponseQuestion } from './question-interface'; import { BlueButtonComponent } from '../components/blue-button/blue-button.component'; @@ -8,31 +8,76 @@ import { BlueButtonComponent } from '../components/blue-button/blue-button.compo @Component({ selector: 'app-question-container', standalone: true, - imports: [QuestionComponent, DatePipe, BlueButtonComponent], + imports: [QuestionComponent, DatePipe, BlueButtonComponent, CommonModule], templateUrl: './question-container.component.html', styleUrl: './question-container.component.scss' }) export class QuestionContainerComponent implements OnInit{ + @Input() test: boolean =false; + @Output() nextStep = new EventEmitter() counter = new Date(0); index: number = 0; - questions: ResponseQuestion[]=[]; question: Question | null = null; + questions: ResponseQuestion[] = []; + questionsTest: Question[]=[ + { + questionNumber: 1, + question: 'Pregunta', + type: 'true_false', + options: ['falso', 'verdadero'], + correct_option: [], + }, + { + questionNumber: 2, + question: 'Pregunta', + type: 'simple_choice', + options: ['Opcion 1', 'Opcion 2', 'Opcion 3'], + correct_option: [], + }, + { + questionNumber: 3, + question: 'Pregunta', + type: 'multiple_choice', + options: ['Opcion 1', 'Opcion 2', 'Opcion 3', 'Opcion 4'], + correct_option: [], + }, + ] + + ngOnInit(): void { + if (this.test) { + this.questions = this.questionsTest.map((q, index) => ({ + id: '', + question: q.question, + seniority: 'test', + type: q.type, + options: q.options, + correct_option: q.correct_option, + explanation: '', + link: '', + is_active: true, + created_at: new Date(), + updated_at: new Date(), + quiz_id: 'test-quiz' + })); + this.updateQuestion(); + } else { + this.questionService.getQuiz('3c827617-c6df-4f96-80be-3be9f32edd0b').subscribe((response:any)=>{ + this.questions = response.questions + if (this.questions.length > 0){ + this.updateQuestion(); + } + }) + } + + } private questionService = inject(QuestionService) constructor() { setInterval(() => { this.counter = new Date(this.counter.getTime() + 1000); }, 1000); - } - -ngOnInit(): void { - this.questionService.getQuiz('3c827617-c6df-4f96-80be-3be9f32edd0b').subscribe((response:any)=>{ - this.questions = response.questions - if (this.questions.length > 0){ - this.updateQuestion(); - } - }) -} + } + updateQuestion(){ if (this.questions && this.questions.length > this.index) { this.question = { @@ -43,6 +88,13 @@ updateQuestion(){ correct_option: this.questions[this.index].correct_option, }; this.index++; - } + } else { + if (!this.test){ + //mostrar la calificacion obtenida + } else { + this.nextStep.emit(); + } +} } + } \ No newline at end of file diff --git a/src/app/shared/question/question.component.ts b/src/app/shared/question/question.component.ts index 74a554f..beef6c2 100644 --- a/src/app/shared/question/question.component.ts +++ b/src/app/shared/question/question.component.ts @@ -15,13 +15,9 @@ import { Question } from '../question-container/question-interface'; export class QuestionComponent { private formBuilder = inject(FormBuilder) - /* private questionService = inject(QuestionService) - ngOnInit(): void { - this.questionService.getQuiz(id).subscribe() - } */ @Input() question: Question; @Output() answer: number[]; - + questionForm = this.formBuilder.group({ answer: [,[Validators.required,]] }) From e1263f8615df1e8320982a48069f24b5f1cb9261 Mon Sep 17 00:00:00 2001 From: nassahel Date: Fri, 13 Dec 2024 13:17:34 -0300 Subject: [PATCH 200/203] mejorados estilos de welcome-candidato --- .../welcome-candidato.component.html | 36 ++++++++-------- .../welcome-candidato.component.scss | 43 +++++++++++++------ .../sideBar/side-bar/side-bar.component.scss | 7 +-- .../question-container.component.html | 9 ++-- .../question-container.component.scss | 15 ++++++- 5 files changed, 69 insertions(+), 41 deletions(-) diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.html b/src/app/modules/welcome-candidato/welcome-candidato.component.html index 7541218..9597b1a 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.component.html +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.html @@ -1,11 +1,12 @@
    - - + + @if (step === 1) { -
    +
    + + +
    Bienvenido al Challenge TrainIT
    @@ -14,7 +15,7 @@ Completar este Challenge le permitirá demostrar las habilidades requeridas para este rol
    - +
  • Este Challenge consta de 10 preguntas sencillas (Selección simple, múlitple y Verdadero/Falso).
  • Completarlo te dará la oportunidad de mostrar tus habilidades.
  • La evaluación está cronometrada. Se muestra un temporizador.
    • @@ -23,27 +24,24 @@ Buena Suerte!
    - +
    + +
    } @if (step === 2) { - - + + } - @if (step === 3) { - colocar fondo logo y cuenta regresiva - {{ nextStep() }} + @if (step === 3) { + colocar fondo logo y cuenta regresiva + {{ nextStep() }} } @if (step === 4) { - - + + }
    \ No newline at end of file diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.scss b/src/app/modules/welcome-candidato/welcome-candidato.component.scss index 1c0d9c5..2fd935e 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.component.scss +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.scss @@ -1,6 +1,9 @@ .layout-container { display: flex; height: 100vh; + background: rgba(27, 27, 27, 1); + align-items: center; + } .question-container { width: 80vw; @@ -16,32 +19,44 @@ border-radius: .8rem; backdrop-filter: blur(4px); box-shadow: 0px 4px 4px 0px #00000040; + font-family: 'Poppins'; + position: relative; } .question-tittle { font-size: 24px; font-weight: 400; - margin-bottom: 2rem; - width: 1152px; - height: 32px; - padding: 0px 0px 0px 64px; - gap: 8px; + margin-bottom: 4rem; + margin-top: 1rem; } -.question-container-text { - - width: 899px; - height: 76px; +.question-container-text { background: #1B1B1B; border: 1px solid #333232; - font-size: .9rem; + font-size: 1rem; font-weight: 300; - padding: 8px 0px 0px 64px; - border-radius: 8px 0px 0px 0px; - margin-bottom: 1rem; + padding: 1rem; + border-radius: 8px; + margin-bottom: 4rem; } .button-container { - width: 804px; margin: 0 auto; + padding-top: 4rem; text-align: end; padding-right: 1rem; } + +.page-content { + width: 70%; + // margin: 0 auto; + margin-left: 5rem; +} + +.bg-logo { + width: 15rem; + position: absolute; + opacity: .2; + top: 35%; + right: 45%; + z-index: -5; + +} \ No newline at end of file diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss index 287afc4..8d3f293 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss @@ -3,7 +3,7 @@ background: #212121; box-shadow: 0px 4px 4px 0px #00000040; height: 95vh; - width: 60px; /* Ancho fijo para pantallas grandes */ + width: 80px; /* Ancho fijo para pantallas grandes */ border-radius: 0px 12px 12px 0px; z-index: 9999; display: flex; @@ -26,6 +26,7 @@ align-items: center; justify-content: space-around; transition: width 0.3s ease; /* Suaviza la transición */ + } .sidebar-btns-container { display: flex; @@ -86,8 +87,8 @@ } .side-img { - width: 40px; - height: 41px; + width: 55px; + // height: 41px; } .side-img-extended { height: 6rem; diff --git a/src/app/shared/question-container/question-container.component.html b/src/app/shared/question-container/question-container.component.html index f0fb38e..8152138 100644 --- a/src/app/shared/question-container/question-container.component.html +++ b/src/app/shared/question-container/question-container.component.html @@ -1,6 +1,7 @@
    - -
    + + +

    Preguntas de práctica

    @@ -13,10 +14,10 @@

    Preguntas de práctica

    - + - +
    diff --git a/src/app/shared/question-container/question-container.component.scss b/src/app/shared/question-container/question-container.component.scss index 9832d9a..dd68594 100644 --- a/src/app/shared/question-container/question-container.component.scss +++ b/src/app/shared/question-container/question-container.component.scss @@ -14,6 +14,7 @@ border-radius: .8rem; backdrop-filter: blur(4px); box-shadow: 0px 4px 4px 0px #00000040; + position: relative; } .counter-container { @@ -70,4 +71,16 @@ .question-type-input p { margin: 0; -} \ No newline at end of file +} + + + +.bg-logo { + width: 15rem; + position: absolute; + opacity: .3; + top: 35%; + right: 45%; + z-index: -5; + + } \ No newline at end of file From ef6ec48cd9ff7092e9a141178698d8e244938cad Mon Sep 17 00:00:00 2001 From: nassahel Date: Fri, 13 Dec 2024 16:17:26 -0300 Subject: [PATCH 201/203] agregado step 3 de pagina candidato --- .../welcome-candidato.component.html | 12 ++- .../welcome-candidato.component.scss | 102 +++++++++++++----- .../welcome-candidato.component.ts | 21 +++- src/assets/DotsBottom.png | Bin 0 -> 8521 bytes src/assets/DotsTop.png | Bin 0 -> 8476 bytes 5 files changed, 106 insertions(+), 29 deletions(-) create mode 100644 src/assets/DotsBottom.png create mode 100644 src/assets/DotsTop.png diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.html b/src/app/modules/welcome-candidato/welcome-candidato.component.html index 9597b1a..bfa61c9 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.component.html +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.html @@ -37,8 +37,16 @@ } @if (step === 3) { - colocar fondo logo y cuenta regresiva - {{ nextStep() }} +
    + + + Logo +
    +

    Tu challenge inicia en

    +

    {{countdown}}

    +
    +
    + } @if (step === 4) { diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.scss b/src/app/modules/welcome-candidato/welcome-candidato.component.scss index 2fd935e..35094da 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.component.scss +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.scss @@ -1,34 +1,37 @@ .layout-container { - display: flex; - height: 100vh; - background: rgba(27, 27, 27, 1); - align-items: center; - - } - .question-container { - width: 80vw; - height: 95vh; - padding: 24px 8px 8px 8px; - gap: 47px; - border-radius: 12px 0px 0px 0px; - opacity: 0px; - display: flex; - flex-direction: column; - background-color: #212121; - margin: 0 1rem; - border-radius: .8rem; - backdrop-filter: blur(4px); - box-shadow: 0px 4px 4px 0px #00000040; - font-family: 'Poppins'; - position: relative; + display: flex; + height: 100vh; + background: rgba(27, 27, 27, 1); + align-items: center; + +} + +.question-container { + width: 80vw; + height: 95vh; + padding: 24px 8px 8px 8px; + gap: 47px; + border-radius: 12px 0px 0px 0px; + opacity: 0px; + display: flex; + flex-direction: column; + background-color: #212121; + margin: 0 1rem; + border-radius: .8rem; + backdrop-filter: blur(4px); + box-shadow: 0px 4px 4px 0px #00000040; + font-family: 'Poppins'; + position: relative; } + .question-tittle { font-size: 24px; font-weight: 400; margin-bottom: 4rem; margin-top: 1rem; } -.question-container-text { + +.question-container-text { background: #1B1B1B; border: 1px solid #333232; font-size: 1rem; @@ -53,10 +56,59 @@ .bg-logo { width: 15rem; - position: absolute; + position: absolute; opacity: .2; top: 35%; right: 45%; z-index: -5; -} \ No newline at end of file +} + + + +// ---------------STEP 3--------------------------------------------------- + +.countdown-component { + background: linear-gradient(234.95deg, #4F2A40 0%, #302151 100%); + min-height: 100vh; + width: 100vw; + position: fixed; + display: flex; + align-items: center; + justify-content: center; +} + +.bg-logo-countdown { + position: absolute; + width: 45%; + opacity: .1; + z-index: -5; + filter: drop-shadow(0px 0px 10px rgb(246, 176, 219)); + +} + +.clock-container { + text-align: center; + font-family: 'Poppins'; + font-size: 3rem; + font-weight: 500; + color: white; +} + +.clock { + font-family: "Protest Guerrilla", sans-serif; + font-size: 8rem; +} + + +// .dots-top { +// position: absolute; +// top: 0; +// left: 8rem; +// } + +// .dots-bottom { +// position: absolute; +// bottom: 0; +// right: 8rem; +// } \ No newline at end of file diff --git a/src/app/modules/welcome-candidato/welcome-candidato.component.ts b/src/app/modules/welcome-candidato/welcome-candidato.component.ts index 5039141..f2d0d63 100644 --- a/src/app/modules/welcome-candidato/welcome-candidato.component.ts +++ b/src/app/modules/welcome-candidato/welcome-candidato.component.ts @@ -8,12 +8,29 @@ import { BlueButtonComponent } from 'src/app/shared/components/blue-button/blue- standalone: true, imports: [SharedModule, QuestionContainerComponent, BlueButtonComponent], templateUrl: './welcome-candidato.component.html', - styleUrl: './welcome-candidato.component.scss' + styleUrls: ['./welcome-candidato.component.scss'] }) export class WelcomeCandidatoComponent { step: number = 1; + countdown: number = 10; + intervalId!: any; nextStep() { - this.step ++; + this.step++; + + if (this.step === 3) { + this.startCountdown(); + } + } + + private startCountdown() { + this.intervalId = setInterval(() => { + if (this.countdown > 0) { + this.countdown--; + } else { + clearInterval(this.intervalId); + this.step++; + } + }, 1000); } } diff --git a/src/assets/DotsBottom.png b/src/assets/DotsBottom.png new file mode 100644 index 0000000000000000000000000000000000000000..f3f8b0fc6cb7aa22bf89ba1e69fcd0bd0b045bab GIT binary patch literal 8521 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 literal 0 HcmV?d00001 diff --git a/src/assets/DotsTop.png b/src/assets/DotsTop.png new file mode 100644 index 0000000000000000000000000000000000000000..e27da7dff89fec4e1ec541172734db9c35bfc3a4 GIT binary patch literal 8476 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 Date: Fri, 13 Dec 2024 16:54:33 -0300 Subject: [PATCH 202/203] mejorados estilos del home --- .../pages/home-page/home-page.component.scss | 6 +-- .../sideBar/side-bar/side-bar.component.html | 4 +- .../sideBar/side-bar/side-bar.component.scss | 40 +++++++++++++++---- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/app/modules/home/pages/home-page/home-page.component.scss b/src/app/modules/home/pages/home-page/home-page.component.scss index 4f0b3d8..de9637c 100644 --- a/src/app/modules/home/pages/home-page/home-page.component.scss +++ b/src/app/modules/home/pages/home-page/home-page.component.scss @@ -4,7 +4,9 @@ } .container-fluid { - background-color: #121212; + // background-color: #121212; + background-color: rgba(27, 27, 27, 1); + min-height: 100vh; display: flex; align-items: center; @@ -62,5 +64,3 @@ font-weight:600; margin-top: 20px; } } */ - - diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.html b/src/app/shared/components/sideBar/side-bar/side-bar.component.html index 49b7def..f4206ac 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.html +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.html @@ -28,7 +28,7 @@
    -
    +
    - --> \ No newline at end of file + --> diff --git a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss index 8d3f293..51d1c3a 100644 --- a/src/app/shared/components/sideBar/side-bar/side-bar.component.scss +++ b/src/app/shared/components/sideBar/side-bar/side-bar.component.scss @@ -3,14 +3,16 @@ background: #212121; box-shadow: 0px 4px 4px 0px #00000040; height: 95vh; - width: 80px; /* Ancho fijo para pantallas grandes */ + width: 80px; + /* Ancho fijo para pantallas grandes */ border-radius: 0px 12px 12px 0px; z-index: 9999; display: flex; flex-direction: column; align-items: center; justify-content: space-around; - transition: width 0.3s ease; /* Suaviza la transición */ + transition: width 0.3s ease; + /* Suaviza la transición */ } @@ -18,16 +20,19 @@ background: #212121; box-shadow: 0px 4px 4px 0px #00000040; height: 95vh; - width: 31vh; /* Ancho fijo para pantallas grandes */ + width: 31vh; + /* Ancho fijo para pantallas grandes */ border-radius: 0px 12px 12px 0px; z-index: 9999; display: flex; flex-direction: column; align-items: center; justify-content: space-around; - transition: width 0.3s ease; /* Suaviza la transición */ + transition: width 0.3s ease; + /* Suaviza la transición */ } + .sidebar-btns-container { display: flex; flex-direction: column; @@ -35,10 +40,11 @@ align-items: center; /* background-color: red; */ height: 70%; + width: 100%; } .gestion-btns { - + width: 100%; height: 133px; display: flex; align-items: center; @@ -48,6 +54,7 @@ .sidebar-btns { background-color: #5F5F5F; + // background-color: #1b1b1bb2; width: 50px; height: 5vh; border-radius: 10px; @@ -57,10 +64,15 @@ display: flex; justify-content: flex-start; align-items: center; + margin: 0 auto; + transition: all .3s ease; } + .sidebar-btns-extended { background-color: #5F5F5F; - width: 30vh; + // background-color: #1b1b1bb2; + + width: 80%; height: 5vh; border-radius: 10px; padding: 0px 16px 0px 16px; @@ -69,6 +81,8 @@ display: flex; justify-content: flex-start; align-items: center; + margin: 0 auto; + transition: all .3s ease; } .sidebar-font-btn { @@ -79,20 +93,30 @@ display: flex; justify-content: start; align-items: flex-start; + width: 80%; } +// .sidebar-btns:hover, +// .sidebar-btns-extended:hover { +// background-color: #5F5F5F; + +// } + + .sidebar-btns:hover, .active-btn { background-color: #1b1b1bb2; } -.side-img { +.side-img { width: 55px; // height: 41px; } + .side-img-extended { height: 6rem; } + .sidebar-btns i { color: #5974c7; font-size: 11.5px; @@ -197,4 +221,4 @@ height: 7vh; } } - */ \ No newline at end of file + */ From 150b22d5dd750dd462b504d07299f6fed4aa65b2 Mon Sep 17 00:00:00 2001 From: jesusdanielGIT Date: Wed, 8 Jan 2025 21:05:12 -0500 Subject: [PATCH 203/203] modificacion flujo de login con popup --- .../pages/auth-page/auth-page.component.ts | 33 +++++++++---------- .../dashboard-page.component.html | 6 ++-- .../dashboard-page.component.ts | 4 ++- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/app/modules/auth/pages/auth-page/auth-page.component.ts b/src/app/modules/auth/pages/auth-page/auth-page.component.ts index 882a6ac..c4de9ce 100644 --- a/src/app/modules/auth/pages/auth-page/auth-page.component.ts +++ b/src/app/modules/auth/pages/auth-page/auth-page.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { AuthService } from '@auth0/auth0-angular'; import { Router } from '@angular/router'; import { environment } from '@environments/environment'; @@ -22,22 +22,24 @@ interface UserData { templateUrl: './auth-page.component.html', styleUrls: ['./auth-page.component.scss'], }) -export class AuthPageComponent implements OnInit { +export class AuthPageComponent { constructor( private auth: AuthService, private router: Router, private http: HttpClient ) {} - ngOnInit() { - this.handleAuthentication(); - } - - login() { - this.auth.loginWithRedirect({ - appState: { returnTo: window.location.pathname }, - }); - + async login() { + try { + // Usar loginWithPopup en lugar de loginWithRedirect + await this.auth.loginWithPopup(); + + // Después del login exitoso, manejar la autenticación + await this.handleAuthentication(); + } catch (error) { + console.error('Error durante el login:', error); + this.handleAuthError(error); + } } private async handleAuthentication() { @@ -78,12 +80,10 @@ export class AuthPageComponent implements OnInit { private async registerOrAuthenticateUser(userData: UserData): Promise { try { - // Usa el endpoint existente del backend const response = await firstValueFrom( this.http.post(`${environment.url}/user`, userData).pipe( catchError(async error => { if (error.status === 400 && error.error?.user) { - // Si el usuario ya existe, retornamos los datos del usuario>>>>>>>>>>>>> return error.error; } throw error; @@ -100,12 +100,11 @@ export class AuthPageComponent implements OnInit { private async handleUserRedirection(user: any) { try { - // Obtiene los roles desde los metadatos de Auth0 >>>>>>>>>>>>>> const roles = user['https://miaplicacion.com/roles'] || []; const isEmailVerified = user.email_verified; - // Si el email no está verificado, redirige a una página de verificación probar!!!! - // if (!isEmailVerified) { + // Si el email no está verificado, redirige a una página de verificación + // if (!isEmailVerified) { // this.router.navigate(['/verify-email']); // return; // } @@ -122,10 +121,8 @@ export class AuthPageComponent implements OnInit { } } - // Método para manejar errores de autenticación private handleAuthError(error: any) { console.error('Error de autenticación:', error); - this.router.navigate(['/error']); } } \ No newline at end of file diff --git a/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.html b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.html index 4b6ed60..d12daae 100644 --- a/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.html +++ b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.html @@ -1,7 +1,7 @@
    -
    -

    Bienvenido {{ userName }}

    -

    {{ currentDate }}

    +
    +

    Bienvenido {{ users.name }}

    +

    {{ users.date }}

    diff --git a/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.ts b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.ts index c84f15a..0e02aa8 100644 --- a/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.ts +++ b/src/app/modules/candidato-dashboard/dashboard-page/dashboard-page.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { AuthService } from '@auth0/auth0-angular'; @Component({ selector: 'app-dashboard-page', @@ -6,6 +7,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./dashboard-page.component.scss'] }) export class DashboardPageComponent implements OnInit { + user$ = this.auth.user$ userName: string = 'Usuario'; // Puedes obtener el nombre de usuario desde algún servicio currentDate: string = new Date().toLocaleDateString(); // Fecha actual items: any[] = [ @@ -17,7 +19,7 @@ export class DashboardPageComponent implements OnInit { { title: 'QA', icon: 'assets/scrum.png' } ]; - constructor() {} + constructor(private auth: AuthService) {} ngOnInit(): void {} }