Compare commits
8 Commits
54826a7f8a
...
auth/googl
| Author | SHA1 | Date | |
|---|---|---|---|
| 20c8b04638 | |||
| c662c27fc7 | |||
| 3cefaf85d9 | |||
| 472dead0ff | |||
| fa8032c557 | |||
| 6c5e10feb2 | |||
| 63541a3593 | |||
| bc37a91c7f |
@@ -6,6 +6,7 @@ import { HttpTestingController, provideHttpClientTesting } from '@angular/common
|
|||||||
import { environment } from '../../../../environments/environment';
|
import { environment } from '../../../../environments/environment';
|
||||||
import { AuthService } from './auth.service';
|
import { AuthService } from './auth.service';
|
||||||
import { CookieService } from '../cookie/cookie.service';
|
import { CookieService } from '../cookie/cookie.service';
|
||||||
|
import { TenantService } from '../tenant.service';
|
||||||
|
|
||||||
describe('AuthService', () => {
|
describe('AuthService', () => {
|
||||||
let cookieStore: Record<string, string> = {};
|
let cookieStore: Record<string, string> = {};
|
||||||
@@ -95,7 +96,7 @@ describe('AuthService', () => {
|
|||||||
httpController.verify();
|
httpController.verify();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('propagates a 401 from /me without clearing the session', async () => {
|
it('clears an expired session when /me returns 401', async () => {
|
||||||
cookieStore['shopit.auth.token'] = 'expired-token';
|
cookieStore['shopit.auth.token'] = 'expired-token';
|
||||||
|
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
@@ -116,11 +117,11 @@ describe('AuthService', () => {
|
|||||||
|
|
||||||
request.flush({ message: 'Unauthorized' }, { status: 401, statusText: 'Unauthorized' });
|
request.flush({ message: 'Unauthorized' }, { status: 401, statusText: 'Unauthorized' });
|
||||||
|
|
||||||
await expect(bootstrapPromise).rejects.toMatchObject({ status: 401 });
|
await expect(bootstrapPromise).resolves.toBeUndefined();
|
||||||
expect(service.user()).toBeNull();
|
expect(service.user()).toBeNull();
|
||||||
expect(service.token()).toBe('expired-token');
|
expect(service.token()).toBeNull();
|
||||||
expect(service.isAuthenticated()).toBe(true);
|
expect(service.isAuthenticated()).toBe(false);
|
||||||
expect(cookieStore['shopit.auth.token']).toBe('expired-token');
|
expect(cookieStore['shopit.auth.token']).toBeUndefined();
|
||||||
|
|
||||||
httpController.verify();
|
httpController.verify();
|
||||||
});
|
});
|
||||||
@@ -132,6 +133,10 @@ describe('AuthService', () => {
|
|||||||
provideHttpClientTesting(),
|
provideHttpClientTesting(),
|
||||||
AuthService,
|
AuthService,
|
||||||
{ provide: CookieService, useValue: createCookieServiceStub() },
|
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||||
|
{
|
||||||
|
provide: TenantService,
|
||||||
|
useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
|
||||||
|
},
|
||||||
TransferState
|
TransferState
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
@@ -152,6 +157,7 @@ describe('AuthService', () => {
|
|||||||
|
|
||||||
const request = httpController.expectOne(`${environment.url}register`);
|
const request = httpController.expectOne(`${environment.url}register`);
|
||||||
expect(request.request.method).toBe('POST');
|
expect(request.request.method).toBe('POST');
|
||||||
|
expect(request.request.body.tenant_codigo).toBe('tenant-test');
|
||||||
request.flush({
|
request.flush({
|
||||||
message: 'Usuario registrado correctamente.',
|
message: 'Usuario registrado correctamente.',
|
||||||
data: {
|
data: {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { HttpClient } from '@angular/common/http';
|
import { DOCUMENT } from '@angular/common';
|
||||||
|
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
|
||||||
import { isPlatformBrowser, isPlatformServer } from '@angular/common';
|
import { isPlatformBrowser, isPlatformServer } from '@angular/common';
|
||||||
import { computed, inject, Injectable, PLATFORM_ID, signal, TransferState, makeStateKey } from '@angular/core';
|
import { computed, inject, Injectable, PLATFORM_ID, signal, TransferState, makeStateKey } from '@angular/core';
|
||||||
import { firstValueFrom, map, Observable, of, tap } from 'rxjs';
|
import { firstValueFrom, map, Observable, of, tap } from 'rxjs';
|
||||||
@@ -13,6 +14,7 @@ import {
|
|||||||
UpdateProfilePayload
|
UpdateProfilePayload
|
||||||
} from './auth.interfaces';
|
} from './auth.interfaces';
|
||||||
import { CookieService } from '../cookie/cookie.service';
|
import { CookieService } from '../cookie/cookie.service';
|
||||||
|
import { TenantService } from '../tenant.service';
|
||||||
|
|
||||||
const AUTH_TOKEN_COOKIE_KEY = 'shopit.auth.token';
|
const AUTH_TOKEN_COOKIE_KEY = 'shopit.auth.token';
|
||||||
const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
|
const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
|
||||||
@@ -22,9 +24,11 @@ const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
|
|||||||
})
|
})
|
||||||
export class AuthService {
|
export class AuthService {
|
||||||
private readonly http = inject(HttpClient);
|
private readonly http = inject(HttpClient);
|
||||||
|
private readonly document = inject(DOCUMENT);
|
||||||
private readonly platformId = inject(PLATFORM_ID);
|
private readonly platformId = inject(PLATFORM_ID);
|
||||||
private readonly cookieService = inject(CookieService);
|
private readonly cookieService = inject(CookieService);
|
||||||
private readonly transferState = inject(TransferState);
|
private readonly transferState = inject(TransferState);
|
||||||
|
private readonly tenantService = inject(TenantService);
|
||||||
|
|
||||||
private readonly userState = signal<AuthUser | null>(null);
|
private readonly userState = signal<AuthUser | null>(null);
|
||||||
private readonly tokenState = signal<string | null>(null);
|
private readonly tokenState = signal<string | null>(null);
|
||||||
@@ -41,7 +45,33 @@ export class AuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
register(payload: RegisterPayload): Observable<RegisterResponse> {
|
register(payload: RegisterPayload): Observable<RegisterResponse> {
|
||||||
return this.http.post<RegisterResponse>(`${environment.url}register`, payload);
|
const tenantCode = this.tenantService.getTenant()?.codigo;
|
||||||
|
|
||||||
|
return this.http.post<RegisterResponse>(`${environment.url}register`, {
|
||||||
|
...payload,
|
||||||
|
...(tenantCode ? { tenant_codigo: tenantCode } : {})
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
loginWithGoogle(): void {
|
||||||
|
const tenant = this.tenantService.getTenant();
|
||||||
|
if (!tenant) {
|
||||||
|
throw new Error('No se pudo resolver el tenant activo.');
|
||||||
|
}
|
||||||
|
|
||||||
|
const apiUrl = new URL(environment.url);
|
||||||
|
const authorizationUrl = new URL('/auth/google/redirect', apiUrl.origin);
|
||||||
|
authorizationUrl.searchParams.set('tenant', tenant.codigo);
|
||||||
|
authorizationUrl.searchParams.set('return_url', this.document.location.origin);
|
||||||
|
|
||||||
|
this.document.location.assign(authorizationUrl.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
completeGoogleLogin(oauthCode: string): Observable<AuthUser> {
|
||||||
|
return this.http.post<LoginResponse>(`${environment.url}auth/google/exchange`, { oauth_code: oauthCode }).pipe(
|
||||||
|
tap((response) => this.applyAuthenticatedState(response.token, response.user)),
|
||||||
|
map((response) => response.user)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
updateProfile(payload: UpdateProfilePayload): Observable<AuthUser> {
|
updateProfile(payload: UpdateProfilePayload): Observable<AuthUser> {
|
||||||
@@ -75,9 +105,24 @@ export class AuthService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = await firstValueFrom(this.loadCurrentUser());
|
try {
|
||||||
if (isPlatformServer(this.platformId)) {
|
const user = await firstValueFrom(this.loadCurrentUser());
|
||||||
this.transferState.set(AUTH_USER_SSR_STATE_KEY, user);
|
|
||||||
|
if (isPlatformServer(this.platformId)) {
|
||||||
|
this.transferState.set(AUTH_USER_SSR_STATE_KEY, user);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// An expired token is an expected state, including while rendering on the
|
||||||
|
// server. Do not let it reject the application initializer: Angular's SSR
|
||||||
|
// pipeline can otherwise attempt to serialize HttpErrorResponse internals
|
||||||
|
// as HTTP headers.
|
||||||
|
if (error instanceof HttpErrorResponse && error.status === 401) {
|
||||||
|
this.clearSession();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,37 +1,23 @@
|
|||||||
import '@angular/compiler';
|
import '@angular/compiler';
|
||||||
import { Component, inject } from '@angular/core';
|
import { Component, inject } from '@angular/core';
|
||||||
import { TestBed, getTestBed } from '@angular/core/testing';
|
import { TestBed, getTestBed } from '@angular/core/testing';
|
||||||
import {
|
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||||
BrowserTestingModule,
|
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
platformBrowserTesting
|
|
||||||
} from '@angular/platform-browser/testing';
|
|
||||||
import {
|
|
||||||
afterEach,
|
|
||||||
beforeAll,
|
|
||||||
beforeEach,
|
|
||||||
describe,
|
|
||||||
expect,
|
|
||||||
it,
|
|
||||||
vi
|
|
||||||
} from 'vitest';
|
|
||||||
import { firstValueFrom } from 'rxjs';
|
import { firstValueFrom } from 'rxjs';
|
||||||
|
|
||||||
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
||||||
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
||||||
|
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
||||||
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||||
import {
|
import { MODAL_DATA, ModalRef, ModalService } from './modal.service';
|
||||||
MODAL_DATA,
|
|
||||||
ModalRef,
|
|
||||||
ModalService
|
|
||||||
} from './modal.service';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
template: ''
|
template: '',
|
||||||
})
|
})
|
||||||
class FirstTestModalComponent {}
|
class FirstTestModalComponent {}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
template: ''
|
template: '',
|
||||||
})
|
})
|
||||||
class SecondTestModalComponent {}
|
class SecondTestModalComponent {}
|
||||||
|
|
||||||
@@ -40,10 +26,7 @@ describe('ModalService', () => {
|
|||||||
|
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
try {
|
try {
|
||||||
getTestBed().initTestEnvironment(
|
getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
|
||||||
BrowserTestingModule,
|
|
||||||
platformBrowserTesting()
|
|
||||||
);
|
|
||||||
} catch {
|
} catch {
|
||||||
// Test environment may already be initialized by another setup entrypoint.
|
// Test environment may already be initialized by another setup entrypoint.
|
||||||
}
|
}
|
||||||
@@ -55,7 +38,7 @@ describe('ModalService', () => {
|
|||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
providers: [ModalService]
|
providers: [ModalService],
|
||||||
});
|
});
|
||||||
|
|
||||||
service = TestBed.inject(ModalService);
|
service = TestBed.inject(ModalService);
|
||||||
@@ -66,7 +49,7 @@ describe('ModalService', () => {
|
|||||||
title: 'Confirmar compra',
|
title: 'Confirmar compra',
|
||||||
data: { productId: 10 },
|
data: { productId: 10 },
|
||||||
size: 'lg',
|
size: 'lg',
|
||||||
closeOnBackdrop: false
|
closeOnBackdrop: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
@@ -80,7 +63,7 @@ describe('ModalService', () => {
|
|||||||
size: 'lg',
|
size: 'lg',
|
||||||
closeOnBackdrop: false,
|
closeOnBackdrop: false,
|
||||||
closeOnEscape: true,
|
closeOnEscape: true,
|
||||||
showCloseButton: true
|
showCloseButton: true,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -115,7 +98,7 @@ describe('ModalService', () => {
|
|||||||
firstRef.afterClosed$.subscribe(firstClosedSpy);
|
firstRef.afterClosed$.subscribe(firstClosedSpy);
|
||||||
|
|
||||||
const secondRef = service.open(SecondTestModalComponent, {
|
const secondRef = service.open(SecondTestModalComponent, {
|
||||||
title: 'Segundo modal'
|
title: 'Segundo modal',
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(firstClosedSpy).toHaveBeenCalledWith(undefined);
|
expect(firstClosedSpy).toHaveBeenCalledWith(undefined);
|
||||||
@@ -126,7 +109,7 @@ describe('ModalService', () => {
|
|||||||
|
|
||||||
it('injects MODAL_DATA and ModalRef into opened components through the host injector contract', () => {
|
it('injects MODAL_DATA and ModalRef into opened components through the host injector contract', () => {
|
||||||
const ref = service.open(DataTestModalComponent, {
|
const ref = service.open(DataTestModalComponent, {
|
||||||
data: { amount: 3 }
|
data: { amount: 3 },
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
@@ -138,7 +121,7 @@ describe('ModalService', () => {
|
|||||||
it('opens the standard confirm modal with default labels', () => {
|
it('opens the standard confirm modal with default labels', () => {
|
||||||
const result$ = service.openConfirm({
|
const result$ = service.openConfirm({
|
||||||
title: 'Confirmar compra',
|
title: 'Confirmar compra',
|
||||||
content: 'Esto confirmara la compra actual.'
|
content: 'Esto confirmara la compra actual.',
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
@@ -150,19 +133,19 @@ describe('ModalService', () => {
|
|||||||
data: {
|
data: {
|
||||||
content: 'Esto confirmara la compra actual.',
|
content: 'Esto confirmara la compra actual.',
|
||||||
confirmLabel: 'Confirmar',
|
confirmLabel: 'Confirmar',
|
||||||
cancelLabel: 'Cancelar'
|
cancelLabel: 'Cancelar',
|
||||||
},
|
},
|
||||||
size: 'md',
|
size: 'md',
|
||||||
closeOnBackdrop: true,
|
closeOnBackdrop: true,
|
||||||
closeOnEscape: true,
|
closeOnEscape: true,
|
||||||
showCloseButton: true
|
showCloseButton: true,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('maps the confirm modal close result to true', async () => {
|
it('maps the confirm modal close result to true', async () => {
|
||||||
const result$ = service.openConfirm({
|
const result$ = service.openConfirm({
|
||||||
title: 'Confirmar compra',
|
title: 'Confirmar compra',
|
||||||
content: 'Esto confirmara la compra actual.'
|
content: 'Esto confirmara la compra actual.',
|
||||||
});
|
});
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
const resultPromise = firstValueFrom(result$);
|
const resultPromise = firstValueFrom(result$);
|
||||||
@@ -175,7 +158,7 @@ describe('ModalService', () => {
|
|||||||
it('maps dismissing a confirm modal to false', async () => {
|
it('maps dismissing a confirm modal to false', async () => {
|
||||||
const result$ = service.openConfirmDelete({
|
const result$ = service.openConfirmDelete({
|
||||||
title: 'Eliminar producto',
|
title: 'Eliminar producto',
|
||||||
content: 'Se eliminara el producto.'
|
content: 'Se eliminara el producto.',
|
||||||
});
|
});
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
const resultPromise = firstValueFrom(result$);
|
const resultPromise = firstValueFrom(result$);
|
||||||
@@ -194,7 +177,7 @@ describe('ModalService', () => {
|
|||||||
size: 'lg',
|
size: 'lg',
|
||||||
closeOnBackdrop: false,
|
closeOnBackdrop: false,
|
||||||
closeOnEscape: false,
|
closeOnEscape: false,
|
||||||
showCloseButton: false
|
showCloseButton: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
@@ -205,19 +188,19 @@ describe('ModalService', () => {
|
|||||||
data: {
|
data: {
|
||||||
content: 'Se eliminara el producto.',
|
content: 'Se eliminara el producto.',
|
||||||
confirmLabel: 'Eliminar',
|
confirmLabel: 'Eliminar',
|
||||||
cancelLabel: 'Conservar'
|
cancelLabel: 'Conservar',
|
||||||
},
|
},
|
||||||
size: 'lg',
|
size: 'lg',
|
||||||
closeOnBackdrop: false,
|
closeOnBackdrop: false,
|
||||||
closeOnEscape: false,
|
closeOnEscape: false,
|
||||||
showCloseButton: false
|
showCloseButton: false,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('opens the simple modal with default button label', () => {
|
it('opens the simple modal with default button label', () => {
|
||||||
service.openSimple({
|
service.openSimple({
|
||||||
title: 'Aviso',
|
title: 'Aviso',
|
||||||
content: 'Este es un aviso simple.'
|
content: 'Este es un aviso simple.',
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
@@ -227,19 +210,19 @@ describe('ModalService', () => {
|
|||||||
title: 'Aviso',
|
title: 'Aviso',
|
||||||
data: {
|
data: {
|
||||||
content: 'Este es un aviso simple.',
|
content: 'Este es un aviso simple.',
|
||||||
buttonLabel: 'Entendido'
|
buttonLabel: 'Entendido',
|
||||||
},
|
},
|
||||||
size: 'md',
|
size: 'md',
|
||||||
closeOnBackdrop: true,
|
closeOnBackdrop: true,
|
||||||
closeOnEscape: true,
|
closeOnEscape: true,
|
||||||
showCloseButton: true
|
showCloseButton: true,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('maps the simple modal close result to undefined', async () => {
|
it('maps the simple modal close result to undefined', async () => {
|
||||||
const result$ = service.openSimple({
|
const result$ = service.openSimple({
|
||||||
title: 'Aviso',
|
title: 'Aviso',
|
||||||
content: 'Este es un aviso simple.'
|
content: 'Este es un aviso simple.',
|
||||||
});
|
});
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
const resultPromise = firstValueFrom(result$);
|
const resultPromise = firstValueFrom(result$);
|
||||||
@@ -248,10 +231,35 @@ describe('ModalService', () => {
|
|||||||
|
|
||||||
await expect(resultPromise).resolves.toBeUndefined();
|
await expect(resultPromise).resolves.toBeUndefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('opens the QR modal with the ticket information and compact size', () => {
|
||||||
|
service.openQr({
|
||||||
|
title: 'Entrada general',
|
||||||
|
id: 42,
|
||||||
|
date: '09 de octubre',
|
||||||
|
ticket: 'ticket-payload',
|
||||||
|
});
|
||||||
|
|
||||||
|
const activeModal = service.activeModal();
|
||||||
|
|
||||||
|
expect(activeModal?.component).toBe(QrModalComponent);
|
||||||
|
expect(activeModal?.config).toEqual({
|
||||||
|
title: 'Entrada general',
|
||||||
|
data: {
|
||||||
|
id: 42,
|
||||||
|
date: '09 de octubre',
|
||||||
|
ticket: 'ticket-payload',
|
||||||
|
},
|
||||||
|
size: 'qr',
|
||||||
|
closeOnBackdrop: true,
|
||||||
|
closeOnEscape: true,
|
||||||
|
showCloseButton: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
template: ''
|
template: '',
|
||||||
})
|
})
|
||||||
class DataTestModalComponent {
|
class DataTestModalComponent {
|
||||||
readonly data = inject(MODAL_DATA);
|
readonly data = inject(MODAL_DATA);
|
||||||
|
|||||||
@@ -2,14 +2,11 @@ import { InjectionToken, Injectable, Type, signal } from '@angular/core';
|
|||||||
import { Observable, Subject, map } from 'rxjs';
|
import { Observable, Subject, map } from 'rxjs';
|
||||||
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
||||||
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
||||||
|
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
||||||
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||||
|
|
||||||
export type ModalSize = 'sm' | 'md' | 'lg' | 'xl' | 'full';
|
export type ModalSize = 'qr' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
|
||||||
export type ModalDismissReason =
|
export type ModalDismissReason = 'backdrop' | 'escape' | 'programmatic' | 'replaced';
|
||||||
| 'backdrop'
|
|
||||||
| 'escape'
|
|
||||||
| 'programmatic'
|
|
||||||
| 'replaced';
|
|
||||||
|
|
||||||
export interface ModalConfig<TData = unknown> {
|
export interface ModalConfig<TData = unknown> {
|
||||||
title?: string;
|
title?: string;
|
||||||
@@ -20,11 +17,10 @@ export interface ModalConfig<TData = unknown> {
|
|||||||
showCloseButton?: boolean;
|
showCloseButton?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface NormalizedModalConfig<TData = unknown>
|
export interface NormalizedModalConfig<TData = unknown> extends Omit<
|
||||||
extends Omit<
|
ModalConfig<TData>,
|
||||||
ModalConfig<TData>,
|
'size' | 'closeOnBackdrop' | 'closeOnEscape' | 'showCloseButton'
|
||||||
'size' | 'closeOnBackdrop' | 'closeOnEscape' | 'showCloseButton'
|
> {
|
||||||
> {
|
|
||||||
size: ModalSize;
|
size: ModalSize;
|
||||||
closeOnBackdrop: boolean;
|
closeOnBackdrop: boolean;
|
||||||
closeOnEscape: boolean;
|
closeOnEscape: boolean;
|
||||||
@@ -37,8 +33,7 @@ export interface ConfirmModalData {
|
|||||||
cancelLabel: string;
|
cancelLabel: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ConfirmModalConfig
|
export interface ConfirmModalConfig extends Omit<ModalConfig<ConfirmModalData>, 'data'> {
|
||||||
extends Omit<ModalConfig<ConfirmModalData>, 'data'> {
|
|
||||||
content: string;
|
content: string;
|
||||||
confirmLabel?: string;
|
confirmLabel?: string;
|
||||||
cancelLabel?: string;
|
cancelLabel?: string;
|
||||||
@@ -49,12 +44,24 @@ export interface SimpleModalData {
|
|||||||
buttonLabel: string;
|
buttonLabel: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SimpleModalConfig
|
export interface SimpleModalConfig extends Omit<ModalConfig<SimpleModalData>, 'data'> {
|
||||||
extends Omit<ModalConfig<SimpleModalData>, 'data'> {
|
|
||||||
content: string;
|
content: string;
|
||||||
buttonLabel?: string;
|
buttonLabel?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface QrModalData {
|
||||||
|
id: string | number;
|
||||||
|
date: string;
|
||||||
|
ticket: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface QrModalConfig extends Omit<ModalConfig<QrModalData>, 'data' | 'title'> {
|
||||||
|
title: string;
|
||||||
|
id: string | number;
|
||||||
|
date: string;
|
||||||
|
ticket: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface ActiveModalState<TResult = unknown, TData = unknown> {
|
export interface ActiveModalState<TResult = unknown, TData = unknown> {
|
||||||
component: Type<unknown>;
|
component: Type<unknown>;
|
||||||
config: NormalizedModalConfig<TData>;
|
config: NormalizedModalConfig<TData>;
|
||||||
@@ -70,25 +77,24 @@ const DEFAULT_MODAL_CONFIG: Pick<
|
|||||||
size: 'md',
|
size: 'md',
|
||||||
closeOnBackdrop: true,
|
closeOnBackdrop: true,
|
||||||
closeOnEscape: true,
|
closeOnEscape: true,
|
||||||
showCloseButton: true
|
showCloseButton: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
const DEFAULT_CONFIRM_MODAL_LABELS = {
|
const DEFAULT_CONFIRM_MODAL_LABELS = {
|
||||||
confirmLabel: 'Confirmar',
|
confirmLabel: 'Confirmar',
|
||||||
cancelLabel: 'Cancelar'
|
cancelLabel: 'Cancelar',
|
||||||
} satisfies Pick<ConfirmModalData, 'confirmLabel' | 'cancelLabel'>;
|
} satisfies Pick<ConfirmModalData, 'confirmLabel' | 'cancelLabel'>;
|
||||||
|
|
||||||
export class ModalRef<TResult = unknown> {
|
export class ModalRef<TResult = unknown> {
|
||||||
private readonly afterClosedSubject = new Subject<TResult | undefined>();
|
private readonly afterClosedSubject = new Subject<TResult | undefined>();
|
||||||
private closed = false;
|
private closed = false;
|
||||||
|
|
||||||
readonly afterClosed$: Observable<TResult | undefined> =
|
readonly afterClosed$: Observable<TResult | undefined> = this.afterClosedSubject.asObservable();
|
||||||
this.afterClosedSubject.asObservable();
|
|
||||||
readonly dismissReason = signal<ModalDismissReason | null>(null);
|
readonly dismissReason = signal<ModalDismissReason | null>(null);
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly closeHandler: (result?: TResult) => void,
|
private readonly closeHandler: (result?: TResult) => void,
|
||||||
private readonly dismissHandler: (reason: ModalDismissReason) => void
|
private readonly dismissHandler: (reason: ModalDismissReason) => void,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
close(result?: TResult): void {
|
close(result?: TResult): void {
|
||||||
@@ -120,7 +126,7 @@ export class ModalRef<TResult = unknown> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class ModalService {
|
export class ModalService {
|
||||||
private readonly activeModalState = signal<ActiveModalState | null>(null);
|
private readonly activeModalState = signal<ActiveModalState | null>(null);
|
||||||
@@ -128,35 +134,31 @@ export class ModalService {
|
|||||||
|
|
||||||
open<TComponent, TResult = unknown, TData = unknown>(
|
open<TComponent, TResult = unknown, TData = unknown>(
|
||||||
component: Type<TComponent>,
|
component: Type<TComponent>,
|
||||||
config: ModalConfig<TData> = {}
|
config: ModalConfig<TData> = {},
|
||||||
): ModalRef<TResult> {
|
): ModalRef<TResult> {
|
||||||
this.activeModalState()?.ref.dismiss('replaced');
|
this.activeModalState()?.ref.dismiss('replaced');
|
||||||
|
|
||||||
let ref!: ModalRef<TResult>;
|
let ref!: ModalRef<TResult>;
|
||||||
ref = new ModalRef<TResult>(
|
ref = new ModalRef<TResult>(
|
||||||
(result) => this.close(ref, result),
|
(result) => this.close(ref, result),
|
||||||
(reason) => this.dismiss(ref, reason)
|
(reason) => this.dismiss(ref, reason),
|
||||||
);
|
);
|
||||||
|
|
||||||
this.activeModalState.set({
|
this.activeModalState.set({
|
||||||
component,
|
component,
|
||||||
config: this.normalizeConfig(config),
|
config: this.normalizeConfig(config),
|
||||||
ref: ref as ModalRef<unknown>
|
ref: ref as ModalRef<unknown>,
|
||||||
});
|
});
|
||||||
|
|
||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
openConfirm(config: ConfirmModalConfig): Observable<boolean> {
|
openConfirm(config: ConfirmModalConfig): Observable<boolean> {
|
||||||
return this.openConfirmRef(config).afterClosed$.pipe(
|
return this.openConfirmRef(config).afterClosed$.pipe(map((result) => result === true));
|
||||||
map((result) => result === true)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
openConfirmDelete(config: ConfirmModalConfig): Observable<boolean> {
|
openConfirmDelete(config: ConfirmModalConfig): Observable<boolean> {
|
||||||
return this.openConfirmDeleteRef(config).afterClosed$.pipe(
|
return this.openConfirmDeleteRef(config).afterClosed$.pipe(map((result) => result === true));
|
||||||
map((result) => result === true)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
openConfirmRef(config: ConfirmModalConfig): ModalRef<boolean> {
|
openConfirmRef(config: ConfirmModalConfig): ModalRef<boolean> {
|
||||||
@@ -164,23 +166,30 @@ export class ModalService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
openConfirmDeleteRef(config: ConfirmModalConfig): ModalRef<boolean> {
|
openConfirmDeleteRef(config: ConfirmModalConfig): ModalRef<boolean> {
|
||||||
return this.open(
|
return this.open(ConfirmDeleteModalComponent, this.buildConfirmModalConfig(config));
|
||||||
ConfirmDeleteModalComponent,
|
|
||||||
this.buildConfirmModalConfig(config)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
openSimple(config: SimpleModalConfig): Observable<void> {
|
openSimple(config: SimpleModalConfig): Observable<void> {
|
||||||
return this.openSimpleRef(config).afterClosed$.pipe(
|
return this.openSimpleRef(config).afterClosed$.pipe(map(() => undefined));
|
||||||
map(() => undefined)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
openSimpleRef(config: SimpleModalConfig): ModalRef<void> {
|
openSimpleRef(config: SimpleModalConfig): ModalRef<void> {
|
||||||
return this.open(
|
return this.open(SimpleModalComponent, this.buildSimpleModalConfig(config));
|
||||||
SimpleModalComponent,
|
}
|
||||||
this.buildSimpleModalConfig(config)
|
|
||||||
);
|
openQr(config: QrModalConfig): Observable<void> {
|
||||||
|
return this.openQrRef(config).afterClosed$.pipe(map(() => undefined));
|
||||||
|
}
|
||||||
|
|
||||||
|
openQrRef(config: QrModalConfig): ModalRef<void> {
|
||||||
|
const { title, id, date, ticket, size = 'qr', ...modalConfig } = config;
|
||||||
|
|
||||||
|
return this.open(QrModalComponent, {
|
||||||
|
...modalConfig,
|
||||||
|
title,
|
||||||
|
size,
|
||||||
|
data: { id, date, ticket },
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private close<TResult>(ref: ModalRef<TResult>, result?: TResult): void {
|
private close<TResult>(ref: ModalRef<TResult>, result?: TResult): void {
|
||||||
@@ -194,7 +203,7 @@ export class ModalService {
|
|||||||
|
|
||||||
private dismiss<TResult>(
|
private dismiss<TResult>(
|
||||||
ref: ModalRef<TResult>,
|
ref: ModalRef<TResult>,
|
||||||
reason: ModalDismissReason = 'programmatic'
|
reason: ModalDismissReason = 'programmatic',
|
||||||
): void {
|
): void {
|
||||||
if (this.activeModalState()?.ref !== ref) {
|
if (this.activeModalState()?.ref !== ref) {
|
||||||
return;
|
return;
|
||||||
@@ -204,18 +213,14 @@ export class ModalService {
|
|||||||
this.activeModalState.set(null);
|
this.activeModalState.set(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private normalizeConfig<TData>(
|
private normalizeConfig<TData>(config: ModalConfig<TData>): NormalizedModalConfig<TData> {
|
||||||
config: ModalConfig<TData>
|
|
||||||
): NormalizedModalConfig<TData> {
|
|
||||||
return {
|
return {
|
||||||
...DEFAULT_MODAL_CONFIG,
|
...DEFAULT_MODAL_CONFIG,
|
||||||
...config
|
...config,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private buildConfirmModalConfig(
|
private buildConfirmModalConfig(config: ConfirmModalConfig): ModalConfig<ConfirmModalData> {
|
||||||
config: ConfirmModalConfig
|
|
||||||
): ModalConfig<ConfirmModalData> {
|
|
||||||
const {
|
const {
|
||||||
content,
|
content,
|
||||||
confirmLabel = DEFAULT_CONFIRM_MODAL_LABELS.confirmLabel,
|
confirmLabel = DEFAULT_CONFIRM_MODAL_LABELS.confirmLabel,
|
||||||
@@ -228,26 +233,20 @@ export class ModalService {
|
|||||||
data: {
|
data: {
|
||||||
content,
|
content,
|
||||||
confirmLabel,
|
confirmLabel,
|
||||||
cancelLabel
|
cancelLabel,
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private buildSimpleModalConfig(
|
private buildSimpleModalConfig(config: SimpleModalConfig): ModalConfig<SimpleModalData> {
|
||||||
config: SimpleModalConfig
|
const { content, buttonLabel = 'Entendido', ...modalConfig } = config;
|
||||||
): ModalConfig<SimpleModalData> {
|
|
||||||
const {
|
|
||||||
content,
|
|
||||||
buttonLabel = 'Entendido',
|
|
||||||
...modalConfig
|
|
||||||
} = config;
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...modalConfig,
|
...modalConfig,
|
||||||
data: {
|
data: {
|
||||||
content,
|
content,
|
||||||
buttonLabel
|
buttonLabel,
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -574,24 +574,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="component-demo card shadow-sm mt-4">
|
|
||||||
<div class="card-body">
|
|
||||||
<span class="eyebrow">Reusable Component</span>
|
|
||||||
<h2 class="mb-4">Ticket</h2>
|
|
||||||
|
|
||||||
<p class="text-muted mb-4">Ticket responsive que ocupa el 100% del ancho disponible.</p>
|
|
||||||
|
|
||||||
<app-ticket
|
|
||||||
title="ENTRADA GENERAL"
|
|
||||||
ticketId="0000000000"
|
|
||||||
date="09 de Octubre"
|
|
||||||
(viewQr)="triggerToast('info')"
|
|
||||||
(download)="triggerToast('success')"
|
|
||||||
(share)="triggerToast('info')"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="component-demo card shadow-sm mt-4">
|
<section class="component-demo card shadow-sm mt-4">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<span class="eyebrow">Reusable Component</span>
|
<span class="eyebrow">Reusable Component</span>
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import { TenantService } from '../../../../core/services/tenant.service';
|
|||||||
import { ToastService } from '../../../../core/services/toast.service';
|
import { ToastService } from '../../../../core/services/toast.service';
|
||||||
import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
|
import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
|
||||||
import { StepComponent } from '../../../../shared/components/stepper/step.component';
|
import { StepComponent } from '../../../../shared/components/stepper/step.component';
|
||||||
import { TicketComponent } from '../../../../shared/components/ticket/ticket.component';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-reutilizables-test-page',
|
selector: 'app-reutilizables-test-page',
|
||||||
@@ -31,7 +30,6 @@ import { TicketComponent } from '../../../../shared/components/ticket/ticket.com
|
|||||||
CartIconComponent,
|
CartIconComponent,
|
||||||
StepperComponent,
|
StepperComponent,
|
||||||
StepComponent,
|
StepComponent,
|
||||||
TicketComponent,
|
|
||||||
],
|
],
|
||||||
templateUrl: './reutilizables-test-page.component.html',
|
templateUrl: './reutilizables-test-page.component.html',
|
||||||
styleUrl: './reutilizables-test-page.component.scss',
|
styleUrl: './reutilizables-test-page.component.scss',
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
<div class="sidebar-container">
|
<div class="sidebar-container">
|
||||||
<h2 class="sidebar-title">MI CUENTA</h2>
|
<h2 class="sidebar-title">MI CUENTA</h2>
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<nav class="sidebar-nav">
|
<nav class="sidebar-nav">
|
||||||
<a routerLink="/mi-cuenta/datos-personales" routerLinkActive="active" class="nav-link">Datos Personales</a>
|
<a routerLink="/mi-cuenta/datos-personales" routerLinkActive="active" class="nav-link"
|
||||||
<a routerLink="/mi-cuenta/compras" routerLinkActive="active" class="nav-link">Mis compras</a>
|
>Datos Personales</a
|
||||||
</nav>
|
>
|
||||||
</div>
|
<a routerLink="/mi-cuenta/compras" routerLinkActive="active" class="nav-link">Mis compras</a>
|
||||||
|
<a routerLink="/mi-cuenta/tickets" routerLinkActive="active" class="nav-link">Mis tickets</a>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
<article class="ticket" [class.ticket--disabled]="disabled()" [attr.aria-disabled]="disabled()">
|
||||||
|
@if (!disabled()) {
|
||||||
|
<label class="ticket__selection">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
[checked]="selected()"
|
||||||
|
(change)="selected.set($any($event.target).checked)"
|
||||||
|
/>
|
||||||
|
<span class="visually-hidden">Seleccionar ticket {{ title() }}</span>
|
||||||
|
</label>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="ticket__details">
|
||||||
|
<h3 class="ticket__title">{{ title() }}</h3>
|
||||||
|
<p class="ticket__id">ID: {{ ticketId() }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (date() || expired()) {
|
||||||
|
<div class="ticket__status">
|
||||||
|
@if (expired()) {
|
||||||
|
<span class="ticket__expired">VENCIDO</span>
|
||||||
|
}
|
||||||
|
@if (date(); as ticketDate) {
|
||||||
|
<time class="ticket__date">{{ ticketDate }}</time>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="ticket__actions">
|
||||||
|
<app-button
|
||||||
|
variant="primary"
|
||||||
|
buttonClass="ticket__qr-button"
|
||||||
|
[disabled]="disabled()"
|
||||||
|
(click)="viewQr.emit()"
|
||||||
|
>
|
||||||
|
<i class="fa-solid fa-qrcode" aria-hidden="true"></i>
|
||||||
|
<span>Ver QR</span>
|
||||||
|
</app-button>
|
||||||
|
|
||||||
|
@if (!disabled()) {
|
||||||
|
<app-icon-button
|
||||||
|
variant="download"
|
||||||
|
ariaLabel="Descargar ticket"
|
||||||
|
(clicked)="download.emit()"
|
||||||
|
/>
|
||||||
|
<app-icon-button variant="share" ariaLabel="Compartir ticket" (clicked)="share.emit()" />
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
@@ -5,13 +5,12 @@
|
|||||||
|
|
||||||
.ticket {
|
.ticket {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: auto minmax(0, 1fr) auto auto;
|
grid-template-columns: auto minmax(0, 1fr) 78px auto;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 56px;
|
min-height: 76px;
|
||||||
gap: 16px;
|
gap: 16px;
|
||||||
padding: 16px 0;
|
padding: 16px 0;
|
||||||
background: transparent;
|
|
||||||
color: #666666;
|
color: #666666;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,8 +21,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.ticket__selection input {
|
.ticket__selection input {
|
||||||
width: 16px;
|
width: 21px;
|
||||||
height: 16px;
|
height: 21px;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
accent-color: var(--tenant-primary, #009933);
|
accent-color: var(--tenant-primary, #009933);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
@@ -45,56 +44,89 @@
|
|||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
line-height: 1.25;
|
line-height: 1.25;
|
||||||
color: #666666;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ticket__id {
|
.ticket__id {
|
||||||
|
margin-top: 3px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-weight: 400;
|
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
color: #666666;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ticket__date {
|
.ticket__date {
|
||||||
|
display: block;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
font-weight: 400;
|
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
color: #666666;
|
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ticket__status {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__expired {
|
||||||
|
display: block;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.4;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
.ticket__actions {
|
.ticket__actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
:host ::ng-deep .ticket__qr-button {
|
:host ::ng-deep button.ticket__qr-button {
|
||||||
min-width: auto;
|
width: 115px;
|
||||||
|
min-width: 0;
|
||||||
|
max-width: 115px;
|
||||||
min-height: 36px;
|
min-height: 36px;
|
||||||
padding-inline: 14px;
|
padding-inline: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ticket--disabled {
|
||||||
|
grid-template-columns: minmax(0, 1fr) 78px auto;
|
||||||
|
color: #8a8a8a;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host ::ng-deep .ticket--disabled button.ticket__qr-button:disabled {
|
||||||
|
--bs-btn-disabled-bg: #8a8a8a;
|
||||||
|
--bs-btn-disabled-border-color: #8a8a8a;
|
||||||
|
--bs-btn-disabled-color: #ffffff;
|
||||||
|
--bs-btn-disabled-opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
.ticket__selection input:focus-visible {
|
.ticket__selection input:focus-visible {
|
||||||
outline: 2px solid var(--tenant-primary, #009933);
|
outline: 2px solid var(--tenant-primary, #009933);
|
||||||
outline-offset: 2px;
|
outline-offset: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 575.98px) {
|
@media (max-width: 767.98px) {
|
||||||
.ticket {
|
.ticket {
|
||||||
grid-template-columns: auto minmax(0, 1fr) auto;
|
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
padding: 20px 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ticket__date {
|
.ticket__status {
|
||||||
grid-column: 2;
|
grid-column: 2;
|
||||||
grid-row: 2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ticket__actions {
|
.ticket__actions {
|
||||||
grid-column: 3;
|
grid-column: 3;
|
||||||
grid-row: 1 / span 2;
|
grid-row: 1 / span 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ticket--disabled {
|
||||||
|
grid-template-columns: minmax(0, 1fr) auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket--disabled .ticket__status {
|
||||||
|
grid-column: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket--disabled .ticket__actions {
|
||||||
|
grid-column: 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,15 +1,16 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
import { describe, expect, it, vi } from 'vitest';
|
import { describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
import { TicketComponent } from './ticket.component';
|
import { TicketComponent } from './ticket.component';
|
||||||
|
|
||||||
describe('TicketComponent', () => {
|
describe('TicketComponent', () => {
|
||||||
it('renders the ticket data and emits every action', async () => {
|
it('renders its data and emits its actions', async () => {
|
||||||
await TestBed.configureTestingModule({ imports: [TicketComponent] }).compileComponents();
|
await TestBed.configureTestingModule({ imports: [TicketComponent] }).compileComponents();
|
||||||
|
|
||||||
const fixture = TestBed.createComponent(TicketComponent);
|
const fixture = TestBed.createComponent(TicketComponent);
|
||||||
fixture.componentRef.setInput('title', 'ENTRADA GENERAL');
|
fixture.componentRef.setInput('title', 'ENTRADA GENERAL');
|
||||||
fixture.componentRef.setInput('ticketId', '0000000000');
|
fixture.componentRef.setInput('ticketId', '0000000000');
|
||||||
fixture.componentRef.setInput('date', '09 de Octubre');
|
fixture.componentRef.setInput('date', '09 de octubre');
|
||||||
|
|
||||||
const viewQr = vi.fn();
|
const viewQr = vi.fn();
|
||||||
const download = vi.fn();
|
const download = vi.fn();
|
||||||
@@ -22,7 +23,6 @@ describe('TicketComponent', () => {
|
|||||||
const element = fixture.nativeElement as HTMLElement;
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
expect(element.textContent).toContain('ENTRADA GENERAL');
|
expect(element.textContent).toContain('ENTRADA GENERAL');
|
||||||
expect(element.textContent).toContain('ID: 0000000000');
|
expect(element.textContent).toContain('ID: 0000000000');
|
||||||
expect(element.textContent).toContain('09 de Octubre');
|
|
||||||
|
|
||||||
element.querySelector<HTMLButtonElement>('app-button button')?.click();
|
element.querySelector<HTMLButtonElement>('app-button button')?.click();
|
||||||
element.querySelector<HTMLButtonElement>('[aria-label="Descargar ticket"]')?.click();
|
element.querySelector<HTMLButtonElement>('[aria-label="Descargar ticket"]')?.click();
|
||||||
@@ -33,18 +33,32 @@ describe('TicketComponent', () => {
|
|||||||
expect(share).toHaveBeenCalledOnce();
|
expect(share).toHaveBeenCalledOnce();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('supports two-way selection state', async () => {
|
it('renders the expired disabled state without secondary actions', async () => {
|
||||||
await TestBed.configureTestingModule({ imports: [TicketComponent] }).compileComponents();
|
await TestBed.configureTestingModule({ imports: [TicketComponent] }).compileComponents();
|
||||||
|
|
||||||
const fixture = TestBed.createComponent(TicketComponent);
|
const fixture = TestBed.createComponent(TicketComponent);
|
||||||
fixture.componentRef.setInput('ticketId', '0000000000');
|
fixture.componentRef.setInput('ticketId', '0000000000');
|
||||||
fixture.componentRef.setInput('date', '09 de Octubre');
|
fixture.componentRef.setInput('date', '09 de octubre');
|
||||||
|
fixture.componentRef.setInput('disabled', true);
|
||||||
|
fixture.componentRef.setInput('expired', true);
|
||||||
|
|
||||||
|
const viewQr = vi.fn();
|
||||||
|
fixture.componentInstance.viewQr.subscribe(viewQr);
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
|
|
||||||
const checkbox = fixture.nativeElement.querySelector('input') as HTMLInputElement;
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
checkbox.click();
|
const ticket = element.querySelector<HTMLElement>('.ticket');
|
||||||
fixture.detectChanges();
|
const qrButton = element.querySelector<HTMLButtonElement>('app-button button');
|
||||||
|
|
||||||
expect(fixture.componentInstance.selected()).toBe(true);
|
expect(ticket?.classList.contains('ticket--disabled')).toBe(true);
|
||||||
|
expect(ticket?.getAttribute('aria-disabled')).toBe('true');
|
||||||
|
expect(element.textContent).toContain('VENCIDO');
|
||||||
|
expect(qrButton?.disabled).toBe(true);
|
||||||
|
expect(element.querySelector('[aria-label="Descargar ticket"]')).toBeNull();
|
||||||
|
expect(element.querySelector('[aria-label="Compartir ticket"]')).toBeNull();
|
||||||
|
expect(element.querySelector('input[type="checkbox"]')).toBeNull();
|
||||||
|
|
||||||
|
qrButton?.click();
|
||||||
|
expect(viewQr).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import { ChangeDetectionStrategy, Component, input, model, output } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, input, model, output } from '@angular/core';
|
||||||
import { ButtonComponent } from '../button/button.component';
|
|
||||||
import { IconButtonComponent } from '../icon-button/icon-button.component';
|
import { ButtonComponent } from '../../../../../../../../shared/components/button/button.component';
|
||||||
|
import { IconButtonComponent } from '../../../../../../../../shared/components/icon-button/icon-button.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-ticket',
|
selector: 'app-ticket',
|
||||||
@@ -11,8 +12,10 @@ import { IconButtonComponent } from '../icon-button/icon-button.component';
|
|||||||
})
|
})
|
||||||
export class TicketComponent {
|
export class TicketComponent {
|
||||||
readonly title = input('ENTRADA GENERAL');
|
readonly title = input('ENTRADA GENERAL');
|
||||||
readonly ticketId = input.required<string>();
|
readonly ticketId = input.required<string | number>();
|
||||||
readonly date = input<string | null>(null);
|
readonly date = input<string | null>(null);
|
||||||
|
readonly disabled = input(false);
|
||||||
|
readonly expired = input(false);
|
||||||
readonly selected = model(false);
|
readonly selected = model(false);
|
||||||
|
|
||||||
readonly viewQr = output<void>();
|
readonly viewQr = output<void>();
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
import { HttpClient } from '@angular/common/http';
|
||||||
|
import { inject, Injectable } from '@angular/core';
|
||||||
|
import { firstValueFrom } from 'rxjs';
|
||||||
|
|
||||||
|
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||||
|
|
||||||
|
export interface TicketResponse {
|
||||||
|
id: number;
|
||||||
|
tenant_code: string;
|
||||||
|
ticket: string;
|
||||||
|
name: string;
|
||||||
|
description: string | null;
|
||||||
|
source_catalog_item_id: number | null;
|
||||||
|
source_variant_id: number | null;
|
||||||
|
starts_at: string | null;
|
||||||
|
expires_at: string | null;
|
||||||
|
used_at: string | null;
|
||||||
|
is_valid: boolean;
|
||||||
|
is_expired: boolean;
|
||||||
|
is_used: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class TicketService {
|
||||||
|
private readonly http = inject(HttpClient);
|
||||||
|
private readonly tenantService = inject(TenantService);
|
||||||
|
|
||||||
|
getTickets(): Promise<TicketResponse[]> {
|
||||||
|
return firstValueFrom(
|
||||||
|
this.http.get<{ data: TicketResponse[] }>(`${this.tenantService.getTenantApiUrl()}/tickets`),
|
||||||
|
).then((response) => response.data ?? []);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
<section class="tickets-page">
|
||||||
|
<h1 class="tickets-page__title">MIS TICKETS</h1>
|
||||||
|
|
||||||
|
<div class="tickets-list" aria-busy="{{ isLoading() }}">
|
||||||
|
<header class="tickets-list__header">
|
||||||
|
<label class="tickets-list__select-all">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
[checked]="allSelected()"
|
||||||
|
[disabled]="activeTickets().length === 0"
|
||||||
|
(change)="toggleAll($any($event.target).checked)"
|
||||||
|
/>
|
||||||
|
<span>TICKETS ACTIVOS</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="tickets-list__bulk-actions">
|
||||||
|
<span class="tickets-list__bulk-action">
|
||||||
|
<app-icon-button variant="download" ariaLabel="Descargar tickets seleccionados" />
|
||||||
|
<small>Descargar</small>
|
||||||
|
</span>
|
||||||
|
<span class="tickets-list__bulk-action">
|
||||||
|
<app-icon-button variant="share" ariaLabel="Compartir tickets seleccionados" />
|
||||||
|
<small>Compartir</small>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
@if (isLoading()) {
|
||||||
|
@for (item of [1, 2, 3, 4]; track item) {
|
||||||
|
<div class="tickets-list__skeleton" aria-hidden="true"></div>
|
||||||
|
}
|
||||||
|
} @else if (tickets().length) {
|
||||||
|
@for (ticket of activeTickets(); track ticket.id) {
|
||||||
|
<app-ticket
|
||||||
|
[title]="ticket.name"
|
||||||
|
[ticketId]="ticket.id"
|
||||||
|
[date]="formatDate(ticket)"
|
||||||
|
[selected]="isSelected(ticket.id)"
|
||||||
|
(selectedChange)="toggleTicket(ticket.id, $event)"
|
||||||
|
(viewQr)="viewQr(ticket)"
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (inactiveTickets().length) {
|
||||||
|
<section class="tickets-list__inactive" aria-labelledby="inactive-tickets-title">
|
||||||
|
<header class="tickets-list__header tickets-list__header--inactive">
|
||||||
|
<h2 id="inactive-tickets-title">TICKETS INACTIVOS</h2>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
@for (ticket of inactiveTickets(); track ticket.id) {
|
||||||
|
<app-ticket
|
||||||
|
[title]="ticket.name"
|
||||||
|
[ticketId]="ticket.id"
|
||||||
|
[date]="formatDate(ticket)"
|
||||||
|
[disabled]="true"
|
||||||
|
[expired]="ticket.is_expired"
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
</section>
|
||||||
|
}
|
||||||
|
} @else {
|
||||||
|
<p class="tickets-list__empty">Aún no tenés tickets disponibles.</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
.tickets-page {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 720px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-page__title {
|
||||||
|
margin: 0 0 20px;
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__header {
|
||||||
|
display: flex;
|
||||||
|
min-height: 58px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding-bottom: 12px;
|
||||||
|
border-bottom: 1px solid #dddddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__header--inactive {
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__header--inactive h2 {
|
||||||
|
margin: 0;
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__inactive {
|
||||||
|
margin-top: 44px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__select-all {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
margin: 0;
|
||||||
|
color: #a0a0a0;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__select-all input {
|
||||||
|
width: 21px;
|
||||||
|
height: 21px;
|
||||||
|
margin: 0;
|
||||||
|
accent-color: var(--tenant-primary, #009933);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__bulk-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__bulk-action {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 11px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list app-ticket {
|
||||||
|
border-bottom: 1px solid #dddddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__empty {
|
||||||
|
padding: 32px 0;
|
||||||
|
color: #666666;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__skeleton {
|
||||||
|
height: 77px;
|
||||||
|
border-bottom: 1px solid #dddddd;
|
||||||
|
background: linear-gradient(90deg, transparent, #f3f3f3, transparent);
|
||||||
|
background-size: 200% 100%;
|
||||||
|
animation: loading 1.4s infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes loading {
|
||||||
|
to {
|
||||||
|
background-position: -200% 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 767.98px) {
|
||||||
|
.tickets-page__title {
|
||||||
|
margin-top: 24px;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
import { By } from '@angular/platform-browser';
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||||
|
import { ModalService } from '../../../../../../core/services/modal.service';
|
||||||
|
import { TicketComponent } from './components/ticket/ticket.component';
|
||||||
|
import { TicketResponse, TicketService } from './ticket.service';
|
||||||
|
import { TicketsPage } from './tickets-page';
|
||||||
|
|
||||||
|
const ticket = (overrides: Partial<TicketResponse>): TicketResponse => ({
|
||||||
|
id: 1,
|
||||||
|
tenant_code: 'tenant',
|
||||||
|
ticket: 'ticket-1',
|
||||||
|
name: 'Entrada general',
|
||||||
|
description: null,
|
||||||
|
source_catalog_item_id: null,
|
||||||
|
source_variant_id: null,
|
||||||
|
starts_at: '2026-10-09T00:00:00.000Z',
|
||||||
|
expires_at: null,
|
||||||
|
used_at: null,
|
||||||
|
is_valid: true,
|
||||||
|
is_expired: false,
|
||||||
|
is_used: false,
|
||||||
|
...overrides,
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('TicketsPage', () => {
|
||||||
|
it('separates expired and used tickets into the disabled inactive list', async () => {
|
||||||
|
const tickets = [
|
||||||
|
ticket({ id: 1 }),
|
||||||
|
ticket({ id: 2, is_valid: false, is_expired: true }),
|
||||||
|
ticket({ id: 3, is_valid: false, is_used: true, used_at: '2026-10-10T00:00:00.000Z' }),
|
||||||
|
];
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [TicketsPage],
|
||||||
|
providers: [{ provide: ToastService, useValue: { danger: vi.fn() } }],
|
||||||
|
})
|
||||||
|
.overrideComponent(TicketsPage, {
|
||||||
|
set: {
|
||||||
|
providers: [
|
||||||
|
{ provide: TicketService, useValue: { getTickets: () => Promise.resolve(tickets) } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(TicketsPage);
|
||||||
|
fixture.detectChanges();
|
||||||
|
await fixture.whenStable();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const ticketComponents = fixture.debugElement.queryAll(By.directive(TicketComponent));
|
||||||
|
const [activeTicket, expiredTicket, usedTicket] = ticketComponents.map(
|
||||||
|
(element) => element.componentInstance as TicketComponent,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(ticketComponents).toHaveLength(3);
|
||||||
|
expect(activeTicket.disabled()).toBe(false);
|
||||||
|
expect(expiredTicket.disabled()).toBe(true);
|
||||||
|
expect(expiredTicket.expired()).toBe(true);
|
||||||
|
expect(usedTicket.disabled()).toBe(true);
|
||||||
|
expect(usedTicket.expired()).toBe(false);
|
||||||
|
expect(fixture.nativeElement.textContent).toContain('TICKETS INACTIVOS');
|
||||||
|
|
||||||
|
const page = fixture.nativeElement as HTMLElement;
|
||||||
|
const inactiveElements = Array.from(
|
||||||
|
page.querySelectorAll<HTMLElement>('.tickets-list__inactive app-ticket'),
|
||||||
|
);
|
||||||
|
expect(inactiveElements).toHaveLength(2);
|
||||||
|
inactiveElements.forEach((element) => {
|
||||||
|
expect(element.querySelector('.ticket--disabled')).not.toBeNull();
|
||||||
|
expect(element.querySelector<HTMLButtonElement>('app-button button')?.disabled).toBe(true);
|
||||||
|
expect(element.querySelector('input[type="checkbox"]')).toBeNull();
|
||||||
|
expect(element.querySelector('[aria-label="Descargar ticket"]')).toBeNull();
|
||||||
|
expect(element.querySelector('[aria-label="Compartir ticket"]')).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opens the QR modal with the selected ticket data', async () => {
|
||||||
|
const modalService = { openQr: vi.fn() };
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [TicketsPage],
|
||||||
|
providers: [
|
||||||
|
{ provide: ToastService, useValue: { danger: vi.fn() } },
|
||||||
|
{ provide: ModalService, useValue: modalService },
|
||||||
|
],
|
||||||
|
})
|
||||||
|
.overrideComponent(TicketsPage, {
|
||||||
|
set: {
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: TicketService,
|
||||||
|
useValue: { getTickets: () => Promise.resolve([ticket({})]) },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(TicketsPage);
|
||||||
|
fixture.detectChanges();
|
||||||
|
await fixture.whenStable();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const page = fixture.nativeElement as HTMLElement;
|
||||||
|
page.querySelector<HTMLButtonElement>('app-ticket app-button button')?.click();
|
||||||
|
|
||||||
|
expect(modalService.openQr).toHaveBeenCalledWith({
|
||||||
|
title: 'Entrada general',
|
||||||
|
id: 1,
|
||||||
|
date: '09-octubre',
|
||||||
|
ticket: 'ticket-1',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
import { Component, computed, inject, OnInit, signal } from '@angular/core';
|
||||||
|
|
||||||
|
import { ModalService } from '../../../../../../core/services/modal.service';
|
||||||
|
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||||
|
import { IconButtonComponent } from '../../../../../../shared/components/icon-button/icon-button.component';
|
||||||
|
import { TicketComponent } from './components/ticket/ticket.component';
|
||||||
|
import { TicketResponse, TicketService } from './ticket.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-tickets-page',
|
||||||
|
imports: [IconButtonComponent, TicketComponent],
|
||||||
|
providers: [TicketService],
|
||||||
|
templateUrl: './tickets-page.html',
|
||||||
|
styleUrl: './tickets-page.scss',
|
||||||
|
})
|
||||||
|
export class TicketsPage implements OnInit {
|
||||||
|
private readonly ticketService = inject(TicketService);
|
||||||
|
private readonly toastService = inject(ToastService);
|
||||||
|
private readonly modalService = inject(ModalService);
|
||||||
|
|
||||||
|
protected readonly tickets = signal<TicketResponse[]>([]);
|
||||||
|
protected readonly activeTickets = computed(() =>
|
||||||
|
this.tickets().filter((ticket) => !this.isInactive(ticket)),
|
||||||
|
);
|
||||||
|
protected readonly inactiveTickets = computed(() =>
|
||||||
|
this.tickets().filter((ticket) => this.isInactive(ticket)),
|
||||||
|
);
|
||||||
|
protected readonly selectedIds = signal<Set<number>>(new Set());
|
||||||
|
protected readonly isLoading = signal(true);
|
||||||
|
protected readonly allSelected = computed(
|
||||||
|
() =>
|
||||||
|
this.activeTickets().length > 0 && this.selectedIds().size === this.activeTickets().length,
|
||||||
|
);
|
||||||
|
|
||||||
|
async ngOnInit(): Promise<void> {
|
||||||
|
try {
|
||||||
|
this.tickets.set(await this.ticketService.getTickets());
|
||||||
|
} catch {
|
||||||
|
this.toastService.danger('Hubo un error al cargar los tickets');
|
||||||
|
} finally {
|
||||||
|
this.isLoading.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected toggleAll(selected: boolean): void {
|
||||||
|
this.selectedIds.set(
|
||||||
|
selected ? new Set(this.activeTickets().map((ticket) => ticket.id)) : new Set(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected toggleTicket(ticketId: number, selected: boolean): void {
|
||||||
|
this.selectedIds.update((current) => {
|
||||||
|
const next = new Set(current);
|
||||||
|
selected ? next.add(ticketId) : next.delete(ticketId);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected isSelected(ticketId: number): boolean {
|
||||||
|
return this.selectedIds().has(ticketId);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected isInactive(ticket: TicketResponse): boolean {
|
||||||
|
return ticket.is_expired || ticket.is_used;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected formatDate(ticket: TicketResponse): string | null {
|
||||||
|
const value = ticket.starts_at ?? ticket.expires_at;
|
||||||
|
if (!value) return null;
|
||||||
|
|
||||||
|
const date = new Date(value);
|
||||||
|
if (Number.isNaN(date.getTime())) return null;
|
||||||
|
|
||||||
|
return new Intl.DateTimeFormat('es-AR', {
|
||||||
|
day: '2-digit',
|
||||||
|
month: 'long',
|
||||||
|
timeZone: 'UTC',
|
||||||
|
}).format(date);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected viewQr(ticket: TicketResponse): void {
|
||||||
|
this.modalService.openQr({
|
||||||
|
title: ticket.name,
|
||||||
|
id: ticket.id,
|
||||||
|
date: this.formatDate(ticket) ?? '',
|
||||||
|
ticket: ticket.ticket,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -81,7 +81,8 @@
|
|||||||
variant="neutral-outline"
|
variant="neutral-outline"
|
||||||
hostClass="w-100 d-block"
|
hostClass="w-100 d-block"
|
||||||
buttonClass="w-100 d-inline-flex align-items-center justify-content-center gap-2 py-2 fw-semibold"
|
buttonClass="w-100 d-inline-flex align-items-center justify-content-center gap-2 py-2 fw-semibold"
|
||||||
[disabled]="true"
|
[disabled]="isSubmitting()"
|
||||||
|
(click)="loginWithGoogle()"
|
||||||
>
|
>
|
||||||
<svg
|
<svg
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { DOCUMENT } from '@angular/common';
|
import { DOCUMENT, isPlatformBrowser } from '@angular/common';
|
||||||
import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, inject, PLATFORM_ID, signal } from '@angular/core';
|
||||||
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
|
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||||
import { Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
|
||||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||||
@@ -20,8 +20,10 @@ const EMAIL_MAX_LENGTH = 255;
|
|||||||
export class LoginPageComponent {
|
export class LoginPageComponent {
|
||||||
private readonly formBuilder = inject(FormBuilder);
|
private readonly formBuilder = inject(FormBuilder);
|
||||||
private readonly router = inject(Router);
|
private readonly router = inject(Router);
|
||||||
|
private readonly route = inject(ActivatedRoute);
|
||||||
private readonly authService = inject(AuthService);
|
private readonly authService = inject(AuthService);
|
||||||
private readonly document = inject(DOCUMENT);
|
private readonly document = inject(DOCUMENT);
|
||||||
|
private readonly platformId = inject(PLATFORM_ID);
|
||||||
|
|
||||||
private readonly submittedState = signal(false);
|
private readonly submittedState = signal(false);
|
||||||
private readonly serverErrorState = signal<string | null>(null);
|
private readonly serverErrorState = signal<string | null>(null);
|
||||||
@@ -35,6 +37,18 @@ export class LoginPageComponent {
|
|||||||
protected readonly serverError = this.serverErrorState.asReadonly();
|
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||||
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
if (!isPlatformBrowser(this.platformId)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const oauthCode = this.route.snapshot.queryParamMap.get('oauth_code');
|
||||||
|
|
||||||
|
if (oauthCode) {
|
||||||
|
this.completeGoogleLogin(oauthCode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
goToRegister(): void {
|
goToRegister(): void {
|
||||||
void this.router.navigate(['/register']);
|
void this.router.navigate(['/register']);
|
||||||
}
|
}
|
||||||
@@ -62,6 +76,16 @@ export class LoginPageComponent {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
loginWithGoogle(): void {
|
||||||
|
this.serverErrorState.set(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
this.authService.loginWithGoogle();
|
||||||
|
} catch (error: unknown) {
|
||||||
|
this.serverErrorState.set(this.resolveErrorMessage(error));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected updateEmail(value: string | number): void {
|
protected updateEmail(value: string | number): void {
|
||||||
this.form.controls.email.setValue(String(value));
|
this.form.controls.email.setValue(String(value));
|
||||||
}
|
}
|
||||||
@@ -107,6 +131,22 @@ export class LoginPageComponent {
|
|||||||
this.document.location.assign(homeUrl);
|
this.document.location.assign(homeUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private completeGoogleLogin(oauthCode: string): void {
|
||||||
|
this.isSubmittingState.set(true);
|
||||||
|
this.serverErrorState.set(null);
|
||||||
|
|
||||||
|
this.authService.completeGoogleLogin(oauthCode).subscribe({
|
||||||
|
next: () => {
|
||||||
|
this.isSubmittingState.set(false);
|
||||||
|
this.redirectToHome();
|
||||||
|
},
|
||||||
|
error: (error: unknown) => {
|
||||||
|
this.isSubmittingState.set(false);
|
||||||
|
this.serverErrorState.set(this.resolveErrorMessage(error));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private resolveErrorMessage(error: unknown): string {
|
private resolveErrorMessage(error: unknown): string {
|
||||||
const errorPayload =
|
const errorPayload =
|
||||||
typeof error === 'object' && error !== null && 'error' in error
|
typeof error === 'object' && error !== null && 'error' in error
|
||||||
|
|||||||
@@ -50,8 +50,8 @@ describe('RegisterPageComponent', () => {
|
|||||||
component.form.setValue({
|
component.form.setValue({
|
||||||
nombre_apellido: 'Ada Lovelace',
|
nombre_apellido: 'Ada Lovelace',
|
||||||
email: 'ada@example.com',
|
email: 'ada@example.com',
|
||||||
password: 'secret123',
|
password: 'Secret!123',
|
||||||
password_confirmation: 'secret123'
|
password_confirmation: 'Secret!123'
|
||||||
});
|
});
|
||||||
|
|
||||||
component.onSubmit();
|
component.onSubmit();
|
||||||
@@ -59,8 +59,8 @@ describe('RegisterPageComponent', () => {
|
|||||||
expect(authService.register).toHaveBeenCalledWith({
|
expect(authService.register).toHaveBeenCalledWith({
|
||||||
nombre_apellido: 'Ada Lovelace',
|
nombre_apellido: 'Ada Lovelace',
|
||||||
email: 'ada@example.com',
|
email: 'ada@example.com',
|
||||||
password: 'secret123',
|
password: 'Secret!123',
|
||||||
password_confirmation: 'secret123'
|
password_confirmation: 'Secret!123'
|
||||||
});
|
});
|
||||||
expect(modalService.openSimple).toHaveBeenCalledWith({
|
expect(modalService.openSimple).toHaveBeenCalledWith({
|
||||||
content: 'Tu cuenta fue creada correctamente',
|
content: 'Tu cuenta fue creada correctamente',
|
||||||
@@ -178,8 +178,8 @@ describe('RegisterPageComponent', () => {
|
|||||||
component.form.setValue({
|
component.form.setValue({
|
||||||
nombre_apellido: 'Ada Lovelace',
|
nombre_apellido: 'Ada Lovelace',
|
||||||
email: 'ada@example.com',
|
email: 'ada@example.com',
|
||||||
password: 'secret123',
|
password: 'Secret!123',
|
||||||
password_confirmation: 'secret123'
|
password_confirmation: 'Secret!123'
|
||||||
});
|
});
|
||||||
component.onSubmit();
|
component.onSubmit();
|
||||||
|
|
||||||
|
|||||||
@@ -106,6 +106,14 @@ export const routes: Routes = [
|
|||||||
(m) => m.PurchaseDetailPage,
|
(m) => m.PurchaseDetailPage,
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'tickets',
|
||||||
|
canActivate: [hasMenuGuard('tickets')],
|
||||||
|
loadComponent: () =>
|
||||||
|
import('./pages/account-page/pages/tickets-page/tickets-page').then(
|
||||||
|
(m) => m.TicketsPage,
|
||||||
|
),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '',
|
path: '',
|
||||||
redirectTo: 'datos-personales',
|
redirectTo: 'datos-personales',
|
||||||
|
|||||||
@@ -19,6 +19,36 @@
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-shell__dialog--qr {
|
||||||
|
width: min(100%, 15rem);
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell__dialog--qr .modal-shell__content {
|
||||||
|
min-height: auto;
|
||||||
|
border-radius: 0.35rem;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell__dialog--qr .modal-shell__header {
|
||||||
|
padding: 1.7rem 1rem 0.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell__dialog--qr .modal-shell__title {
|
||||||
|
color: var(--bs-success, #198754);
|
||||||
|
font-size: 0.8rem;
|
||||||
|
font-weight: 800;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell__dialog--qr .modal-shell__header .btn-close {
|
||||||
|
top: 0.85rem;
|
||||||
|
right: 0.85rem;
|
||||||
|
font-size: 0.7rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell__dialog--qr .modal-shell__body {
|
||||||
|
padding: 0 1rem 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
.modal-shell__dialog.modal-sm {
|
.modal-shell__dialog.modal-sm {
|
||||||
width: min(100%, 24rem);
|
width: min(100%, 24rem);
|
||||||
}
|
}
|
||||||
@@ -40,8 +70,7 @@
|
|||||||
min-height: 180px;
|
min-height: 180px;
|
||||||
max-height: calc(100dvh - 2rem);
|
max-height: calc(100dvh - 2rem);
|
||||||
border-radius: 1.25rem;
|
border-radius: 1.25rem;
|
||||||
background:
|
background: linear-gradient(180deg, rgba(255, 255, 255, 0.98), rgba(248, 248, 248, 0.98));
|
||||||
linear-gradient(180deg, rgba(255, 255, 255, 0.98), rgba(248, 248, 248, 0.98));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal-shell__dialog--full .modal-shell__content {
|
.modal-shell__dialog--full .modal-shell__content {
|
||||||
@@ -88,6 +117,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.modal-shell__dialog,
|
.modal-shell__dialog,
|
||||||
|
.modal-shell__dialog--qr,
|
||||||
.modal-shell__dialog.modal-sm,
|
.modal-shell__dialog.modal-sm,
|
||||||
.modal-shell__dialog.modal-lg,
|
.modal-shell__dialog.modal-lg,
|
||||||
.modal-shell__dialog.modal-xl,
|
.modal-shell__dialog.modal-xl,
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import {
|
|||||||
computed,
|
computed,
|
||||||
input,
|
input,
|
||||||
output,
|
output,
|
||||||
viewChild
|
viewChild,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
|
|
||||||
import { ModalSize } from '../../../core/services/modal.service';
|
import { ModalSize } from '../../../core/services/modal.service';
|
||||||
@@ -16,7 +16,7 @@ import { ModalSize } from '../../../core/services/modal.service';
|
|||||||
imports: [NgClass],
|
imports: [NgClass],
|
||||||
templateUrl: './modal-shell.component.html',
|
templateUrl: './modal-shell.component.html',
|
||||||
styleUrl: './modal-shell.component.scss',
|
styleUrl: './modal-shell.component.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class ModalShellComponent {
|
export class ModalShellComponent {
|
||||||
private readonly panel = viewChild.required<ElementRef<HTMLElement>>('panel');
|
private readonly panel = viewChild.required<ElementRef<HTMLElement>>('panel');
|
||||||
@@ -32,10 +32,11 @@ export class ModalShellComponent {
|
|||||||
const size = this.size();
|
const size = this.size();
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
'modal-shell__dialog--qr': size === 'qr',
|
||||||
'modal-sm': size === 'sm',
|
'modal-sm': size === 'sm',
|
||||||
'modal-lg': size === 'lg',
|
'modal-lg': size === 'lg',
|
||||||
'modal-xl': size === 'xl',
|
'modal-xl': size === 'xl',
|
||||||
'modal-shell__dialog--full': size === 'full'
|
'modal-shell__dialog--full': size === 'full',
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -55,8 +56,8 @@ export class ModalShellComponent {
|
|||||||
'input:not([disabled])',
|
'input:not([disabled])',
|
||||||
'select:not([disabled])',
|
'select:not([disabled])',
|
||||||
'textarea:not([disabled])',
|
'textarea:not([disabled])',
|
||||||
'[tabindex]:not([tabindex="-1"])'
|
'[tabindex]:not([tabindex="-1"])',
|
||||||
].join(', ')
|
].join(', '),
|
||||||
);
|
);
|
||||||
|
|
||||||
(focusTarget ?? panel).focus();
|
(focusTarget ?? panel).focus();
|
||||||
|
|||||||
16
src/app/shared/components/qr-modal/qr-modal.component.html
Normal file
16
src/app/shared/components/qr-modal/qr-modal.component.html
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
<article class="qr-modal">
|
||||||
|
<header class="qr-modal__header">
|
||||||
|
<p class="qr-modal__id">ID: {{ data.id }}</p>
|
||||||
|
@if (data.date) {
|
||||||
|
<time class="qr-modal__date">{{ data.date }}</time>
|
||||||
|
}
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<qrcode
|
||||||
|
class="qr-modal__code"
|
||||||
|
[qrdata]="data.ticket"
|
||||||
|
[width]="320"
|
||||||
|
errorCorrectionLevel="M"
|
||||||
|
[ariaLabel]="'Código QR del ticket ' + data.id"
|
||||||
|
/>
|
||||||
|
</article>
|
||||||
44
src/app/shared/components/qr-modal/qr-modal.component.scss
Normal file
44
src/app/shared/components/qr-modal/qr-modal.component.scss
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
.qr-modal {
|
||||||
|
display: grid;
|
||||||
|
justify-items: center;
|
||||||
|
gap: 0.65rem;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-modal__header {
|
||||||
|
display: grid;
|
||||||
|
justify-items: center;
|
||||||
|
gap: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-modal__id {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-modal__id {
|
||||||
|
color: #4f4f4f;
|
||||||
|
font-size: 0.68rem;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-modal__date {
|
||||||
|
margin-top: 0.35rem;
|
||||||
|
color: #8a8a8a;
|
||||||
|
font-size: 0.62rem;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-modal__code {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 11rem;
|
||||||
|
overflow: hidden;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host ::ng-deep .qr-modal__code canvas {
|
||||||
|
display: block;
|
||||||
|
width: 100% !important;
|
||||||
|
height: auto !important;
|
||||||
|
}
|
||||||
15
src/app/shared/components/qr-modal/qr-modal.component.ts
Normal file
15
src/app/shared/components/qr-modal/qr-modal.component.ts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
|
||||||
|
|
||||||
|
import { MODAL_DATA, QrModalData } from '../../../core/services/modal.service';
|
||||||
|
import { QRCodeComponent } from '../qrcode/qrcode.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-qr-modal',
|
||||||
|
imports: [QRCodeComponent],
|
||||||
|
templateUrl: './qr-modal.component.html',
|
||||||
|
styleUrl: './qr-modal.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class QrModalComponent {
|
||||||
|
protected readonly data = inject<QrModalData>(MODAL_DATA);
|
||||||
|
}
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<article class="ticket">
|
|
||||||
<label class="ticket__selection">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
[checked]="selected()"
|
|
||||||
(change)="selected.set($any($event.target).checked)"
|
|
||||||
/>
|
|
||||||
<span class="visually-hidden">Seleccionar ticket {{ title() }}</span>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<div class="ticket__details">
|
|
||||||
<h3 class="ticket__title">{{ title() }}</h3>
|
|
||||||
<p class="ticket__id">ID: {{ ticketId() }}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@if (date(); as ticketDate) {
|
|
||||||
<time class="ticket__date">{{ ticketDate }}</time>
|
|
||||||
}
|
|
||||||
|
|
||||||
<div class="ticket__actions">
|
|
||||||
<app-button variant="primary" buttonClass="ticket__qr-button" (click)="viewQr.emit()">
|
|
||||||
<i class="fa-solid fa-qrcode" aria-hidden="true"></i>
|
|
||||||
<span>Ver QR</span>
|
|
||||||
</app-button>
|
|
||||||
|
|
||||||
<app-icon-button variant="download" ariaLabel="Descargar ticket" (clicked)="download.emit()" />
|
|
||||||
|
|
||||||
<app-icon-button variant="share" ariaLabel="Compartir ticket" (clicked)="share.emit()" />
|
|
||||||
</div>
|
|
||||||
</article>
|
|
||||||
Reference in New Issue
Block a user