Merge branch 'feature/responsive' into develop

- Refactor AuthService, CartService, CatalogService, CheckoutService, TenantService, and TicketService to extend BaseApiService for consistent loading context handling.
- Implement loading modes ('global', 'custom', 'none') using HttpContext for API requests.
- Update existing service methods to accept loading mode parameters and propagate them to HTTP requests.
- Enhance global loading interceptor to respect loading modes and prevent global loading for specific requests.
- Add unit tests to verify loading mode propagation in services and interceptors.
- Update component interactions to utilize the new loading mode functionality.

src/app/app.config.ts

@@ -10,6 +10,7 @@ import { provideClientHydration, withHttpTransferCacheOptions } from '@angular/p
 import { routes } from './app.routes';
 import { authBootstrap } from './core/services/auth/auth-bootstrap';
 import { authInterceptor } from './core/services/auth/auth.interceptor';
+import { globalLoadingInterceptor } from './core/services/global-loading/global-loading.interceptor';
 import { tenantBootstrap } from './core/services/tenant-bootstrap';
 
 function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
@@ -29,7 +30,10 @@ export const appConfig: ApplicationConfig = {
         filter: isStoreCatalogRequest,
       }),
     ),
-    provideHttpClient(withFetch(), withInterceptors([authInterceptor])),
+    provideHttpClient(
+      withFetch(),
+      withInterceptors([authInterceptor, globalLoadingInterceptor])
+    ),
     provideAppInitializer(authBootstrap),
     provideAppInitializer(tenantBootstrap),
   ],

src/app/app.html

@@ -2,6 +2,7 @@
   <router-outlet />
   <app-toast-container />
   <app-modal-host />
+  <app-global-loading />
 } @else if (status() === 'not-found') {
   <section class="tenant-status">
     <div class="tenant-status__card">

src/app/app.ts

@@ -3,6 +3,7 @@ import { RouterOutlet } from '@angular/router';
 
 import { TenantService } from './core/services/tenant.service';
 import { DEFAULT_TENANT_BRANDING } from './core/services/tenant-ssr-cache.store';
+import { GlobalLoadingComponent } from './shared/components/global-loading/global-loading.component';
 import { ModalHostComponent } from './shared/components/modal-host/modal-host.component';
 import { ToastContainerComponent } from './shared/components/toast-container/toast-container.component';
 
@@ -23,7 +24,12 @@ function hexToRgb(hex: string): string {
 
 @Component({
   selector: 'app-root',
-  imports: [RouterOutlet, ToastContainerComponent, ModalHostComponent],
+  imports: [
+    RouterOutlet,
+    ToastContainerComponent,
+    ModalHostComponent,
+    GlobalLoadingComponent
+  ],
   templateUrl: './app.html',
   styleUrl: './app.scss',
   host: {

src/app/core/layout/store-layout/store-footer/store-footer.component.html

@@ -1,7 +1,7 @@
 <footer class="store-layout__footer mt-auto text-light">
-  <div class="container-xl px-3 px-md-4 py-4 py-md-5">
-    <div class="row g-4">
-      <div class="col-12">
+  <div class="container-xl px-3 px-md-4 py-4 py-md-5 store-layout__footer-content">
+    <div class="row g-4 store-layout__footer-grid">
+      <div class="col-12 store-layout__brand-column">
         <div
           class="store-layout__brand-slot d-inline-flex align-items-center gap-3"
           data-testid="store-footer-brand-slot"
@@ -17,30 +17,29 @@
         </div>
       </div>
 
-      <div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start">
-        <div class="d-grid gap-2">
-          <div class="d-flex align-items-center gap-2  ">
+      <div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start store-layout__contact">
+        <div class="d-grid gap-2 store-layout__contact-details">
+          <div class="d-flex align-items-center gap-2">
             <i class="fa-solid fa-location-dot" aria-hidden="true"></i>
             <span>Av. San Lorenzo 1542, Rosario</span>
           </div>
-          <div class="d-flex align-items-center gap-2  ">
+          <div class="d-flex align-items-center gap-2">
             <i class="fa-solid fa-phone" aria-hidden="true"></i>
             <span>54 9 (0341) 6658247</span>
           </div>
         </div>
 
-        <p class="mb-0 small store-layout__muted-text">Copyright &copy; {{ currentYear }} - Sonder</p>
+        <p class="mb-0 small store-layout__muted-text store-layout__copyright">
+          Copyright &copy; {{ currentYear }} - {{ storeName || 'Sonder' }}
+        </p>
       </div>
 
       @for (section of footerSections; track section.heading) {
-        <div class="col-12 col-md-6 col-xl-2 d-grid align-content-start">
+        <div class="col-12 col-md-6 col-xl-2 d-grid align-content-start store-layout__links-column">
           <div class="d-grid gap-2">
             @for (link of section.links; track link.label) {
               @if (link.routerLink) {
-                <a
-                  class="store-layout__footer-link"
-                  [routerLink]="link.routerLink"
-                >
+                <a class="store-layout__footer-link" [routerLink]="link.routerLink">
                   {{ link.label }}
                 </a>
               } @else if (link.action === 'logout') {
@@ -59,8 +58,10 @@
         </div>
       }
 
-      <div class="col-12 col-md-6 col-xl-3 d-grid align-content-start">
-        <div class="d-flex align-items-center gap-3">
+      <div class="store-layout__mobile-divider" aria-hidden="true"></div>
+
+      <div class="col-12 col-md-6 col-xl-3 d-grid align-content-start store-layout__social-column">
+        <div class="d-flex align-items-center gap-3 store-layout__social-list">
           @for (social of socialMedia; track social.code) {
             <app-social-media
               class="text-white"

src/app/core/layout/store-layout/store-footer/store-footer.component.scss

@@ -2,6 +2,10 @@
   background-color: var(--tenant-footer-bg);
 }
 
+.store-layout__mobile-divider {
+  display: none;
+}
+
 .store-layout__brand-slot {
   width: min(100%, 12rem);
   min-width: 10rem;
@@ -92,11 +96,98 @@
 }
 
 @media (max-width: 767.98px) {
+  .store-layout__footer-content {
+    padding: 1.45rem 2.5rem 1.8rem !important;
+  }
+
+  .store-layout__footer-grid {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 0;
+    margin: 0;
+  }
+
+  .store-layout__footer-grid > * {
+    margin-top: 0;
+    padding-right: 0;
+    padding-left: 0;
+  }
+
+  .store-layout__links-column {
+    order: 1;
+    width: auto;
+    padding-bottom: 1.65rem;
+    font-size: 0.72rem;
+    line-height: 1.25;
+
+    &:nth-of-type(even) {
+      padding-left: 0.65rem;
+    }
+
+    > div {
+      gap: 0.5rem !important;
+    }
+  }
+
+  .store-layout__mobile-divider {
+    display: block;
+    order: 2;
+    grid-column: 1 / -1;
+    width: 100vw;
+    border-top: 1px solid rgba(255, 255, 255, 0.3);
+  }
+
+  .store-layout__brand-column,
+  .store-layout__social-column {
+    order: 3;
+    width: auto;
+    padding-top: 2rem;
+  }
+
   .store-layout__brand-slot {
+    width: min(100%, 7.75rem);
     min-width: 0;
   }
 
+  .store-layout__brand-logo {
+    max-height: 2.5rem;
+  }
+
+  .store-layout__brand-logo-shell {
+    width: min(100%, 7.75rem);
+    height: 2.5rem;
+  }
+
   .store-layout__brand-text {
     font-size: 1.45rem;
   }
+
+  .store-layout__social-column {
+    align-items: center;
+  }
+
+  .store-layout__social-list {
+    justify-content: flex-end;
+    gap: 0 !important;
+  }
+
+  .store-layout__contact {
+    order: 4;
+    grid-column: 1 / -1;
+    width: auto;
+    gap: 1.25rem !important;
+    padding-top: 0.9rem;
+    text-align: center;
+  }
+
+  .store-layout__contact-details {
+    justify-items: center;
+    gap: 0.4rem !important;
+    font-size: 0.7rem;
+  }
+
+  .store-layout__copyright {
+    font-size: 0.6rem;
+    line-height: 1.3;
+  }
 }

src/app/core/layout/store-layout/store-footer/store-footer.component.ts

@@ -25,5 +25,6 @@ export class StoreFooterComponent {
   @Input({ required: true }) footerSections: StoreFooterSection[] = [];
   @Input({ required: true }) socialMedia: SocialMedia[] = [];
   @Input() logoUrl: string | null = null;
+  @Input() storeName: string | null = null;
   readonly logoutClick = output<void>();
 }

src/app/core/layout/store-layout/store-header/store-header.component.html

@@ -1,81 +1,83 @@
 <header class="store-layout__header">
   <div class="store-layout__header-main">
-    <div
-      class="container-xl px-3 px-md-4 py-3 py-lg-4 d-flex flex-row flex-wrap align-items-center justify-content-between gap-3"
-    >
-      <a
-        routerLink="/"
-        class="store-layout__brand-slot d-inline-flex align-items-center gap-3 flex-shrink-0 text-decoration-none"
-        data-testid="store-header-brand-slot"
-        aria-label="Logo del comercio"
-      >
-        @if (logoUrl()) {
-          <img class="store-layout__brand-logo" [src]="logoUrl()" alt="Logo del comercio" />
-        } @else {
-          <div class="store-layout__brand-logo-shell" aria-hidden="true">
-            <span class="store-layout__brand-logo-skeleton"></span>
-          </div>
-        }
-      </a>
-
-      <div
-        class="d-flex flex-row align-items-center gap-3 ms-auto flex-nowrap flex-grow-1 justify-content-between justify-content-md-end"
-      >
-        <div class="store-layout__search-wrapper">
-          <div class="input-group store-layout__search" role="search">
-            <label class="visually-hidden" for="store-search-input">Buscar productos</label>
-            <input
-              id="store-search-input"
-              type="search"
-              class="form-control store-layout__search-input border-end-0 rounded-start"
-              placeholder="Buscar productos"
-              autocomplete="off"
-              [attr.aria-describedby]="showSearchError() ? 'store-search-error' : null"
-              [attr.aria-invalid]="showSearchError()"
-              [minlength]="minSearchLength"
-              [formControl]="searchControl"
-              (input)="clearSearchError()"
-              (keydown.enter)="submitSearch($event)"
-            />
-            <button
-              type="button"
-              class="btn store-layout__search-button border-start-0 rounded-end px-3"
-              aria-label="Buscar"
-              (click)="submitSearch()"
-            >
-              <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
-            </button>
-          </div>
-
-          @if (showSearchError()) {
-            <p id="store-search-error" class="store-layout__search-error mb-0" role="alert">
-              Ingresá al menos {{ minSearchLength }} caracteres para buscar.
-            </p>
-          }
+    <div class="container-xl px-3 px-md-4 py-3 py-lg-4">
+      <div class="row align-items-center gy-3 gy-md-0">
+        <div class="col-auto col-md-auto order-1 store-layout__brand-column">
+          <a
+            routerLink="/"
+            class="store-layout__brand-slot d-inline-flex align-items-center gap-3 text-decoration-none"
+            data-testid="store-header-brand-slot"
+            aria-label="Logo del comercio"
+          >
+            @if (logoUrl()) {
+              <img class="store-layout__brand-logo" [src]="logoUrl()" alt="Logo del comercio" />
+            } @else {
+              <div class="store-layout__brand-logo-shell" aria-hidden="true">
+                <span class="store-layout__brand-logo-skeleton"></span>
+              </div>
+            }
+          </a>
         </div>
 
-        @if (ticketsMenu(); as menu) {
-          <app-button
-            variant="primary"
-            hostClass="flex-shrink-0"
-            data-testid="store-header-tickets"
-            (click)="ticketsClick.emit()"
-          >
-            {{ menu.label }}
-          </app-button>
-        }
+        <div class="col-12 px-0 d-md-none order-3">
+          <hr class="store-layout__mobile-separator">
+        </div>
+
+        <div class="col-12 col-md order-4 order-md-2">
+          <div class="store-layout__search-wrapper ms-md-auto">
+            <div class="input-group store-layout__search" role="search">
+              <label class="visually-hidden" for="store-search-input">Buscar productos</label>
+              <input
+                id="store-search-input"
+                type="search"
+                class="form-control store-layout__search-input border-end-0 rounded-start"
+                placeholder="Buscar productos"
+                autocomplete="off"
+                [attr.aria-describedby]="showSearchError() ? 'store-search-error' : null"
+                [attr.aria-invalid]="showSearchError()"
+                [minlength]="minSearchLength"
+                [formControl]="searchControl"
+                (input)="clearSearchError()"
+                (keydown.enter)="submitSearch($event)"
+              />
+              <button
+                type="button"
+                class="btn store-layout__search-button border-start-0 rounded-end px-3"
+                aria-label="Buscar"
+                (click)="submitSearch()"
+              >
+                <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
+              </button>
+            </div>
+
+            @if (showSearchError()) {
+              <p id="store-search-error" class="store-layout__search-error mb-0" role="alert">
+                Ingresá al menos {{ minSearchLength }} caracteres para buscar.
+              </p>
+            }
+          </div>
+        </div>
+
+        <div class="store-layout__actions-column col-auto col-md-auto order-2 order-md-3 ms-auto d-flex flex-row align-items-center justify-content-end gap-2 gap-md-3">
+          @if (ticketsMenu(); as menu) {
+            <app-button
+              variant="primary"
+              hostClass="store-layout__tickets-btn-host"
+              data-testid="store-header-tickets"
+              (click)="ticketsClick.emit()"
+            >
+              {{ menu.label }}
+            </app-button>
+          }
 
-        <div
-          class="d-flex align-items-center justify-content-end gap-1"
-          aria-label="Acciones de usuario"
-        >
           <app-cart-icon
             [quantity]="cartQuantity()"
             ariaLabel="Carrito de compras"
             title="Carrito"
             (click)="cartClick.emit()"
           />
-          <div class="store-layout__user-menu">
+
+          <div class="store-layout__user-menu d-none d-md-inline-flex position-relative">
             <app-icon-button
               variant="user"
               ariaLabel="Mi cuenta"
@@ -94,12 +96,46 @@
               />
             }
           </div>
+
+          <div class="store-layout__mobile-menu d-inline-flex d-md-none position-relative">
+            <app-icon-button
+              variant="bars"
+              ariaLabel="Menu"
+              ariaControls="store-mobile-menu"
+              [ariaExpanded]="isMobileMenuOpen()"
+              title="Menu"
+              (clicked)="toggleMobileMenu()"
+            />
+
+            @if (isMobileMenuOpen()) {
+              <div id="store-mobile-menu" class="position-absolute end-0 bg-white rounded shadow mt-2 py-2 store-layout__mobile-dropdown-menu">
+                <a 
+                  class="dropdown-item d-flex align-items-center gap-2 px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item" 
+                  (click)="onMobileAccountClick()"
+                >
+                  <i class="fa-regular fa-circle-user fa-lg"></i>
+                  <span class="fw-medium">Mi cuenta</span>
+                </a>
+
+                <hr class="my-1 border-secondary opacity-25">
+
+                @for (category of categories(); track category.id) {
+                  <a 
+                    class="dropdown-item px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item" 
+                    (click)="onCategorySelect(category)"
+                  >
+                    <span class="fw-medium">{{ category.nombre }}</span>
+                  </a>
+                }
+              </div>
+            }
+          </div>
         </div>
       </div>
     </div>
   </div>
 
-  <div class="store-layout__categories">
+  <div class="store-layout__categories d-none d-md-block">
     <div class="container-xl px-3 px-md-4">
       <div class="store-layout__category-menu">
         <button

src/app/core/layout/store-layout/store-header/store-header.component.scss

@@ -10,7 +10,10 @@
 
 .store-layout__brand-slot {
   min-width: 150px;
-  max-width:40px;
+}
+
+.store-layout__brand-column {
+  max-width: 12rem;
 }
 
 .store-layout__brand-logo-shell {
@@ -42,10 +45,25 @@
 }
 
 .store-layout__search-wrapper {
-  width: min(100%, 260px);
+  width: 100%;
   min-width: 0;
 }
 
+@media (min-width: 768px) {
+  .store-layout__search-wrapper {
+    width: min(100%, 260px);
+  }
+
+  .store-layout__actions-column {
+    padding-left: 0;
+  }
+
+  ::ng-deep .store-layout__tickets-btn-host {
+    flex: 0 0 clamp(8rem, 15vw, 13.5rem);
+    width: clamp(8rem, 15vw, 13.5rem);
+  }
+}
+
 .store-layout__search {
   width: 100%;
 }
@@ -137,5 +155,56 @@
 @media (max-width: 767.98px) {
   .store-layout__brand-slot {
     min-width: 0;
+    max-width: 150px;
+  }
+
+  .store-layout__mobile-separator {
+    border-color: #DDDDDD;
+    opacity: 1;
+    margin: 0 -1rem;
+  }
+}
+
+@media (max-width: 399.98px) {
+  .store-layout__brand-column {
+    flex: 1 1 0;
+    width: auto;
+    min-width: 0;
+    max-width: none;
+    padding-right: 0.25rem;
+  }
+
+  .store-layout__brand-slot {
+    width: 100%;
+    max-width: 6.5rem;
+  }
+
+  .store-layout__actions-column {
+    flex: 0 0 auto;
+    width: auto;
+    margin-left: 0 !important;
+    padding-left: 0.25rem;
+    gap: 0.25rem !important;
+  }
+
+  ::ng-deep .store-layout__tickets-btn-host .btn {
+    padding-inline: 0.75rem;
+    font-size: 0.875rem;
+  }
+}
+
+.store-layout__mobile-dropdown-menu {
+  top: 100%;
+  min-width: 220px;
+  z-index: 1050;
+}
+
+.store-layout__mobile-dropdown-item {
+  cursor: pointer;
+  color: #8a8a8a;
+
+  &:hover,
+  &:focus-visible {
+    color: #666666;
   }
 }

src/app/core/layout/store-layout/store-header/store-header.component.ts

@@ -1,5 +1,5 @@
 import { Component, ElementRef, HostListener, inject, input, output, signal } from '@angular/core';
-import { RouterLink } from '@angular/router';
+import { Router, RouterLink } from '@angular/router';
 import { AuthUser } from '../../../services/auth/auth.interfaces';
 import { CartIconComponent } from '../../../../shared/components/cart-icon/cart-icon.component';
 import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component';
@@ -26,6 +26,7 @@ import { CategoryDropdownComponent } from './category-dropdown/category-dropdown
 })
 export class StoreHeaderComponent {
   private readonly elementRef = inject(ElementRef<HTMLElement>);
+  private readonly router = inject(Router);
 
   readonly logoUrl = input<string | null>(null);
   readonly cartQuantity = input<number>(0);
@@ -43,13 +44,14 @@ export class StoreHeaderComponent {
 
   protected readonly isUserDropdownOpen = signal(false);
   protected readonly isCategoryDropdownOpen = signal(false);
+  protected readonly isMobileMenuOpen = signal(false);
   protected readonly minSearchLength = 3;
   protected readonly showSearchError = signal(false);
   protected readonly searchControl = new FormControl('', { nonNullable: true });
 
   @HostListener('document:click', ['$event'])
   protected onDocumentClick(event: MouseEvent): void {
-    if (!this.isUserDropdownOpen() && !this.isCategoryDropdownOpen()) {
+    if (!this.isUserDropdownOpen() && !this.isCategoryDropdownOpen() && !this.isMobileMenuOpen()) {
       return;
     }
 
@@ -57,6 +59,7 @@ export class StoreHeaderComponent {
     if (target instanceof Node && !this.elementRef.nativeElement.contains(target)) {
       this.isUserDropdownOpen.set(false);
       this.isCategoryDropdownOpen.set(false);
+      this.isMobileMenuOpen.set(false);
     }
   }
 
@@ -64,6 +67,7 @@ export class StoreHeaderComponent {
   protected onEscapeKey(): void {
     this.isUserDropdownOpen.set(false);
     this.isCategoryDropdownOpen.set(false);
+    this.isMobileMenuOpen.set(false);
   }
 
   protected toggleUserDropdown(): void {
@@ -109,6 +113,25 @@ export class StoreHeaderComponent {
 
   protected onCategorySelect(category: Category): void {
     this.isCategoryDropdownOpen.set(false);
+    this.isMobileMenuOpen.set(false);
     this.categorySelect.emit(category);
   }
+
+  protected toggleMobileMenu(): void {
+    this.isMobileMenuOpen.update((isOpen) => !isOpen);
+  }
+
+  protected onMobileAccountClick(): void {
+    this.isMobileMenuOpen.set(false);
+    if (!this.isAuthenticated()) {
+      this.loginClick.emit();
+    } else {
+      const menus = this.accountNavigationMenus();
+      if (menus.length > 0) {
+        this.router.navigate([menus[0].route]);
+      } else {
+        this.router.navigate(['/cuenta']);
+      }
+    }
+  }
 }

src/app/core/layout/store-layout/store-layout.component.html

@@ -61,6 +61,7 @@
     [footerSections]="footerSections()"
     [socialMedia]="tenant()?.social_media ?? []"
     [logoUrl]="tenant()?.footer_logo ?? null"
+    [storeName]="tenant()?.nombre ?? null"
     (logoutClick)="onLogoutClick()"
   />
 </div>

src/app/core/services/auth/auth.service.ts

@@ -1,10 +1,11 @@
 import { DOCUMENT } from '@angular/common';
-import { HttpClient, HttpErrorResponse, HttpResponse } from '@angular/common/http';
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { isPlatformBrowser, isPlatformServer } from '@angular/common';
 import { computed, inject, Injectable, PLATFORM_ID, signal, TransferState, makeStateKey } from '@angular/core';
 import { firstValueFrom, map, Observable, of, tap } from 'rxjs';
 
 import { environment } from '../../../../environments/environment';
+import { BaseApiService } from '../base-api.service';
 import {
   AuthUser,
   LoginPayload,
@@ -26,8 +27,7 @@ const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
 @Injectable({
   providedIn: 'root'
 })
-export class AuthService {
-  private readonly http = inject(HttpClient);
+export class AuthService extends BaseApiService {
   private readonly document = inject(DOCUMENT);
   private readonly platformId = inject(PLATFORM_ID);
   private readonly cookieService = inject(CookieService);
@@ -51,7 +51,9 @@ export class AuthService {
       .post<LoginResponse>(
         `${environment.url}login`,
         { ...payload, tenant_codigo: tenant.codigo },
-        { withCredentials: true }
+        {
+          withCredentials: true
+        }
       )
       .pipe(
         tap((response) => this.applyAuthenticatedState(response.token, response.user)),
@@ -62,13 +64,18 @@ export class AuthService {
   register(payload: RegisterPayload): Observable<RegisterResponse> {
     const tenantCode = this.tenantService.getTenant()?.codigo;
 
-    return this.http.post<RegisterResponse>(`${environment.url}register`, {
-      ...payload,
-      ...(tenantCode ? { tenant_codigo: tenantCode } : {})
-    });
+    return this.http.post<RegisterResponse>(
+      `${environment.url}register`,
+      {
+        ...payload,
+        ...(tenantCode ? { tenant_codigo: tenantCode } : {})
+      },
+    );
   }
 
-  requestPasswordReset(email: string): Observable<HttpResponse<ResetPasswordAttemptResponse>> {
+  requestPasswordReset(
+    email: string
+  ): Observable<HttpResponse<ResetPasswordAttemptResponse>> {
     const tenantCode = this.tenantService.getTenant()?.codigo;
 
     return this.http.post<ResetPasswordAttemptResponse>(
@@ -77,7 +84,9 @@ export class AuthService {
         email,
         ...(tenantCode ? { tenant_codigo: tenantCode } : {})
       },
-      { observe: 'response' }
+      {
+        observe: 'response'
+      }
     );
   }
 
@@ -88,7 +97,9 @@ export class AuthService {
     return this.http.post<ValidateResetPasswordAttemptResponse>(
       `${environment.url}password/reset-attempts/validate`,
       { email, codigo },
-      { observe: 'response' }
+      {
+        observe: 'response'
+      }
     );
   }
 
@@ -122,7 +133,9 @@ export class AuthService {
       .post<LoginResponse>(
         `${environment.url}auth/google/exchange`,
         { oauth_code: oauthCode, tenant_codigo: tenant.codigo },
-        { withCredentials: true }
+        {
+          withCredentials: true
+        }
       )
       .pipe(
         tap((response) => this.applyAuthenticatedState(response.token, response.user)),
@@ -131,7 +144,9 @@ export class AuthService {
   }
 
   updateProfile(payload: UpdateProfilePayload): Observable<AuthUser> {
-    return this.http.put<AuthUser>(`${environment.url}me`, payload).pipe(tap((user) => this.userState.set(user)));
+    return this.http
+      .put<AuthUser>(`${environment.url}me`, payload)
+      .pipe(tap((user) => this.userState.set(user)));
   }
 
   logout(): Observable<void> {
@@ -140,7 +155,9 @@ export class AuthService {
       return of(void 0);
     }
 
-    return this.http.post<void>(`${environment.url}logout`, {}).pipe(tap(() => this.clearSession()));
+    return this.http
+      .post<void>(`${environment.url}logout`, {})
+      .pipe(tap(() => this.clearSession()));
   }
 
   async bootstrap(): Promise<void> {
@@ -179,7 +196,9 @@ export class AuthService {
   }
 
   loadCurrentUser(): Observable<AuthUser> {
-    return this.http.get<AuthUser>(`${environment.url}me`).pipe(tap((user) => this.userState.set(user)));
+    return this.http
+      .get<AuthUser>(`${environment.url}me`)
+      .pipe(tap((user) => this.userState.set(user)));
   }
 
   hydrateSession(): void {

src/app/core/services/base-api.service.spec.ts

@@ -0,0 +1,42 @@
+import '@angular/compiler';
+import { provideHttpClient } from '@angular/common/http';
+import { TestBed } from '@angular/core/testing';
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { BaseApiService } from './base-api.service';
+import { LOADING_MODE } from './global-loading/loading-mode';
+
+class TestApiService extends BaseApiService {
+  contextFor() {
+    return this.loadingContext();
+  }
+}
+
+describe('BaseApiService', () => {
+  afterEach(() => {
+    TestBed.resetTestingModule();
+  });
+
+  it('uses global loading by default', () => {
+    TestBed.configureTestingModule({ providers: [provideHttpClient()] });
+    const service = TestBed.runInInjectionContext(() => new TestApiService());
+
+    expect(service.contextFor().get(LOADING_MODE)).toBe('global');
+  });
+
+  it('creates an isolated custom-loading scope', () => {
+    TestBed.configureTestingModule({ providers: [provideHttpClient()] });
+    const service = TestBed.runInInjectionContext(() => new TestApiService());
+
+    expect(service.withCustomLoading().contextFor().get(LOADING_MODE)).toBe('custom');
+    expect(service.contextFor().get(LOADING_MODE)).toBe('global');
+  });
+
+  it('creates an isolated scope without a loading indicator', () => {
+    TestBed.configureTestingModule({ providers: [provideHttpClient()] });
+    const service = TestBed.runInInjectionContext(() => new TestApiService());
+
+    expect(service.withoutLoading().contextFor().get(LOADING_MODE)).toBe('none');
+    expect(service.contextFor().get(LOADING_MODE)).toBe('global');
+  });
+});

src/app/core/services/base-api.service.ts

@@ -0,0 +1,79 @@
+import { HttpClient, HttpContext } from '@angular/common/http';
+import { inject } from '@angular/core';
+
+import {
+  LOADING_MODE,
+  LoadingMode
+} from './global-loading/loading-mode';
+
+const REQUEST_LOADING_MODE = Symbol('request-loading-mode');
+
+class LoadingHttpClient {
+  readonly get: HttpClient['get'];
+  readonly post: HttpClient['post'];
+  readonly put: HttpClient['put'];
+  readonly patch: HttpClient['patch'];
+  readonly delete: HttpClient['delete'];
+
+  constructor(
+    http: HttpClient,
+    private readonly buildContext: (context?: HttpContext) => HttpContext
+  ) {
+    this.get = ((url: string, options?: object) =>
+      http.get(url, this.withLoadingContext(options))) as HttpClient['get'];
+    this.post = ((url: string, body: unknown, options?: object) =>
+      http.post(url, body, this.withLoadingContext(options))) as HttpClient['post'];
+    this.put = ((url: string, body: unknown, options?: object) =>
+      http.put(url, body, this.withLoadingContext(options))) as HttpClient['put'];
+    this.patch = ((url: string, body: unknown, options?: object) =>
+      http.patch(url, body, this.withLoadingContext(options))) as HttpClient['patch'];
+    this.delete = ((url: string, options?: object) =>
+      http.delete(url, this.withLoadingContext(options))) as HttpClient['delete'];
+  }
+
+  private withLoadingContext(options?: object): object {
+    const requestOptions = options as { context?: HttpContext } | undefined;
+
+    return {
+      ...requestOptions,
+      context: this.buildContext(requestOptions?.context)
+    };
+  }
+}
+
+export abstract class BaseApiService {
+  private readonly rawHttp = inject(HttpClient);
+  private readonly [REQUEST_LOADING_MODE]: LoadingMode = 'global';
+
+  protected get http(): LoadingHttpClient {
+    return new LoadingHttpClient(
+      this.rawHttp,
+      (context) => this.loadingContext(context)
+    );
+  }
+
+  withLoading(loadingMode: LoadingMode): this {
+    const scopedService = Object.create(this) as this;
+
+    Object.defineProperty(scopedService, REQUEST_LOADING_MODE, {
+      configurable: false,
+      enumerable: false,
+      value: loadingMode,
+      writable: false
+    });
+
+    return scopedService;
+  }
+
+  withCustomLoading(): this {
+    return this.withLoading('custom');
+  }
+
+  withoutLoading(): this {
+    return this.withLoading('none');
+  }
+
+  protected loadingContext(context: HttpContext = new HttpContext()): HttpContext {
+    return context.set(LOADING_MODE, this[REQUEST_LOADING_MODE]);
+  }
+}

src/app/core/services/cart/cart.service.spec.ts

@@ -6,6 +6,7 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { CartService } from './cart.service';
 import { TenantService } from '../tenant.service';
 import { Cart } from './cart.interface';
+import { LOADING_MODE } from '../global-loading/loading-mode';
 
 describe('CartService', () => {
   let service: CartService;
@@ -75,6 +76,14 @@ describe('CartService', () => {
     req.flush({ data: mockCart });
   });
 
+  it('propagates a custom loading mode to the request context', () => {
+    service.withCustomLoading().loadCart().subscribe();
+
+    const req = httpMock.expectOne('http://api.test/tenants/acme/cart');
+    expect(req.request.context.get(LOADING_MODE)).toBe('custom');
+    req.flush({ data: mockCart });
+  });
+
   it('should clear cart state locally', () => {
     service.clearCart();
 

src/app/core/services/cart/cart.service.ts

@@ -1,16 +1,15 @@
 import { inject, Injectable, signal } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
 import { catchError, map, Observable, tap } from 'rxjs';
 
 import { ApiResponse } from '../api-response.interface';
+import { BaseApiService } from '../base-api.service';
 import { TenantService } from '../tenant.service';
 import { Cart } from './cart.interface';
 
 @Injectable({
   providedIn: 'root',
 })
-export class CartService {
-  private readonly http = inject(HttpClient);
+export class CartService extends BaseApiService {
   private readonly tenantService = inject(TenantService);
 
   private readonly cartState = signal<Cart | null>(null);
@@ -53,7 +52,13 @@ export class CartService {
     return this.http
       .post<
         ApiResponse<Cart>
-      >(`${this.tenantApiUrl}/cart/items`, { catalog_item_id: catalogItemId, variant_id: variantId, cantidad }, { withCredentials: true })
+      >(
+        `${this.tenantApiUrl}/cart/items`,
+        { catalog_item_id: catalogItemId, variant_id: variantId, cantidad },
+        {
+          withCredentials: true,
+        },
+      )
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
@@ -66,12 +71,21 @@ export class CartService {
       );
   }
 
-  updateItemQuantity(cartItemId: number, cantidad: number): Observable<ApiResponse<Cart>> {
+  updateItemQuantity(
+    cartItemId: number,
+    cantidad: number,
+  ): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
       .patch<
         ApiResponse<Cart>
-      >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { cantidad }, { withCredentials: true })
+      >(
+        `${this.tenantApiUrl}/cart/items/${cartItemId}`,
+        { cantidad },
+        {
+          withCredentials: true,
+        },
+      )
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
@@ -89,7 +103,9 @@ export class CartService {
     return this.http
       .delete<
         ApiResponse<Cart>
-      >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { withCredentials: true })
+      >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, {
+        withCredentials: true,
+      })
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);

src/app/core/services/catalog/catalog.interface.ts

@@ -1,7 +1,10 @@
 import { ApiPaginatedResponse } from '../api-paginated-response.interface';
 
+export type CatalogItemType = 'product' | 'bundle';
+
 export interface Product {
   id: number;
+  type: CatalogItemType;
   category_id: number;
   brand_id: number | null;
   slug: string;
@@ -35,6 +38,7 @@ export type InventoryPolicy = 'tracked' | 'unlimited';
 
 export interface CatalogItemVariant {
   id: number;
+  event_date_id?: number | null;
   stock_tecnico: number | null;
   minimum_use_date?: string | null;
   maximum_use_date?: string | null;
@@ -43,12 +47,24 @@ export interface CatalogItemVariant {
   values: Record<string, string>;
 }
 
+export interface CatalogItemEventDate {
+  id: number;
+  variant_id: number;
+  date: string;
+  starts_at: string;
+  ends_at: string;
+  label: string;
+  stock_tecnico: number | null;
+}
+
 export interface SelectedCatalogItemVariant extends CatalogItemVariant {
   images: string[];
 }
 
 export interface CatalogItemDetail {
   id: number;
+  type: CatalogItemType;
+  purpose?: 'product' | 'entry';
   category_id: number | null;
   brand_id: number | null;
   slug: string;
@@ -63,6 +79,7 @@ export interface CatalogItemDetail {
   maximum_use_date: string | null;
   attributes: ProductAttribute[];
   variants: CatalogItemVariant[];
+  event_dates?: CatalogItemEventDate[];
   selected_variant?: SelectedCatalogItemVariant;
   stock_tecnico?: number | null;
   images?: string[];
@@ -79,6 +96,7 @@ export interface CatalogFeaturedItemVariant {
 
 export interface CatalogFeaturedItem {
   id: number;
+  type: CatalogItemType;
   nombre: string;
   descripcion?: string | null;
   precio: number | string;

src/app/core/services/catalog/catalog.service.ts

@@ -1,10 +1,11 @@
+import { HttpParams } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
 import { map, Observable } from 'rxjs';
 
 import { ApiPaginationQueryParams } from '../api-pagination-query-params.interface';
 import { ApiPaginatedResponse } from '../api-paginated-response.interface';
 import { ApiResponse } from '../api-response.interface';
+import { BaseApiService } from '../base-api.service';
 import { TenantService } from '../tenant.service';
 import {
   CatalogFeaturedGroup,
@@ -24,8 +25,7 @@ export interface CatalogSearchQueryParams extends ApiPaginationQueryParams {
 @Injectable({
   providedIn: 'root',
 })
-export class CatalogService {
-  private readonly http = inject(HttpClient);
+export class CatalogService extends BaseApiService {
   private readonly tenantService = inject(TenantService);
 
   private get tenantApiUrl(): string {
@@ -47,7 +47,9 @@ export class CatalogService {
   ): Observable<ApiPaginatedResponse<CatalogFeaturedItem[]>> {
     return this.http.get<ApiPaginatedResponse<CatalogFeaturedItem[]>>(
       `${this.tenantApiUrl}/catalog-items`,
-      { params: this.buildHttpParams(params) },
+      {
+        params: this.buildHttpParams(params),
+      },
     );
   }
 
@@ -66,18 +68,25 @@ export class CatalogService {
   ): Observable<CatalogFeaturedItems> {
     return this.http.get<CatalogFeaturedItems>(
       `${this.tenantApiUrl}/catalog/featured-groups/${featuredGroupId}/items`,
-      { params: this.buildHttpParams(params) },
+      {
+        params: this.buildHttpParams(params),
+      },
     );
   }
 
-  getCatalogItem(id: number, variantId?: number): Observable<CatalogItemDetail> {
+  getCatalogItem(
+    id: number,
+    variantId?: number,
+  ): Observable<CatalogItemDetail> {
     let params = new HttpParams();
     if (variantId) {
       params = params.set('variant_id', variantId);
     }
 
     return this.http
-      .get<ApiResponse<CatalogItemDetail>>(`${this.tenantApiUrl}/catalog-items/${id}`, { params })
+      .get<ApiResponse<CatalogItemDetail>>(`${this.tenantApiUrl}/catalog-items/${id}`, {
+        params,
+      })
       .pipe(map((response) => response.data));
   }
 

src/app/core/services/checkout.service.ts

@@ -1,8 +1,8 @@
-import { inject, Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
 
 import { environment } from '../../../environments/environment';
+import { BaseApiService } from './base-api.service';
 
 export interface UpdatePurchaseCustomerPayload {
   dni: string;
@@ -29,6 +29,7 @@ export interface PurchaseStatusResponse {
 
 export interface PurchaseSummaryResponse extends PurchaseStatusResponse {
   id: number;
+  event_id: number | null;
   created_at: string | null;
   total: string;
 }
@@ -58,9 +59,11 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
   id: number;
   cart_id: number | null;
   tenant_codigo: string;
+  event_id: number | null;
   user_id: number;
   created_at: string | null;
   payment_method: string | null;
+  expires_at: string | null;
   dni: string | null;
   transfer_payer_dni: string | null;
   telefono: string | null;
@@ -77,9 +80,7 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
 @Injectable({
   providedIn: 'root',
 })
-export class CheckoutService {
-  private readonly http = inject(HttpClient);
-
+export class CheckoutService extends BaseApiService {
   async startCheckout(
     tenantCode: string,
     payload: StartCheckoutPayload,
@@ -182,7 +183,10 @@ export class CheckoutService {
     return purchase;
   }
 
-  async completePurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
+  async completePurchase(
+    tenantCode: string,
+    purchaseId: number,
+  ): Promise<PurchaseStatusResponse> {
     const response = await firstValueFrom(
       this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
         `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`,
@@ -220,7 +224,10 @@ export class CheckoutService {
     return { status: purchase.status ?? null };
   }
 
-  async cancelPurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
+  async cancelPurchase(
+    tenantCode: string,
+    purchaseId: number,
+  ): Promise<PurchaseStatusResponse> {
     const response = await firstValueFrom(
       this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
         `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/cancel`,
@@ -244,7 +251,9 @@ export class CheckoutService {
     if (status) {
       url += `?status=${status}`;
     }
-    const response = await firstValueFrom(this.http.get<{ data: PurchaseSummaryResponse[] }>(url));
+    const response = await firstValueFrom(
+      this.http.get<{ data: PurchaseSummaryResponse[] }>(url),
+    );
     if (!response) {
       throw new Error('Error al obtener las compras.');
     }

src/app/core/services/global-loading/global-loading.interceptor.spec.ts

@@ -0,0 +1,80 @@
+import '@angular/compiler';
+import { HttpClient, HttpContext, provideHttpClient, withInterceptors } from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { globalLoadingInterceptor } from './global-loading.interceptor';
+import { GlobalLoadingService } from './global-loading.service';
+import { LOADING_MODE, LoadingMode } from './loading-mode';
+
+describe('globalLoadingInterceptor', () => {
+  let client: HttpClient;
+  let httpTesting: HttpTestingController;
+  let loadingService: GlobalLoadingService;
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    TestBed.configureTestingModule({
+      providers: [
+        provideHttpClient(withInterceptors([globalLoadingInterceptor])),
+        provideHttpClientTesting()
+      ]
+    });
+
+    client = TestBed.inject(HttpClient);
+    httpTesting = TestBed.inject(HttpTestingController);
+    loadingService = TestBed.inject(GlobalLoadingService);
+  });
+
+  afterEach(() => {
+    httpTesting.verify();
+    TestBed.resetTestingModule();
+    vi.useRealTimers();
+  });
+
+  it('tracks concurrent requests until the last one completes', () => {
+    client.get('/api/first').subscribe();
+    client.get('/api/second').subscribe();
+    vi.advanceTimersByTime(150);
+
+    expect(loadingService.isLoading()).toBe(true);
+
+    httpTesting.expectOne('/api/first').flush({});
+    expect(loadingService.isLoading()).toBe(true);
+
+    httpTesting.expectOne('/api/second').flush({});
+    expect(loadingService.isLoading()).toBe(false);
+  });
+
+  it('stops loading when a request fails', () => {
+    client.get('/api/failing').subscribe({ error: () => undefined });
+    vi.advanceTimersByTime(150);
+
+    expect(loadingService.isLoading()).toBe(true);
+
+    httpTesting.expectOne('/api/failing').flush(
+      { message: 'Error' },
+      { status: 500, statusText: 'Server Error' }
+    );
+
+    expect(loadingService.isLoading()).toBe(false);
+  });
+
+  it.each<LoadingMode>(['custom', 'none'])(
+    'does not show the global loader for %s requests',
+    (loadingMode) => {
+      const context = new HttpContext().set(LOADING_MODE, loadingMode);
+
+      client.get(`/api/${loadingMode}`, { context }).subscribe();
+      vi.advanceTimersByTime(150);
+
+      expect(loadingService.isLoading()).toBe(false);
+
+      httpTesting.expectOne(`/api/${loadingMode}`).flush({});
+    }
+  );
+});

src/app/core/services/global-loading/global-loading.interceptor.ts

@@ -0,0 +1,20 @@
+import { HttpEvent, HttpHandlerFn, HttpInterceptorFn, HttpRequest } from '@angular/common/http';
+import { inject } from '@angular/core';
+import { Observable, finalize } from 'rxjs';
+
+import { GlobalLoadingService } from './global-loading.service';
+import { LOADING_MODE } from './loading-mode';
+
+export const globalLoadingInterceptor: HttpInterceptorFn = (
+  request: HttpRequest<unknown>,
+  next: HttpHandlerFn
+): Observable<HttpEvent<unknown>> => {
+  if (request.context.get(LOADING_MODE) !== 'global') {
+    return next(request);
+  }
+
+  const loadingService = inject(GlobalLoadingService);
+  loadingService.start();
+
+  return next(request).pipe(finalize(() => loadingService.stop()));
+};

src/app/core/services/global-loading/global-loading.service.spec.ts

@@ -0,0 +1,65 @@
+import '@angular/compiler';
+import { TestBed } from '@angular/core/testing';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { GlobalLoadingService } from './global-loading.service';
+
+describe('GlobalLoadingService', () => {
+  let service: GlobalLoadingService;
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(GlobalLoadingService);
+  });
+
+  afterEach(() => {
+    TestBed.resetTestingModule();
+    vi.useRealTimers();
+  });
+
+  it('delays the loading state to avoid flashes on fast operations', () => {
+    service.start();
+
+    expect(service.isLoading()).toBe(false);
+
+    service.stop();
+    vi.advanceTimersByTime(150);
+
+    expect(service.isLoading()).toBe(false);
+  });
+
+  it('shows the loading state for an operation that exceeds the delay', () => {
+    service.start();
+    vi.advanceTimersByTime(150);
+
+    expect(service.isLoading()).toBe(true);
+
+    service.stop();
+
+    expect(service.isLoading()).toBe(false);
+  });
+
+  it('stays visible until all concurrent operations finish', () => {
+    service.start();
+    service.start();
+    vi.advanceTimersByTime(150);
+
+    service.stop();
+    expect(service.isLoading()).toBe(true);
+
+    service.stop();
+    expect(service.isLoading()).toBe(false);
+  });
+
+  it('ignores extra stop calls without corrupting the counter', () => {
+    service.stop();
+    service.start();
+    vi.advanceTimersByTime(150);
+
+    expect(service.isLoading()).toBe(true);
+
+    service.stop();
+    expect(service.isLoading()).toBe(false);
+  });
+});

src/app/core/services/global-loading/global-loading.service.ts

@@ -0,0 +1,58 @@
+import { isPlatformBrowser } from '@angular/common';
+import { Injectable, PLATFORM_ID, inject, signal } from '@angular/core';
+
+const SHOW_DELAY_MS = 150;
+
+@Injectable({ providedIn: 'root' })
+export class GlobalLoadingService {
+  private readonly isBrowser = isPlatformBrowser(inject(PLATFORM_ID));
+  private readonly loadingState = signal(false);
+  private pendingOperations = 0;
+  private showTimer: ReturnType<typeof setTimeout> | undefined;
+
+  readonly isLoading = this.loadingState.asReadonly();
+
+  start(): void {
+    if (!this.isBrowser) {
+      return;
+    }
+
+    this.pendingOperations += 1;
+
+    if (this.pendingOperations > 1 || this.loadingState()) {
+      return;
+    }
+
+    this.showTimer = setTimeout(() => {
+      this.showTimer = undefined;
+
+      if (this.pendingOperations > 0) {
+        this.loadingState.set(true);
+      }
+    }, SHOW_DELAY_MS);
+  }
+
+  stop(): void {
+    if (!this.isBrowser || this.pendingOperations === 0) {
+      return;
+    }
+
+    this.pendingOperations -= 1;
+
+    if (this.pendingOperations > 0) {
+      return;
+    }
+
+    this.cancelShowTimer();
+    this.loadingState.set(false);
+  }
+
+  private cancelShowTimer(): void {
+    if (this.showTimer === undefined) {
+      return;
+    }
+
+    clearTimeout(this.showTimer);
+    this.showTimer = undefined;
+  }
+}

src/app/core/services/global-loading/loading-mode.ts

@@ -0,0 +1,5 @@
+import { HttpContextToken } from '@angular/common/http';
+
+export type LoadingMode = 'global' | 'custom' | 'none';
+
+export const LOADING_MODE = new HttpContextToken<LoadingMode>(() => 'global');

src/app/core/services/tenant.interface.ts

@@ -9,18 +9,63 @@ export interface BankAccount {
   cvu: string;
 }
 
+export interface WebsiteType {
+  codigo: string;
+  nombre: string;
+  primary_color: string | null;
+  secondary_color: string | null;
+  danger_color: string | null;
+  success_color: string | null;
+  site_logo: string | null;
+}
+
 export interface HeroConfig {
-  background_image?: string | null;
+  background_image_id?: string | null;
   title_html?: string | null;
   description_html?: string | null;
   button_text?: string | null;
   button_href?: string | null;
 }
 
+export interface AdditionalInfoConfig {
+  description?: string | null;
+}
+
+export interface EventDate {
+  id?: number;
+  date: string;
+  start_time: string;
+  end_time: string;
+}
+
 export interface EventConfig {
+  id?: number;
   title?: string | null;
   location?: string | null;
-  dates?: string[] | null;
+  dates_text?: string | null;
+  dates?: EventDate[] | null;
+  contact?: SocialMedia[];
+}
+
+export interface ActiveEventDate {
+  id: number;
+  date: string;
+  time_start: string;
+  time_end: string;
+}
+
+export interface ActiveEvent {
+  id: number;
+  name: string;
+  address: string;
+  dates: ActiveEventDate[];
+}
+
+export interface WebsiteExtras {
+  carousel?: string[];
+  heroConfig?: HeroConfig | null;
+  additionalInfoConfig?: AdditionalInfoConfig | null;
+  [extraName: string]: unknown;
 }
 
 export interface Menu {
@@ -60,14 +105,16 @@ export interface Tenant {
   footer_bg_color: string;
   header_logo: string;
   footer_logo: string;
+  website_type_code?: string | null;
+  website_type?: WebsiteType | null;
+  extras?: WebsiteExtras;
+  active_event_id?: number | null;
+  active_event?: ActiveEvent | null;
   selected_bank_account_id?: number | null;
   selected_bank_account?: BankAccount | null;
-  hero_config?: HeroConfig | null;
-  event_config?: EventConfig | null;
   search_product_layout?: 'row' | 'column_with_image' | 'column_with_cart';
   search_group_layout?: 'paginated' | 'simple' | 'simple_vertical' | 'carousel';
   search_items_per_page?: number;
-  main_carousel_images?: string[];
   social_media?: SocialMedia[];
   menues?: Menu[];
   categories: Category[];

src/app/core/services/tenant.service.ts

@@ -1,5 +1,5 @@
 import { isPlatformBrowser, isPlatformServer } from '@angular/common';
-import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { HttpErrorResponse } from '@angular/common/http';
 import {
   inject,
   Injectable,
@@ -13,6 +13,7 @@ import { IS_DISCOVERING_ROUTES } from '@angular/ssr';
 import { firstValueFrom } from 'rxjs';
 
 import { environment } from '../../../environments/environment';
+import { BaseApiService } from './base-api.service';
 import { Tenant, TenantBootstrapResponse } from './tenant.interface';
 import {
   TENANT_SSR_STATE_KEY,
@@ -23,8 +24,7 @@ import {
 @Injectable({
   providedIn: 'root'
 })
-export class TenantService {
-  private readonly http = inject(HttpClient);
+export class TenantService extends BaseApiService {
   private readonly platformId = inject(PLATFORM_ID);
   private readonly request = inject(REQUEST, { optional: true });
   private readonly responseInit = inject(RESPONSE_INIT, { optional: true });
@@ -73,7 +73,9 @@ export class TenantService {
 
     try {
       const response = await firstValueFrom(
-        this.http.get<TenantBootstrapResponse>(`${environment.url}tenants/bootstrap/${domain}`)
+        this.http.get<TenantBootstrapResponse>(
+          `${environment.url}tenants/bootstrap/${domain}`
+        )
       );
 
       if (!response?.data) {

src/app/features/store/components/menu-content-section/menu-content-section.component.html

@@ -0,0 +1,15 @@
+<section class="menu-content-section" [attr.aria-labelledby]="titleId()">
+  <header class="menu-content-section__header">
+    <div class="menu-content-section__prefix">
+      <ng-content select="[menuContentPrefix]" />
+    </div>
+
+    <h2 class="menu-content-section__title" [id]="titleId()">
+      {{ title() | uppercase }}
+    </h2>
+  </header>
+
+  <div class="menu-content-section__body">
+    <ng-content />
+  </div>
+</section>

src/app/features/store/components/menu-content-section/menu-content-section.component.scss

@@ -0,0 +1,53 @@
+:host {
+  display: block;
+  width: 100%;
+  min-width: 0;
+}
+
+.menu-content-section {
+  width: 100%;
+}
+
+.menu-content-section__header {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  margin-bottom: 1.25rem;
+}
+
+.menu-content-section__prefix:empty {
+  display: none;
+}
+
+.menu-content-section__title {
+  margin: 0;
+  color: #888888;
+  font-size: 1rem;
+  font-weight: 600;
+  line-height: 1.3;
+}
+
+.menu-content-section__body {
+  min-width: 0;
+}
+
+@media (max-width: 767.98px) {
+  .menu-content-section {
+    margin-inline: auto;
+  }
+
+  .menu-content-section__header {
+    position: relative;
+    justify-content: center;
+  }
+
+  .menu-content-section__prefix:not(:empty) {
+    position: absolute;
+    left: 0;
+  }
+
+  .menu-content-section__title {
+    width: 100%;
+    text-align: center;
+  }
+}

src/app/features/store/components/menu-content-section/menu-content-section.component.spec.ts

@@ -0,0 +1,58 @@
+import { Component, signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { describe, expect, it } from 'vitest';
+
+import { Tenant } from '../../../../core/services/tenant.interface';
+import { TenantService } from '../../../../core/services/tenant.service';
+import { MenuContentSectionComponent } from './menu-content-section.component';
+
+@Component({
+  imports: [MenuContentSectionComponent],
+  template: `
+    <app-menu-content-section menuCode="help.contact" titleId="contact-title">
+      <a menuContentPrefix href="/ayuda">Volver</a>
+      <p>Contenido proyectado</p>
+    </app-menu-content-section>
+  `,
+})
+class TestHostComponent {}
+
+describe('MenuContentSectionComponent', () => {
+  it('renders an accessible title and projects its content', async () => {
+    const tenant = signal({
+      menues: [
+        {
+          id: 1,
+          code: 'help.contact',
+          label: 'Contacto del comercio',
+          parent_menu_code: 'help',
+          content_type: 'static',
+          route: '/ayuda/contacto',
+          submenues: [],
+        },
+      ],
+    } as unknown as Tenant);
+
+    await TestBed.configureTestingModule({
+      imports: [TestHostComponent],
+      providers: [{ provide: TenantService, useValue: { tenant: tenant.asReadonly() } }],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(TestHostComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const section = element.querySelector('section');
+
+    expect(section?.getAttribute('aria-labelledby')).toBe('contact-title');
+    expect(element.querySelector('#contact-title')?.textContent?.trim()).toBe(
+      'CONTACTO DEL COMERCIO',
+    );
+    expect(element.querySelector('.menu-content-section__prefix a')?.textContent).toContain(
+      'Volver',
+    );
+    expect(element.querySelector('.menu-content-section__body')?.textContent).toContain(
+      'Contenido proyectado',
+    );
+  });
+});

src/app/features/store/components/menu-content-section/menu-content-section.component.ts

@@ -0,0 +1,22 @@
+import { UpperCasePipe } from '@angular/common';
+import { Component, computed, inject, input } from '@angular/core';
+
+import { findMenu } from '../../../../core/services/menu.utils';
+import { TenantService } from '../../../../core/services/tenant.service';
+
+@Component({
+  selector: 'app-menu-content-section',
+  imports: [UpperCasePipe],
+  templateUrl: './menu-content-section.component.html',
+  styleUrl: './menu-content-section.component.scss',
+})
+export class MenuContentSectionComponent {
+  private readonly tenantService = inject(TenantService);
+
+  readonly menuCode = input.required<string>();
+  readonly titleId = input.required<string>();
+
+  protected readonly title = computed(
+    () => findMenu(this.tenantService.tenant()?.menues ?? [], this.menuCode())?.label ?? '',
+  );
+}

src/app/features/store/components/menu-page-layout/menu-page-layout.component.html

@@ -0,0 +1,22 @@
+<div class="menu-page-layout">
+  <aside class="menu-page-layout__sidebar">
+    <h1 class="menu-page-layout__title">{{ menu()?.label }}</h1>
+    <div class="menu-page-layout__divider"></div>
+
+    <nav class="menu-page-layout__nav" [attr.aria-label]="navigationLabel">
+      @for (submenu of submenues(); track submenu.code) {
+        <a
+          class="menu-page-layout__link"
+          [routerLink]="submenu.route"
+          routerLinkActive="menu-page-layout__link--active"
+        >
+          {{ submenu.label }}
+        </a>
+      }
+    </nav>
+  </aside>
+
+  <main class="menu-page-layout__content">
+    <router-outlet />
+  </main>
+</div>

src/app/features/store/components/menu-page-layout/menu-page-layout.component.scss

@@ -0,0 +1,88 @@
+:host {
+  display: block;
+  width: 100%;
+}
+
+.menu-page-layout {
+  display: grid;
+  grid-template-columns: minmax(190px, 250px) minmax(0, 1fr);
+  gap: clamp(3rem, 8vw, 6.25rem);
+  width: 100%;
+
+  &__sidebar,
+  &__content {
+    min-width: 0;
+  }
+
+  &__sidebar {
+    display: flex;
+    flex-direction: column;
+  }
+
+  &__title {
+    margin: 0 0 0.75rem;
+    color: #1a1a1a;
+    font-size: 1rem;
+    font-weight: 700;
+    line-height: 1.25;
+    text-transform: uppercase;
+  }
+
+  &__divider {
+    height: 1px;
+    margin-bottom: 1.25rem;
+    background: #dedede;
+  }
+
+  &__nav {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+  }
+
+  &__link {
+    color: #888888;
+    font-size: 0.875rem;
+    font-weight: 500;
+    line-height: 1.35;
+    text-decoration: none;
+    transition: color 150ms ease;
+
+    &:hover,
+    &:focus-visible {
+      color: #5a5a5a;
+    }
+
+    &:focus-visible {
+      border-radius: 2px;
+      outline: 2px solid var(--color-primary);
+      outline-offset: 3px;
+    }
+
+    &--active {
+      color: var(--color-primary);
+      font-weight: 600;
+    }
+  }
+}
+
+@media (max-width: 767.98px) {
+  .menu-page-layout {
+    grid-template-columns: 1fr;
+    gap: 2rem;
+
+    &__title {
+      text-align: center;
+    }
+
+    &__nav {
+      flex-flow: row wrap;
+      justify-content: center;
+      gap: 0.75rem 1.25rem;
+    }
+
+    &__content {
+      width: 100%;
+    }
+  }
+}

src/app/features/store/components/menu-page-layout/menu-page-layout.component.spec.ts

@@ -0,0 +1,136 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { ActivatedRoute, provideRouter } from '@angular/router';
+import { describe, expect, it } from 'vitest';
+
+import { Tenant } from '../../../../core/services/tenant.interface';
+import { TenantService } from '../../../../core/services/tenant.service';
+import { MenuPageLayoutComponent } from './menu-page-layout.component';
+
+function createTenant(): Tenant {
+  return {
+    id: 1,
+    codigo: 'test',
+    nombre: 'Test',
+    dominio: 'localhost',
+    primary_color: '#000000',
+    secondary_color: '#000000',
+    danger_color: '#000000',
+    success_color: '#000000',
+    header_bg_color: '#ffffff',
+    footer_bg_color: '#ffffff',
+    header_logo: '',
+    footer_logo: '',
+    categories: [],
+    menues: [
+      {
+        id: 1,
+        code: 'account',
+        label: 'Mi cuenta',
+        parent_menu_code: null,
+        content_type: 'dynamic',
+        route: '/mi-cuenta',
+        submenues: [
+          {
+            id: 2,
+            code: 'account.profile',
+            label: 'Datos personales',
+            parent_menu_code: 'account',
+            content_type: 'dynamic',
+            route: '/mi-cuenta/datos-personales',
+            submenues: [],
+          },
+          {
+            id: 3,
+            code: 'account.purchases',
+            label: 'Mis compras',
+            parent_menu_code: 'account',
+            content_type: 'dynamic',
+            route: '/mi-cuenta/compras',
+            submenues: [],
+          },
+        ],
+      },
+      {
+        id: 4,
+        code: 'help',
+        label: 'Centro de ayuda',
+        parent_menu_code: null,
+        content_type: 'dynamic',
+        route: '/ayuda',
+        submenues: [
+          {
+            id: 5,
+            code: 'help.faq',
+            label: 'Consultas habituales',
+            parent_menu_code: 'help',
+            content_type: 'dynamic',
+            route: '/ayuda/preguntas-frecuentes',
+            submenues: [],
+          },
+        ],
+      },
+    ],
+  };
+}
+
+async function renderLayout(menuCode: string, navigationLabel: string): Promise<HTMLElement> {
+  const tenant = signal(createTenant());
+
+  await TestBed.configureTestingModule({
+    imports: [MenuPageLayoutComponent],
+    providers: [
+      provideRouter([]),
+      {
+        provide: ActivatedRoute,
+        useValue: {
+          snapshot: {
+            data: { menuCode, navigationLabel },
+          },
+        },
+      },
+      {
+        provide: TenantService,
+        useValue: { tenant: tenant.asReadonly() },
+      },
+    ],
+  }).compileComponents();
+
+  const fixture = TestBed.createComponent(MenuPageLayoutComponent);
+  fixture.detectChanges();
+
+  return fixture.nativeElement as HTMLElement;
+}
+
+describe('MenuPageLayoutComponent', () => {
+  it('renders the configured account menu and its navigation label', async () => {
+    const element = await renderLayout('account', 'Secciones de mi cuenta');
+    const links = Array.from(
+      element.querySelectorAll<HTMLAnchorElement>('.menu-page-layout__link'),
+    );
+
+    expect(element.querySelector('.menu-page-layout__title')?.textContent?.trim()).toBe(
+      'Mi cuenta',
+    );
+    expect(element.querySelector('nav')?.getAttribute('aria-label')).toBe('Secciones de mi cuenta');
+    expect(links.map((link) => link.textContent?.trim())).toEqual([
+      'Datos personales',
+      'Mis compras',
+    ]);
+    expect(links.map((link) => link.getAttribute('href'))).toEqual([
+      '/mi-cuenta/datos-personales',
+      '/mi-cuenta/compras',
+    ]);
+  });
+
+  it('uses the same component for the help menu', async () => {
+    const element = await renderLayout('help', 'Secciones de ayuda');
+
+    expect(element.querySelector('.menu-page-layout__title')?.textContent?.trim()).toBe(
+      'Centro de ayuda',
+    );
+    expect(element.querySelector('.menu-page-layout__link')?.textContent?.trim()).toBe(
+      'Consultas habituales',
+    );
+  });
+});

src/app/features/store/components/menu-page-layout/menu-page-layout.component.ts

@@ -0,0 +1,26 @@
+import { Component, computed, inject } from '@angular/core';
+import { ActivatedRoute, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
+
+import { findMenu } from '../../../../core/services/menu.utils';
+import { TenantService } from '../../../../core/services/tenant.service';
+
+@Component({
+  selector: 'app-menu-page-layout',
+  imports: [RouterLink, RouterLinkActive, RouterOutlet],
+  templateUrl: './menu-page-layout.component.html',
+  styleUrl: './menu-page-layout.component.scss',
+})
+export class MenuPageLayoutComponent {
+  private readonly route = inject(ActivatedRoute);
+  private readonly tenantService = inject(TenantService);
+
+  protected readonly navigationLabel =
+    (this.route.snapshot.data['navigationLabel'] as string | undefined) ?? 'Secciones';
+
+  private readonly menuCode = this.route.snapshot.data['menuCode'] as string | undefined;
+
+  protected readonly menu = computed(() =>
+    findMenu(this.tenantService.tenant()?.menues ?? [], this.menuCode ?? ''),
+  );
+  protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
+}

src/app/features/store/pages/account-page/components/account-sidebar/account-sidebar.html

@@ -1,11 +0,0 @@
-<div class="sidebar-container">
-  <h2 class="sidebar-title">{{ menu()?.label }}</h2>
-  <div class="divider"></div>
-  <nav class="sidebar-nav" aria-label="Secciones de mi cuenta">
-    @for (menu of submenues(); track menu.code) {
-      <a [routerLink]="menu.route" routerLinkActive="active" class="nav-link">
-        {{ menu.label }}
-      </a>
-    }
-  </nav>
-</div>

src/app/features/store/pages/account-page/components/account-sidebar/account-sidebar.scss

@@ -1,35 +0,0 @@
-.sidebar-container {
-  display: flex;
-  flex-direction: column;
-}
-.sidebar-title {
-  font-size: 16px;
-  font-weight: bold;
-  color: #1a1a1a;
-  margin-bottom: 12px;
-  text-transform: uppercase;
-}
-.divider {
-  height: 1px;
-  background-color: #e0e0e0;
-  margin-bottom: 20px;
-}
-.sidebar-nav {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-.nav-link {
-  text-decoration: none;
-  color: #888;
-  font-size: 14px;
-  font-weight: 500;
-  transition: color 0.2s;
-}
-.nav-link:hover {
-  color: #5a5a5a;
-}
-.nav-link.active {
-  color: var(--color-primary); /* Blue color matching the image */
-  font-weight: 600;
-}

src/app/features/store/pages/account-page/components/account-sidebar/account-sidebar.spec.ts

@@ -1,85 +0,0 @@
-import { signal } from '@angular/core';
-import { TestBed } from '@angular/core/testing';
-import { provideRouter } from '@angular/router';
-import { describe, expect, it } from 'vitest';
-
-import { Tenant } from '../../../../../../core/services/tenant.interface';
-import { TenantService } from '../../../../../../core/services/tenant.service';
-import { AccountSidebar } from './account-sidebar';
-
-describe('AccountSidebar', () => {
-  it('renders only the account submenus configured for the tenant', async () => {
-    const tenant = signal<Tenant>({
-      id: 1,
-      codigo: 'test',
-      nombre: 'Test',
-      dominio: 'localhost',
-      primary_color: '#000000',
-      secondary_color: '#000000',
-      danger_color: '#000000',
-      success_color: '#000000',
-      header_bg_color: '#ffffff',
-      footer_bg_color: '#ffffff',
-      header_logo: '',
-      footer_logo: '',
-      categories: [],
-      menues: [
-        {
-          id: 1,
-          code: 'account',
-          label: 'Mi cuenta',
-          parent_menu_code: null,
-          content_type: 'dynamic',
-          route: '/mi-cuenta',
-          submenues: [
-            {
-              id: 2,
-              code: 'account.profile',
-              label: 'Datos personales',
-              parent_menu_code: 'account',
-              content_type: 'dynamic',
-              route: '/mi-cuenta/datos-personales',
-              submenues: [],
-            },
-            {
-              id: 3,
-              code: 'account.purchases',
-              label: 'Mis compras',
-              parent_menu_code: 'account',
-              content_type: 'dynamic',
-              route: '/mi-cuenta/compras',
-              submenues: [],
-            },
-          ],
-        },
-      ],
-    });
-
-    await TestBed.configureTestingModule({
-      imports: [AccountSidebar],
-      providers: [
-        provideRouter([]),
-        {
-          provide: TenantService,
-          useValue: { tenant: tenant.asReadonly() },
-        },
-      ],
-    }).compileComponents();
-
-    const fixture = TestBed.createComponent(AccountSidebar);
-    fixture.detectChanges();
-
-    const element = fixture.nativeElement as HTMLElement;
-    const links = Array.from(element.querySelectorAll<HTMLAnchorElement>('.nav-link'));
-
-    expect(element.querySelector('.sidebar-title')?.textContent?.trim()).toBe('Mi cuenta');
-    expect(links.map((link) => link.textContent?.trim())).toEqual([
-      'Datos personales',
-      'Mis compras',
-    ]);
-    expect(links.map((link) => link.getAttribute('href'))).toEqual([
-      '/mi-cuenta/datos-personales',
-      '/mi-cuenta/compras',
-    ]);
-  });
-});

src/app/features/store/pages/account-page/components/account-sidebar/account-sidebar.ts

@@ -1,21 +0,0 @@
-import { Component, computed, inject } from '@angular/core';
-import { RouterLink, RouterLinkActive } from '@angular/router';
-
-import { findMenu } from '../../../../../../core/services/menu.utils';
-import { TenantService } from '../../../../../../core/services/tenant.service';
-
-@Component({
-  selector: 'app-account-sidebar',
-  standalone: true,
-  imports: [RouterLink, RouterLinkActive],
-  templateUrl: './account-sidebar.html',
-  styleUrl: './account-sidebar.scss',
-})
-export class AccountSidebar {
-  private readonly tenantService = inject(TenantService);
-
-  protected readonly menu = computed(() =>
-    findMenu(this.tenantService.tenant()?.menues ?? [], 'account'),
-  );
-  protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
-}

src/app/features/store/pages/account-page/components/profile-form/profile-form.scss

@@ -13,3 +13,13 @@
   flex: 1;
   display: block;
 }
+
+@media (max-width: 767.98px) {
+  .form-actions {
+    flex-direction: column;
+  }
+
+  .action-btn {
+    width: 100%;
+  }
+}

src/app/features/store/pages/account-page/components/purchase-list/purchase-list.ts

@@ -29,7 +29,9 @@ export class PurchaseList implements OnInit {
     try {
       const tenantCode = this.tenantService.tenant()?.codigo || '';
       
-      const response = await this.checkoutService.getPurchases(tenantCode, 'paid');
+      const response = await this.checkoutService
+        .withCustomLoading()
+        .getPurchases(tenantCode, 'paid');
       const mappedPurchases = response.data.map((purchase: PurchaseSummaryResponse) => ({
         id: purchase.id,
         date: this.formatDate(purchase.created_at),

src/app/features/store/pages/account-page/pages/profile-page/profile-page.html

@@ -1,4 +1,7 @@
-    <div class="page-container">
-      <h2 class="page-title">DATOS PERSONALES</h2>
-      <app-profile-form></app-profile-form>
-    </div>
+<app-menu-content-section
+  class="account-page"
+  menuCode="account.profile"
+  titleId="profile-page-title"
+>
+  <app-profile-form />
+</app-menu-content-section>

src/app/features/store/pages/account-page/pages/profile-page/profile-page.scss

@@ -1,13 +1,10 @@
-.page-container {
-  display: flex;
-  flex-direction: column;
+:host {
+  display: block;
+  width: 100%;
+}
+
+.account-page {
+  display: block;
   width: 100%;
   max-width: 600px;
 }
-
-.page-title {
-  font-size: 15px;
-  font-weight: bold;
-  color: #A0A0A0;
-  margin-bottom: 24px;
-}

src/app/features/store/pages/account-page/pages/profile-page/profile-page.ts

@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import { ProfileForm } from '../../components/profile-form/profile-form';
 
 @Component({
   selector: 'app-profile-page',
   standalone: true,
-  imports: [ProfileForm],
+  imports: [ProfileForm, MenuContentSectionComponent],
   templateUrl: './profile-page.html',
   styleUrl: './profile-page.scss',
 })

src/app/features/store/pages/account-page/pages/purchase-detail-page/purchase-detail-page.html

@@ -1,26 +1,35 @@
-<div class="page-container">
-  <div class="d-flex align-items-center mb-4">
-    <a routerLink="../" class="text-decoration-none " >
-      <i class="bi bi-arrow-left fs-5"></i>
-    </a>
-    <h2 class="page-title m-0">MIS COMPRAS</h2>
-  </div>
+<app-menu-content-section
+  class="account-page"
+  menuCode="account.purchases"
+  titleId="purchase-detail-page-title"
+>
+  <a
+    menuContentPrefix
+    routerLink="../"
+    class="purchase-back-link text-decoration-none"
+    aria-label="Volver a mis compras"
+  >
+    <i class="bi bi-arrow-left fs-5" aria-hidden="true"></i>
+  </a>
 
   @if (isLoading()) {
     <p class="purchase-loading">Cargando detalle de compra...</p>
   } @else if (purchase(); as purchase) {
-    <div class="d-flex justify-content-between align-items-center mb-4 pb-3" style="border-bottom: 1px solid #dddddd;">
+    <div
+      class="d-flex justify-content-between align-items-center mb-4 pb-3"
+      style="border-bottom: 1px solid #dddddd"
+    >
       <div class="purchase-info">
         <span class="purchase-id">Compra {{ purchase.id }}.</span>
         <span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
       </div>
-      <div class="purchase-total ">
+      <div class="purchase-total">
         <span class="purchase-total-label">Total:</span>
         <span class="purchase-total-value">${{ purchase.total }}</span>
       </div>
     </div>
 
-    <p style="font-size: 12px; color: #666666; margin:0;">Productos:</p>
+    <p style="font-size: 12px; color: #666666; margin: 0">Productos:</p>
 
     <div class="d-flex flex-column">
       @for (item of purchase.items; track item.id) {
@@ -30,4 +39,4 @@
       }
     </div>
   }
-</div>
+</app-menu-content-section>

src/app/features/store/pages/account-page/pages/purchase-detail-page/purchase-detail-page.scss

@@ -1,14 +1,21 @@
-.page-container {
-  display: flex;
-  flex-direction: column;
+:host {
+  display: block;
+  width: 100%;
+}
+
+.account-page {
+  display: block;
   width: 100%;
   max-width: 600px;
 }
 
-.page-title {
-  font-size: 15px;
-  font-weight: bold;
-  color: #A0A0A0;
+.purchase-back-link {
+  color: #888888;
+
+  &:hover,
+  &:focus-visible {
+    color: var(--color-primary);
+  }
 }
 
 .purchase-info {

src/app/features/store/pages/account-page/pages/purchase-detail-page/purchase-detail-page.ts

@@ -8,6 +8,7 @@ import {
 } from '../../../../../../core/services/checkout.service';
 import { TenantService } from '../../../../../../core/services/tenant.service';
 import { ToastService } from '../../../../../../core/services/toast.service';
+import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import { PurchaseItem, PurchaseItemViewModel } from '../../components/purchase-item/purchase-item';
 
 type PurchaseDetailViewModel = {
@@ -20,7 +21,7 @@ type PurchaseDetailViewModel = {
 @Component({
   selector: 'app-purchase-detail-page',
   standalone: true,
-  imports: [CommonModule, RouterLink, PurchaseItem],
+  imports: [CommonModule, RouterLink, PurchaseItem, MenuContentSectionComponent],
   templateUrl: './purchase-detail-page.html',
   styleUrl: './purchase-detail-page.scss',
 })
@@ -44,7 +45,9 @@ export class PurchaseDetailPage implements OnInit {
     }
 
     try {
-      const response = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
+      const response = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(tenant.codigo, purchaseId);
 
       this.purchase.set({
         id: response.id,

src/app/features/store/pages/account-page/pages/purchases-page/purchases-page.html

@@ -1,4 +1,7 @@
-    <div class="page-container">
-      <h2 class="page-title">MIS COMPRAS</h2>
-      <app-purchase-list></app-purchase-list>
-    </div>
+<app-menu-content-section
+  class="account-page"
+  menuCode="account.purchases"
+  titleId="purchases-page-title"
+>
+  <app-purchase-list />
+</app-menu-content-section>

src/app/features/store/pages/account-page/pages/purchases-page/purchases-page.scss

@@ -1,12 +1,10 @@
-.page-container {
-  display: flex;
-  flex-direction: column;
+:host {
+  display: block;
+  width: 100%;
+}
+
+.account-page {
+  display: block;
   width: 100%;
   max-width: 600px;
 }
-
-.page-title {
-  font-size: 15px;
-  font-weight: bold;
-  color: #A0A0A0;
-}

src/app/features/store/pages/account-page/pages/purchases-page/purchases-page.ts

@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import { PurchaseList } from '../../components/purchase-list/purchase-list';
 
 @Component({
   selector: 'app-purchases-page',
   standalone: true,
-  imports: [PurchaseList],
+  imports: [PurchaseList, MenuContentSectionComponent],
   templateUrl: './purchases-page.html',
   styleUrl: './purchases-page.scss',
 })

src/app/features/store/pages/account-page/pages/tickets-page/ticket.service.ts

@@ -1,7 +1,7 @@
-import { HttpClient } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
 
+import { BaseApiService } from '../../../../../../core/services/base-api.service';
 import { TenantService } from '../../../../../../core/services/tenant.service';
 
 export interface TicketResponse {
@@ -21,13 +21,14 @@ export interface TicketResponse {
 }
 
 @Injectable()
-export class TicketService {
-  private readonly http = inject(HttpClient);
+export class TicketService extends BaseApiService {
   private readonly tenantService = inject(TenantService);
 
   getTickets(): Promise<TicketResponse[]> {
     return firstValueFrom(
-      this.http.get<{ data: TicketResponse[] }>(`${this.tenantService.getTenantApiUrl()}/tickets`),
+      this.http.get<{ data: TicketResponse[] }>(
+        `${this.tenantService.getTenantApiUrl()}/tickets`,
+      ),
     ).then((response) => response.data ?? []);
   }
 
@@ -36,7 +37,9 @@ export class TicketService {
       this.http.post(
         `${this.tenantService.getTenantApiUrl()}/tickets/pdf`,
         { ticket_ids: ticketIds },
-        { responseType: 'blob' },
+        {
+          responseType: 'blob',
+        },
       ),
     );
   }

src/app/features/store/pages/account-page/pages/tickets-page/tickets-page.html

@@ -1,6 +1,8 @@
-<section class="tickets-page">
-  <h1 class="tickets-page__title">MIS TICKETS</h1>
-
+<app-menu-content-section
+  class="tickets-page"
+  menuCode="account.tickets"
+  titleId="tickets-page-title"
+>
   <div class="tickets-list" [attr.aria-busy]="isLoading() || isGeneratingPdf()">
     @if (isGeneratingPdf()) {
       <div class="tickets-list__generating" role="status" aria-live="polite">
@@ -106,4 +108,4 @@
       <p class="tickets-list__empty">Aún no tenés tickets disponibles.</p>
     }
   </div>
-</section>
+</app-menu-content-section>

src/app/features/store/pages/account-page/pages/tickets-page/tickets-page.scss

@@ -1,15 +1,9 @@
 .tickets-page {
+  display: block;
   width: 100%;
   max-width: 720px;
 }
 
-.tickets-page__title {
-  margin: 0 0 20px;
-  color: #a0a0a0;
-  font-size: 15px;
-  font-weight: 700;
-}
-
 .tickets-list {
   position: relative;
 }
@@ -206,10 +200,6 @@
 }
 
 @media (max-width: 767.98px) {
-  .tickets-page__title {
-    margin-top: 24px;
-  }
-
   .tickets-list__skeleton {
     grid-template-columns: auto minmax(0, 1fr) auto;
     gap: 10px;

src/app/features/store/pages/account-page/pages/tickets-page/tickets-page.spec.ts

@@ -1,13 +1,21 @@
+import { signal } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { TestBed } from '@angular/core/testing';
-import { describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { TenantService } from '../../../../../../core/services/tenant.service';
 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';
 
+function withCustomLoading<T extends object>(service: T): T & { withCustomLoading: () => T } {
+  return Object.assign(service, {
+    withCustomLoading: () => service,
+  });
+}
+
 const ticket = (overrides: Partial<TicketResponse>): TicketResponse => ({
   id: 1,
   tenant_code: 'tenant',
@@ -26,6 +34,31 @@ const ticket = (overrides: Partial<TicketResponse>): TicketResponse => ({
 });
 
 describe('TicketsPage', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        {
+          provide: TenantService,
+          useValue: {
+            tenant: signal({
+              menues: [
+                {
+                  id: 4,
+                  code: 'account.tickets',
+                  label: 'Entradas disponibles',
+                  parent_menu_code: 'account',
+                  content_type: 'dynamic',
+                  route: '/mi-cuenta/tickets',
+                  submenues: [],
+                },
+              ],
+            }).asReadonly(),
+          },
+        },
+      ],
+    });
+  });
+
   it('shares the generated PDF as a file without text that Windows could prioritize', async () => {
     const share = vi.fn().mockResolvedValue(undefined);
     const canShare = vi.fn().mockReturnValue(true);
@@ -40,10 +73,10 @@ describe('TicketsPage', () => {
           providers: [
             {
               provide: TicketService,
-              useValue: {
+              useValue: withCustomLoading({
                 getTickets: () => Promise.resolve([ticket({})]),
                 downloadPdf: () => Promise.resolve(new Blob(['pdf-content'])),
-              },
+              }),
             },
           ],
         },
@@ -84,11 +117,11 @@ describe('TicketsPage', () => {
     const createObjectUrl = vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:ticket');
     const revokeObjectUrl = vi.spyOn(URL, 'revokeObjectURL').mockImplementation(() => undefined);
     let downloadedFilename = '';
-    const linkClick = vi
-      .spyOn(HTMLAnchorElement.prototype, 'click')
-      .mockImplementation(function (this: HTMLAnchorElement) {
-        downloadedFilename = this.download;
-      });
+    const linkClick = vi.spyOn(HTMLAnchorElement.prototype, 'click').mockImplementation(function (
+      this: HTMLAnchorElement,
+    ) {
+      downloadedFilename = this.download;
+    });
 
     await TestBed.configureTestingModule({
       imports: [TicketsPage],
@@ -99,10 +132,10 @@ describe('TicketsPage', () => {
           providers: [
             {
               provide: TicketService,
-              useValue: {
+              useValue: withCustomLoading({
                 getTickets: () => Promise.resolve([ticket({})]),
                 downloadPdf,
-              },
+              }),
             },
           ],
         },
@@ -150,7 +183,10 @@ describe('TicketsPage', () => {
       .overrideComponent(TicketsPage, {
         set: {
           providers: [
-            { provide: TicketService, useValue: { getTickets: () => Promise.resolve([]) } },
+            {
+              provide: TicketService,
+              useValue: withCustomLoading({ getTickets: () => Promise.resolve([]) }),
+            },
           ],
         },
       })
@@ -183,7 +219,10 @@ describe('TicketsPage', () => {
       .overrideComponent(TicketsPage, {
         set: {
           providers: [
-            { provide: TicketService, useValue: { getTickets: () => Promise.resolve(tickets) } },
+            {
+              provide: TicketService,
+              useValue: withCustomLoading({ getTickets: () => Promise.resolve(tickets) }),
+            },
           ],
         },
       })
@@ -236,7 +275,9 @@ describe('TicketsPage', () => {
           providers: [
             {
               provide: TicketService,
-              useValue: { getTickets: () => Promise.resolve([ticket({})]) },
+              useValue: withCustomLoading({
+                getTickets: () => Promise.resolve([ticket({})]),
+              }),
             },
           ],
         },

src/app/features/store/pages/account-page/pages/tickets-page/tickets-page.ts

@@ -3,12 +3,13 @@ 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 { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import { TicketComponent } from './components/ticket/ticket.component';
 import { TicketResponse, TicketService } from './ticket.service';
 
 @Component({
   selector: 'app-tickets-page',
-  imports: [IconButtonComponent, TicketComponent],
+  imports: [IconButtonComponent, TicketComponent, MenuContentSectionComponent],
   providers: [TicketService],
   templateUrl: './tickets-page.html',
   styleUrl: './tickets-page.scss',
@@ -35,7 +36,7 @@ export class TicketsPage implements OnInit {
 
   async ngOnInit(): Promise<void> {
     try {
-      this.tickets.set(await this.ticketService.getTickets());
+      this.tickets.set(await this.ticketService.withCustomLoading().getTickets());
     } catch {
       this.toastService.danger('Hubo un error al cargar los tickets');
     } finally {
@@ -151,7 +152,9 @@ export class TicketsPage implements OnInit {
     this.isGeneratingPdf.set(true);
 
     try {
-      return await this.ticketService.downloadPdf(tickets.map((ticket) => ticket.id));
+      return await this.ticketService
+        .withCustomLoading()
+        .downloadPdf(tickets.map((ticket) => ticket.id));
     } catch {
       this.toastService.danger('No se pudo generar el PDF de los tickets.');
       return null;

src/app/features/store/pages/account-page/sidebar-layout/sidebar-layout.html

@@ -1,6 +0,0 @@
-    <div class="sidebar-layout">
-      <app-account-sidebar class="account-sidebar"></app-account-sidebar>
-      <div class="account-content">
-        <router-outlet></router-outlet>
-      </div>
-    </div>

src/app/features/store/pages/account-page/sidebar-layout/sidebar-layout.scss

@@ -1,17 +0,0 @@
-.sidebar-layout {
-  display: flex;
-  margin: 0 auto;
-  gap: 100px;
-  min-height: calc(100vh - 100px);
-}
-.account-sidebar {
-  width: 250px;
-  flex-shrink: 0;
-}
-.account-content {
-  flex: 1;
-}
-
-label {
-  font-size: 13px !important;
-}

src/app/features/store/pages/account-page/sidebar-layout/sidebar-layout.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { RouterOutlet } from '@angular/router';
-import { AccountSidebar } from '../components/account-sidebar/account-sidebar';
-
-@Component({
-  selector: 'app-sidebar-layout',
-  standalone: true,
-  imports: [RouterOutlet, AccountSidebar],
-  templateUrl: './sidebar-layout.html',
-  styleUrl: './sidebar-layout.scss',
-})
-export class SidebarLayout {}

src/app/features/store/pages/category-items-page/category-items-page.component.html

@@ -1,8 +1,6 @@
 <section class="category-items" aria-labelledby="category-items-title">
   @if (error()) {
     <p class="alert text-center mb-0 category-items__alert-error">{{ error() }}</p>
-  } @else if (loading()) {
-    <p class="alert alert-light border text-center mb-0">Cargando productos...</p>
   } @else if (results(); as categoryResults) {
     <header class="category-items__header mb-5">
       <h1 id="category-items-title" class="category-items__title mb-0">
@@ -19,7 +17,6 @@
         [layout]="categoryResults.layout"
         [groupLayout]="paginatedLayout"
         [items]="categoryResults"
-        [loading]="loading()"
         (buy)="onBuyProduct($event)"
         (addToCart)="onAddToCart($event)"
         (pageChange)="onPageChange($event)"

src/app/features/store/pages/category-items-page/category-items-page.component.spec.ts

@@ -69,7 +69,9 @@ describe('CategoryItemsPageComponent', () => {
         },
         {
           provide: CatalogService,
-          useValue: { getCategoryItems },
+          useValue: {
+            getCategoryItems,
+          },
         },
         {
           provide: TenantService,

src/app/features/store/pages/category-items-page/category-items-page.component.ts

@@ -50,7 +50,6 @@ export class CategoryItemsPageComponent {
   private readonly toastService = inject(ToastService);
 
   protected readonly results = signal<CategoryItemsResponse | null>(null);
-  protected readonly loading = signal(true);
   protected readonly error = signal<string | null>(null);
   protected readonly creatingDirectPurchase = signal(false);
   protected readonly paginatedLayout: CatalogGroupLayout = 'paginated';
@@ -71,7 +70,6 @@ export class CategoryItemsPageComponent {
         tap(() => {
           this.results.set(null);
           this.error.set(null);
-          this.loading.set(true);
         }),
         switchMap(({ categoryId, page }) => {
           if (categoryId === 0) {
@@ -92,7 +90,6 @@ export class CategoryItemsPageComponent {
       )
       .subscribe((results) => {
         this.results.set(results);
-        this.loading.set(false);
       });
   }
 

src/app/features/store/pages/checkout-page/checkout-data-step.component.scss

@@ -20,6 +20,6 @@
     display: block;
     width: 100%;
     flex: 1 1 290px;
-    max-width: 290px;
   }
+
 }

src/app/features/store/pages/checkout-page/checkout-page.component.scss

@@ -6,6 +6,15 @@
 
   @media (max-width: 900px) {
     grid-template-columns: 1fr;
+
+    .checkout-page__cart-col {
+      order: 1;
+    }
+
+    .checkout-page__stepper-col,
+    .checkout-page__editing-notice {
+      order: 2;
+    }
   }
 
   &__stepper-col {

src/app/features/store/pages/checkout-page/checkout-page.component.spec.ts

@@ -22,6 +22,7 @@ describe('CheckoutPageComponent payment validation', () => {
     generatePaymentIntent: ReturnType<typeof vi.fn>;
     getPurchase: ReturnType<typeof vi.fn>;
     submitPurchaseForReview: ReturnType<typeof vi.fn>;
+    withCustomLoading: ReturnType<typeof vi.fn>;
   };
   let cartServiceStub: {
     cart: ReturnType<typeof signal>;
@@ -59,8 +60,10 @@ describe('CheckoutPageComponent payment validation', () => {
         qr_data: { qr_code: 'qr-value' },
       }),
       getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
-      submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'in_review' }),
+      submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
+      withCustomLoading: vi.fn(),
     };
+    checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub);
     cartServiceStub = {
       cart: signal({
         id: 10,
@@ -191,23 +194,24 @@ describe('CheckoutPageComponent payment validation', () => {
     expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
   });
 
-  it.each(['created', 'pending_payment', 'in_review'])(
-    'shows the payment error when a transfer remains %s',
-    async (status) => {
-      checkoutServiceStub.submitPurchaseForReview.mockResolvedValue({ status });
-      const { component } = createComponent();
-      component.selectedPaymentMethod.set('transfer');
+  it('checks a transfer once and redirects to purchase status while pending', async () => {
+    const { component } = createComponent();
+    component.selectedPaymentMethod.set('transfer');
 
-      await component.onComplete();
+    await component.onComplete();
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
+    expect(component.transferValidationStatus()).toBe('pending');
+    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
 
-      expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
-      expect(component.transferValidationStatus()).toBe('error');
-      expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
-      expect(routerStub.navigate).not.toHaveBeenCalled();
-    },
-  );
+    await vi.advanceTimersByTimeAsync(30_000);
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
 
-  it('submits a paid transfer and navigates to its confirmation page', async () => {
+    await component.onComplete();
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
+  });
+
+  it('navigates after a transfer is confirmed as paid', async () => {
     checkoutServiceStub.submitPurchaseForReview.mockResolvedValue({ status: 'paid' });
     const { component } = createComponent();
     component.selectedPaymentMethod.set('transfer');
@@ -362,12 +366,16 @@ describe('CheckoutPageComponent payment validation', () => {
 
     expect(component.checkoutStepIndex()).toBe(1);
     expect(component.selectedPaymentMethod()).toBe('qr');
-    expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith('tenant-test', 25, 'qr');
+    expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith(
+      'tenant-test',
+      25,
+      'qr',
+    );
     expect(component.qrData()).toBe('qr-value');
     expect(component.qrPaymentStatus()).toBe('waiting');
   });
 
-  it.each(['in_review', 'paid', 'cancelled', 'rejected', 'expired'])(
+  it.each(['paid', 'cancelled', 'rejected', 'expired'])(
     'redirects a %s purchase to its status page',
     async (status) => {
       routeQueryParamMap = convertToParamMap({ purchase: 25 });
@@ -387,6 +395,25 @@ describe('CheckoutPageComponent payment validation', () => {
     },
   );
 
+  it('redirects a submitted pending payment purchase to its status page', async () => {
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
+    checkoutServiceStub.getPurchase.mockResolvedValue({
+      id: 25,
+      status: 'pending_payment',
+      payment_method: 'transfer',
+      expires_at: null,
+      transfer_payer_dni: null,
+      items: [],
+      subtotal: '100.00',
+      total: '100.00',
+    });
+
+    createComponent();
+    await Promise.resolve();
+
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
+  });
+
   it('updates a purchase item while editing and refreshes checkout totals', async () => {
     const updatedPurchase = {
       id: 25,

src/app/features/store/pages/checkout-page/checkout-page.component.ts

@@ -343,11 +343,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.isGeneratingIntent.set(true);
 
     try {
-      const response = await this.checkoutService.generatePaymentIntent(
-        tenant.codigo,
-        purchaseId,
-        method,
-      );
+      const response = await this.checkoutService
+        .withCustomLoading()
+        .generatePaymentIntent(tenant.codigo, purchaseId, method);
 
       if (method === 'qr' && response.qr_data?.qr_code) {
         if (requestId !== this.paymentMethodRequestId || this.selectedPaymentMethod() !== 'qr') {
@@ -381,12 +379,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.transferValidationStatus.set('idle');
     this.isGeneratingIntent.set(true);
     try {
-      const response = await this.checkoutService.generatePaymentIntent(
-        tenant.codigo,
-        purchaseId,
-        'transfer',
-        dni,
-      );
+      const response = await this.checkoutService
+        .withCustomLoading()
+        .generatePaymentIntent(tenant.codigo, purchaseId, 'transfer', dni);
 
       if (response.transfer_data) {
         this.markPurchasePendingPayment();
@@ -438,12 +433,15 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.transferValidationStatus.set('checking');
 
     try {
-      const purchase = await this.checkoutService.submitPurchaseForReview(
-        tenant.codigo,
-        purchaseId,
-      );
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .submitPurchaseForReview(tenant.codigo, purchaseId);
+
+      if (purchase.status === 'paid' || purchase.status === 'pending_payment') {
+        if (purchase.status === 'pending_payment') {
+          this.transferValidationStatus.set('pending');
+        }
 
-      if (purchase.status === 'paid') {
         this.navigateToPurchaseStatus(purchaseId);
         return;
       }
@@ -494,7 +492,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.isCheckingQrPayment.set(true);
 
     try {
-      const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(tenant.codigo, purchaseId);
 
       if (runId !== this.qrPollingRunId) {
         return;
@@ -575,10 +575,12 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     }
 
     try {
-      const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(tenant.codigo, purchaseId);
 
       if (
-        purchase.status === 'in_review' ||
+        (purchase.status === 'pending_payment' && purchase.expires_at === null) ||
         purchase.status === 'paid' ||
         purchase.status === 'cancelled' ||
         purchase.status === 'rejected' ||

src/app/features/store/pages/checkout-page/checkout-payment-step.component.html

@@ -34,7 +34,7 @@
       </div>
     </section>
 
-    <section class="payment-panel d-flex justify-content-end" aria-live="polite">
+    <section class="payment-panel" aria-live="polite">
       @if (isGeneratingIntent()) {
         <div class="payment-panel__card" style="text-align: center; padding: 2rem">
           <h3 class="payment-panel__title">Cargando información de pago...</h3>

src/app/features/store/pages/checkout-page/checkout-payment-step.component.scss

@@ -32,6 +32,11 @@
 .payment-methods {
   min-width: 0;
 
+  @media (max-width: 760px) {
+    width: min(100%, 300px);
+    justify-self: center;
+  }
+
   &__title {
     margin: 0 0 1.75rem;
     color: #8a8a8a;
@@ -109,7 +114,22 @@
 }
 
 .payment-panel {
+  display: flex;
+  justify-content: flex-end;
   min-width: 0;
+
+  > app-checkout-payment-qr,
+  > app-checkout-payment-transfer,
+  > app-checkout-payment-telepagos {
+    display: block;
+    width: 100%;
+    max-width: 320px;
+  }
+
+  @media (max-width: 760px) {
+    justify-content: center;
+  }
+
   &__card {
     width: 100%;
     max-width: 320px;

src/app/features/store/pages/help-page/components/help-sidebar/help-sidebar.html

@@ -1,16 +0,0 @@
-<aside class="help-sidebar">
-  <h1 class="help-sidebar__title">{{ menu()?.label }}</h1>
-  <div class="help-sidebar__divider"></div>
-
-  <nav class="help-sidebar__nav" aria-label="Secciones de ayuda">
-    @for (menu of submenues(); track menu.code) {
-      <a
-        class="help-sidebar__link"
-        [routerLink]="menu.route"
-        routerLinkActive="help-sidebar__link--active"
-      >
-        {{ menu.label }}
-      </a>
-    }
-  </nav>
-</aside>

src/app/features/store/pages/help-page/components/help-sidebar/help-sidebar.scss

@@ -1,57 +0,0 @@
-.help-sidebar {
-  display: flex;
-  flex-direction: column;
-}
-
-.help-sidebar__title {
-  margin: 0 0 0.75rem;
-  color: #1a1a1a;
-  font-size: 1rem;
-  font-weight: 700;
-  line-height: 1.25;
-  text-transform: uppercase;
-}
-
-.help-sidebar__divider {
-  height: 1px;
-  margin-bottom: 1.25rem;
-  background: #dedede;
-}
-
-.help-sidebar__nav {
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-}
-
-.help-sidebar__link {
-  color: #888888;
-  font-size: 0.875rem;
-  font-weight: 500;
-  line-height: 1.35;
-  text-decoration: none;
-  transition: color 150ms ease;
-
-  &:hover,
-  &:focus-visible {
-    color: #5a5a5a;
-  }
-
-  &:focus-visible {
-    border-radius: 2px;
-    outline: 2px solid var(--color-primary);
-    outline-offset: 3px;
-  }
-}
-
-.help-sidebar__link--active {
-  color: var(--color-primary);
-  font-weight: 600;
-}
-
-@media (max-width: 767.98px) {
-  .help-sidebar__nav {
-    flex-flow: row wrap;
-    gap: 0.75rem 1.25rem;
-  }
-}

src/app/features/store/pages/help-page/components/help-sidebar/help-sidebar.spec.ts

@@ -1,72 +0,0 @@
-import { signal } from '@angular/core';
-import { TestBed } from '@angular/core/testing';
-import { provideRouter } from '@angular/router';
-import { describe, expect, it } from 'vitest';
-
-import { Tenant } from '../../../../../../core/services/tenant.interface';
-import { TenantService } from '../../../../../../core/services/tenant.service';
-import { HelpSidebar } from './help-sidebar';
-
-describe('HelpSidebar', () => {
-  it('renders the parent and submenu labels supplied by the tenant', async () => {
-    const tenant = signal<Tenant>({
-      id: 1,
-      codigo: 'test',
-      nombre: 'Test',
-      dominio: 'localhost',
-      primary_color: '#000000',
-      secondary_color: '#000000',
-      danger_color: '#000000',
-      success_color: '#000000',
-      header_bg_color: '#ffffff',
-      footer_bg_color: '#ffffff',
-      header_logo: '',
-      footer_logo: '',
-      categories: [],
-      menues: [
-        {
-          id: 1,
-          code: 'help',
-          label: 'Centro de ayuda',
-          parent_menu_code: null,
-          content_type: 'dynamic',
-          route: '/ayuda',
-          submenues: [
-            {
-              id: 2,
-              code: 'help.faq',
-              label: 'Consultas habituales',
-              parent_menu_code: 'help',
-              content_type: 'dynamic',
-              route: '/ayuda/preguntas-frecuentes',
-              submenues: [],
-            },
-          ],
-        },
-      ],
-    });
-
-    await TestBed.configureTestingModule({
-      imports: [HelpSidebar],
-      providers: [
-        provideRouter([]),
-        {
-          provide: TenantService,
-          useValue: { tenant: tenant.asReadonly() },
-        },
-      ],
-    }).compileComponents();
-
-    const fixture = TestBed.createComponent(HelpSidebar);
-    fixture.detectChanges();
-
-    const element = fixture.nativeElement as HTMLElement;
-
-    expect(element.querySelector('.help-sidebar__title')?.textContent?.trim()).toBe(
-      'Centro de ayuda',
-    );
-    expect(element.querySelector('.help-sidebar__link')?.textContent?.trim()).toBe(
-      'Consultas habituales',
-    );
-  });
-});

src/app/features/store/pages/help-page/components/help-sidebar/help-sidebar.ts

@@ -1,20 +0,0 @@
-import { Component, computed, inject } from '@angular/core';
-import { RouterLink, RouterLinkActive } from '@angular/router';
-
-import { findMenu } from '../../../../../../core/services/menu.utils';
-import { TenantService } from '../../../../../../core/services/tenant.service';
-
-@Component({
-  selector: 'app-help-sidebar',
-  imports: [RouterLink, RouterLinkActive],
-  templateUrl: './help-sidebar.html',
-  styleUrl: './help-sidebar.scss',
-})
-export class HelpSidebar {
-  private readonly tenantService = inject(TenantService);
-
-  protected readonly menu = computed(() =>
-    findMenu(this.tenantService.tenant()?.menues ?? [], 'help'),
-  );
-  protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
-}

src/app/features/store/pages/help-page/pages/contact-page/contact-page.html

@@ -1,53 +1,53 @@
-<section class="contact-page" aria-labelledby="contact-page-title">
-  <div class="contact-page__details">
-    <h2 id="contact-page-title" class="contact-page__title">CONTACTO</h2>
+<app-menu-content-section menuCode="help.contact" titleId="contact-page-title">
+  <div class="contact-page">
+    <div class="contact-page__details">
+      @if (contact().whatsappUrl && contact().whatsappLabel) {
+        <a
+          class="contact-page__contact-link"
+          [href]="contact().whatsappUrl"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <i class="fa-brands fa-whatsapp" aria-hidden="true"></i>
+          <span>{{ contact().whatsappLabel }}</span>
+        </a>
+      }
 
-    @if (contact().whatsappUrl && contact().whatsappLabel) {
-      <a
-        class="contact-page__contact-link"
-        [href]="contact().whatsappUrl"
-        target="_blank"
-        rel="noopener noreferrer"
-      >
-        <i class="fa-brands fa-whatsapp" aria-hidden="true"></i>
-        <span>{{ contact().whatsappLabel }}</span>
-      </a>
-    }
+      @if (contact().phone; as phone) {
+        <a class="contact-page__contact-link" [href]="phoneUrl(phone)">
+          <i class="fa-solid fa-phone" aria-hidden="true"></i>
+          <span>{{ phone }}</span>
+        </a>
+      }
 
-    @if (contact().phone; as phone) {
-      <a class="contact-page__contact-link" [href]="phoneUrl(phone)">
-        <i class="fa-solid fa-phone" aria-hidden="true"></i>
-        <span>{{ phone }}</span>
-      </a>
-    }
+      @for (location of contact().locations; track location.id) {
+        <article class="contact-page__location">
+          <h3 class="contact-page__location-title">
+            <i class="fa-solid fa-location-dot" aria-hidden="true"></i>
+            <span>{{ location.label }}</span>
+          </h3>
 
-    @for (location of contact().locations; track location.id) {
-      <article class="contact-page__location">
-        <h3 class="contact-page__location-title">
-          <i class="fa-solid fa-location-dot" aria-hidden="true"></i>
-          <span>{{ location.label }}</span>
-        </h3>
+          <ul class="contact-page__addresses">
+            @for (address of location.addresses; track address.id) {
+              <li>{{ address.address }}</li>
+            }
+          </ul>
+        </article>
+      }
 
-        <ul class="contact-page__addresses">
-          @for (address of location.addresses; track address.id) {
-            <li>{{ address.address }}</li>
-          }
-        </ul>
-      </article>
-    }
+      @if (!contact().whatsappUrl && !contact().phone && contact().locations.length === 0) {
+        <p class="contact-page__empty">No hay datos de contacto disponibles.</p>
+      }
+    </div>
 
-    @if (!contact().whatsappUrl && !contact().phone && contact().locations.length === 0) {
-      <p class="contact-page__empty">No hay datos de contacto disponibles.</p>
+    @if (contact().mapLocations.length > 0) {
+      <app-location-map
+        class="contact-page__map"
+        [locations]="contact().mapLocations"
+        [markerColor]="markerColor()"
+        mapStyle="minimal-light"
+        ariaLabel="Mapa de sucursales y puntos de atención"
+      />
     }
   </div>
-
-  @if (contact().mapLocations.length > 0) {
-    <app-location-map
-      class="contact-page__map"
-      [locations]="contact().mapLocations"
-      [markerColor]="markerColor()"
-      mapStyle="minimal-light"
-      ariaLabel="Mapa de sucursales y puntos de atención"
-    />
-  }
-</section>
+</app-menu-content-section>

src/app/features/store/pages/help-page/pages/contact-page/contact-page.scss

@@ -20,14 +20,6 @@
   align-items: flex-start;
 }
 
-.contact-page__title {
-  margin: 0 0 1.25rem;
-  color: inherit;
-  font-size: 1rem;
-  font-weight: 400;
-  line-height: 1.3;
-}
-
 .contact-page__contact-link {
   display: inline-flex;
   align-items: center;
@@ -122,6 +114,26 @@
   }
 }
 
+@media (max-width: 767.98px) {
+  .contact-page__details {
+    align-items: center;
+    text-align: center;
+  }
+
+  .contact-page__location {
+    width: 100%;
+  }
+
+  .contact-page__location-title {
+    justify-content: center;
+  }
+
+  .contact-page__addresses {
+    padding-left: 0;
+    list-style-position: inside;
+  }
+}
+
 @media (max-width: 575.98px) {
   .contact-page__map::ng-deep .location-map {
     min-height: 16rem;

src/app/features/store/pages/help-page/pages/contact-page/contact-page.ts

@@ -2,6 +2,7 @@ import { Component, computed, inject } from '@angular/core';
 
 import { findMenu } from '../../../../../../core/services/menu.utils';
 import { TenantService } from '../../../../../../core/services/tenant.service';
+import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import {
   LocationMapComponent,
   MapLocation,
@@ -30,7 +31,7 @@ type ContactContent = {
 
 @Component({
   selector: 'app-contact-page',
-  imports: [LocationMapComponent],
+  imports: [LocationMapComponent, MenuContentSectionComponent],
   templateUrl: './contact-page.html',
   styleUrl: './contact-page.scss',
 })

src/app/features/store/pages/help-page/pages/faq-page/faq-page.html

@@ -1,14 +1,8 @@
-<section class="faq-page" aria-labelledby="faq-page-title">
-  <h2 id="faq-page-title" class="faq-page__title">PREGUNTAS FRECUENTES</h2>
-
+<app-menu-content-section class="faq-page" menuCode="help.faq" titleId="faq-page-title">
   @if (faqs().length > 0) {
     <app-accordion [flush]="true">
       @for (faq of faqs(); track $index; let last = $last) {
-        <app-accordion-item
-          [title]="faq.question"
-          [headingLevel]="3"
-          [open]="last"
-        >
+        <app-accordion-item [title]="faq.question" [headingLevel]="3" [open]="last">
           <p>{{ faq.answer }}</p>
         </app-accordion-item>
       }
@@ -16,4 +10,4 @@
   } @else {
     <p class="faq-page__empty">No hay preguntas frecuentes disponibles.</p>
   }
-</section>
+</app-menu-content-section>

src/app/features/store/pages/help-page/pages/faq-page/faq-page.scss

@@ -4,18 +4,11 @@
 }
 
 .faq-page {
+  display: block;
   width: 100%;
   max-width: 760px;
 }
 
-.faq-page__title {
-  margin: 0 0 0.5rem;
-  color: #a0a0a0;
-  font-size: 0.9375rem;
-  font-weight: 700;
-  line-height: 1.3;
-}
-
 .faq-page p {
   margin: 0;
 }

src/app/features/store/pages/help-page/pages/faq-page/faq-page.ts

@@ -4,6 +4,7 @@ import { findMenu } from '../../../../../../core/services/menu.utils';
 import { TenantService } from '../../../../../../core/services/tenant.service';
 import { AccordionItemComponent } from '../../../../../../shared/components/accordion/accordion-item.component';
 import { AccordionComponent } from '../../../../../../shared/components/accordion/accordion.component';
+import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 
 type Faq = {
   question: string;
@@ -12,7 +13,7 @@ type Faq = {
 
 @Component({
   selector: 'app-faq-page',
-  imports: [AccordionComponent, AccordionItemComponent],
+  imports: [AccordionComponent, AccordionItemComponent, MenuContentSectionComponent],
   templateUrl: './faq-page.html',
   styleUrl: './faq-page.scss',
 })

src/app/features/store/pages/help-page/sidebar-layout/help-sidebar-layout.html

@@ -1,7 +0,0 @@
-<div class="help-layout">
-  <app-help-sidebar class="help-layout__sidebar" />
-
-  <div class="help-layout__content">
-    <router-outlet />
-  </div>
-</div>

src/app/features/store/pages/help-page/sidebar-layout/help-sidebar-layout.scss

@@ -1,25 +0,0 @@
-:host {
-  display: block;
-}
-
-.help-layout {
-  display: grid;
-  grid-template-columns: minmax(190px, 250px) minmax(0, 1fr);
-  gap: clamp(3rem, 8vw, 6.25rem);
-  width: 100%;
-}
-
-.help-layout__sidebar {
-  min-width: 0;
-}
-
-.help-layout__content {
-  min-width: 0;
-}
-
-@media (max-width: 767.98px) {
-  .help-layout {
-    grid-template-columns: 1fr;
-    gap: 2rem;
-  }
-}

src/app/features/store/pages/help-page/sidebar-layout/help-sidebar-layout.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { RouterOutlet } from '@angular/router';
-
-import { HelpSidebar } from '../components/help-sidebar/help-sidebar';
-
-@Component({
-  selector: 'app-help-sidebar-layout',
-  imports: [RouterOutlet, HelpSidebar],
-  templateUrl: './help-sidebar-layout.html',
-  styleUrl: './help-sidebar-layout.scss',
-})
-export class HelpSidebarLayout {}

src/app/features/store/pages/login-page/login-page.component.html

@@ -30,7 +30,7 @@
       <label class="visually-hidden" for="login-password">Contraseña</label>
       <app-input
         id="login-password"
-        type="password"
+        type="password-toggle"
         placeholder="Contraseña"
         [value]="form.controls.password.value"
         [invalid]="showControlError('password')"

src/app/features/store/pages/product-detail-page/product-detail-page.component.html

@@ -35,6 +35,31 @@
             </div>
           </section>
 
+          @if (hasEventDates()) {
+            <div class="product-detail__divider"></div>
+
+            <section class="product-detail__section product-detail__section--event-date">
+              <label class="form-label" for="event-date-selector">Fecha</label>
+              <select
+                id="event-date-selector"
+                class="form-select"
+                [value]="selectedVariant()?.id ?? ''"
+                (change)="onEventDateChange($event)"
+              >
+                @for (eventDate of eventDates(); track eventDate.id) {
+                  <option
+                    [value]="eventDate.variant_id"
+                    [disabled]="
+                      prod.inventory_policy !== 'unlimited' && (eventDate.stock_tecnico ?? 0) <= 0
+                    "
+                  >
+                    {{ eventDate.label }}
+                  </option>
+                }
+              </select>
+            </section>
+          }
+
           @if (hasRenderableAttributes()) {
             <div class="product-detail__divider"></div>
 

src/app/features/store/pages/product-detail-page/product-detail-page.component.spec.ts

@@ -65,13 +65,17 @@ describe('ProductDetailPageComponent', () => {
     });
     catalogServiceStub = {
       getCatalogItem: vi.fn(),
+      withCustomLoading: vi.fn(),
     };
+    catalogServiceStub.withCustomLoading.mockReturnValue(catalogServiceStub);
     routerStub = {
       navigate: vi.fn(),
     };
     cartServiceStub = {
       addItem: vi.fn().mockReturnValue(of({ message: 'Producto agregado al carrito' })),
+      withCustomLoading: vi.fn(),
     };
+    cartServiceStub.withCustomLoading.mockReturnValue(cartServiceStub);
     toastServiceStub = {
       success: vi.fn(),
       danger: vi.fn(),
@@ -323,6 +327,63 @@ describe('ProductDetailPageComponent', () => {
     expect((swatches[0] as HTMLElement).style.backgroundColor).not.toBe('');
   });
 
+  it('renders event dates and resolves the selected date through its variant', async () => {
+    const detailProduct: CatalogItemDetail = {
+      ...mockProduct,
+      purpose: 'entry',
+      has_tickets: true,
+      variants: [
+        { id: 101, event_date_id: 20, stock_tecnico: 10, values: {} },
+        { id: 102, event_date_id: 21, stock_tecnico: 10, values: {} },
+      ],
+      event_dates: [
+        {
+          id: 20,
+          variant_id: 101,
+          date: '2026-10-09',
+          starts_at: '2026-10-09T10:00:00.000000Z',
+          ends_at: '2026-10-09T20:00:00.000000Z',
+          label: 'Viernes 9 de octubre - 10:00 a 20:00',
+          stock_tecnico: 10,
+        },
+        {
+          id: 21,
+          variant_id: 102,
+          date: '2026-10-10',
+          starts_at: '2026-10-10T10:00:00.000000Z',
+          ends_at: '2026-10-10T20:00:00.000000Z',
+          label: 'Sábado 10 de octubre - 10:00 a 20:00',
+          stock_tecnico: 10,
+        },
+      ],
+      selected_variant: {
+        id: 101,
+        event_date_id: 20,
+        stock_tecnico: 10,
+        images: [],
+        values: {},
+      },
+    };
+    resolveProduct(detailProduct);
+    catalogServiceStub.getCatalogItem.mockReturnValue(
+      of({ ...detailProduct, selected_variant: { ...detailProduct.selected_variant!, id: 102 } }),
+    );
+
+    await configureTestingModule();
+    const fixture = TestBed.createComponent(ProductDetailPageComponent);
+    fixture.detectChanges();
+
+    const select = fixture.nativeElement.querySelector('#event-date-selector') as HTMLSelectElement;
+    expect(select.options).toHaveLength(2);
+    expect(select.value).toBe('101');
+
+    select.value = '102';
+    select.dispatchEvent(new Event('change'));
+    fixture.detectChanges();
+
+    expect(catalogServiceStub.getCatalogItem).toHaveBeenCalledWith(1, 102);
+  });
+
   it('hides the attributes block and its extra divider when no attributes are present', async () => {
     await configureTestingModule();
     const fixture = TestBed.createComponent(ProductDetailPageComponent);

src/app/features/store/pages/product-detail-page/product-detail-page.component.ts

@@ -100,6 +100,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
 
     const variant = this.selectedVariant();
     if (variant) return this.isVariantAvailable(variant, prod);
+    if (prod.purpose === 'entry') return false;
     if (prod.variants.length > 0) return false;
 
     return prod.inventory_policy === 'unlimited' || (prod.stock_tecnico ?? 0) > 0;
@@ -108,8 +109,14 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
   protected readonly descriptionMaxHeight = signal(0);
   protected readonly descriptionHasOverflow = signal(false);
   protected readonly renderableAttributes = computed(() =>
-    (this.product()?.attributes ?? []).filter((attribute) => attribute.options.length > 0),
+    (this.product()?.attributes ?? []).filter(
+      (attribute) =>
+        attribute.options.length > 0 &&
+        !(this.product()?.purpose === 'entry' && attribute.codigo === 'fecha'),
+    ),
   );
+  protected readonly eventDates = computed(() => this.product()?.event_dates ?? []);
+  protected readonly hasEventDates = computed(() => this.eventDates().length > 0);
   protected readonly hasRenderableAttributes = computed(
     () => this.renderableAttributes().length > 0,
   );
@@ -155,27 +162,30 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     this.variantLoading.set(true);
 
     this.productSub?.unsubscribe();
-    this.productSub = this.catalogService.getCatalogItem(productId, variantId).subscribe({
-      next: (prod) => {
-        this.applyProduct(prod, false);
-        this.variantLoading.set(false);
-      },
-      error: (err: HttpErrorResponse) => {
-        const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.';
-        this.toastService.danger(errorMessage);
-        this.variantLoading.set(false);
+    this.productSub = this.catalogService
+      .withCustomLoading()
+      .getCatalogItem(productId, variantId)
+      .subscribe({
+        next: (prod) => {
+          this.applyProduct(prod, false);
+          this.variantLoading.set(false);
+        },
+        error: (err: HttpErrorResponse) => {
+          const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.';
+          this.toastService.danger(errorMessage);
+          this.variantLoading.set(false);
 
-        this.product.update((currentProduct) => {
-          if (!currentProduct) return null;
-          return {
-            ...currentProduct,
-            variants: currentProduct.variants.filter((variant) => variant.id !== variantId),
-          };
-        });
+          this.product.update((currentProduct) => {
+            if (!currentProduct) return null;
+            return {
+              ...currentProduct,
+              variants: currentProduct.variants.filter((variant) => variant.id !== variantId),
+            };
+          });
 
-        this.attributeSelector()?.reset();
-      },
-    });
+          this.attributeSelector()?.reset();
+        },
+      });
   }
 
   private applyResolvedData(resolvedData: ProductDetailResolvedData): void {
@@ -237,6 +247,12 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     }
   }
 
+  protected onEventDateChange(event: Event): void {
+    const variantId = Number((event.target as HTMLSelectElement).value);
+    const variant = this.product()?.variants.find((item) => item.id === variantId) ?? null;
+    this.onVariantChange(variant);
+  }
+
   protected addToCart(): void {
     const currentProduct = this.product();
     const variant = this.selectedVariant();
@@ -246,18 +262,21 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     }
 
     this.addingToCart.set(true);
-    this.cartService.addItem(currentProduct.id, variant?.id ?? null, this.quantity()).subscribe({
-      next: (res) => {
-        const msg = res.message || 'Producto agregado al carrito';
-        this.toastService.success(msg);
-        this.addingToCart.set(false);
-      },
-      error: (err: HttpErrorResponse) => {
-        const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
-        this.toastService.danger(errorMessage);
-        this.addingToCart.set(false);
-      },
-    });
+    this.cartService
+      .withCustomLoading()
+      .addItem(currentProduct.id, variant?.id ?? null, this.quantity())
+      .subscribe({
+        next: (res) => {
+          const msg = res.message || 'Producto agregado al carrito';
+          this.toastService.success(msg);
+          this.addingToCart.set(false);
+        },
+        error: (err: HttpErrorResponse) => {
+          const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
+          this.toastService.danger(errorMessage);
+          this.addingToCart.set(false);
+        },
+      });
   }
 
   protected async buyNow(): Promise<void> {

src/app/features/store/pages/purchase-status-page/purchase-status-page.component.spec.ts

@@ -66,6 +66,9 @@ describe('PurchaseStatusPageComponent', () => {
   async function render(hasGeneratedTickets: boolean) {
     const checkoutService = {
       getPurchase: vi.fn().mockResolvedValue(purchase(hasGeneratedTickets)),
+      withCustomLoading() {
+        return this;
+      },
     };
     const router = {
       navigate: vi.fn().mockResolvedValue(true),

src/app/features/store/pages/purchase-status-page/purchase-status-page.component.ts

@@ -63,7 +63,9 @@ export class PurchaseStatusPageComponent implements OnInit {
     }
 
     try {
-      const purchase = await this.checkoutService.getPurchase(this.tenantCode, this.purchaseId);
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(this.tenantCode, this.purchaseId);
       this.status.set(this.resolveStatus(purchase));
       this.hasGeneratedTickets.set(purchase.has_generated_tickets === true);
     } catch (error) {

src/app/features/store/pages/recover-password-code-page/recover-password-code-page.component.scss

@@ -18,9 +18,10 @@
 
 :host ::ng-deep .recover-password-code-page__inputs .form-control {
   min-height: 52px;
-  padding: 0.5rem;
+  padding: 0.5rem !important;
   text-align: center;
   font-size: 20px;
+  background-image: none !important;
 }
 
 :host ::ng-deep .recover-password-code-page__resend-action {

src/app/features/store/pages/search-page/search-page.component.html

@@ -1,8 +1,8 @@
 <section class="search-results" aria-labelledby="search-results-title">
-  <header class="search-results__header mb-4">
-    <h1 id="search-results-title" class="h3 mb-2">Resultados de búsqueda</h1>
+  <header class="search-results__header mb-5">
+    <h1 id="search-results-title" class="search-results__title mb-0">Resultados de búsqueda</h1>
     @if (query()) {
-      <p class="text-body-secondary mb-0">
+      <p class="search-results__subtitle text-body-secondary mb-0">
         Resultados para <strong>“{{ query() }}”</strong>
       </p>
     }
@@ -10,8 +10,6 @@
 
   @if (error()) {
     <p class="alert text-center mb-0 search-results__alert-error">{{ error() }}</p>
-  } @else if (loading()) {
-    <p class="alert alert-light border text-center mb-0">Buscando productos...</p>
   } @else if (results(); as searchResults) {
     @if (!searchResults.data.length) {
       <p class="alert alert-light border text-center mb-0">

src/app/features/store/pages/search-page/search-page.component.scss

@@ -1,3 +1,24 @@
+.search-results__header {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  padding: 16px 28px;
+  text-align: center;
+}
+
+.search-results__title {
+  color: var(--bs-primary);
+  font-size: 24px;
+  font-weight: bold;
+  line-height: 1.2;
+}
+
+.search-results__subtitle {
+  line-height: 1.2;
+}
+
 .search-results__alert-error {
   color: var(--tenant-danger-color, var(--bs-danger));
 }

src/app/features/store/pages/search-page/search-page.component.spec.ts

@@ -65,7 +65,9 @@ describe('SearchPageComponent', () => {
         },
         {
           provide: CatalogService,
-          useValue: { searchCatalog },
+          useValue: {
+            searchCatalog,
+          },
         },
         {
           provide: TenantService,
@@ -106,6 +108,22 @@ describe('SearchPageComponent', () => {
     );
   });
 
+  it('renders the search title and query subtitle with the category header layout', () => {
+    const fixture = TestBed.createComponent(SearchPageComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const header = element.querySelector('.search-results__header');
+    const title = element.querySelector('#search-results-title');
+    const subtitle = element.querySelector('.search-results__subtitle');
+
+    expect(header?.classList).toContain('mb-5');
+    expect(title?.classList).toContain('search-results__title');
+    expect(title?.classList).toContain('mb-0');
+    expect(subtitle?.textContent).toContain('Resultados para');
+    expect(subtitle?.textContent).toContain('running');
+  });
+
   it('does not search when the query has fewer than three characters', () => {
     TestBed.overrideProvider(ActivatedRoute, {
       useValue: {

src/app/features/store/pages/search-page/search-page.component.ts

@@ -56,7 +56,6 @@ export class SearchPageComponent {
 
   protected readonly query = signal('');
   protected readonly results = signal<ApiPaginatedResponse<CatalogFeaturedItem[]> | null>(null);
-  protected readonly loading = signal(false);
   protected readonly error = signal<string | null>(null);
   protected readonly creatingDirectPurchase = signal(false);
 
@@ -105,7 +104,6 @@ export class SearchPageComponent {
               ? null
               : `Ingresá al menos ${this.minSearchLength} caracteres para buscar.`,
           );
-          this.loading.set(query.length >= this.minSearchLength);
         }),
         switchMap(({ query, page }) => {
           if (query.length < this.minSearchLength) {
@@ -124,7 +122,6 @@ export class SearchPageComponent {
       )
       .subscribe((results) => {
         this.results.set(results);
-        this.loading.set(false);
       });
   }
 

src/app/features/store/pages/store-home-page/store-home-page.component.html

@@ -1,19 +1,16 @@
-@if (tenant()?.main_carousel_images; as mainCarouselImages) {
-  @if (mainCarouselImages.length) {
+@if (mainCarouselImages(); as images) {
+  @if (images.length) {
     <app-main-carousel
       class="store-home__main-carousel"
-      [images]="mainCarouselImages"
+      [images]="images"
       ariaLabel="Imágenes destacadas de la tienda"
       (firstImageReady)="mainCarouselReady.set(true)"
     />
   }
 }
 
-@if (tenant()?.hero_config || tenant()?.event_config) {
-  <app-hero-banner
-    [heroConfig]="tenant()?.hero_config"
-    [eventConfig]="tenant()?.event_config"
-  ></app-hero-banner>
+@if (heroConfig() || eventConfig()) {
+  <app-hero-banner [heroConfig]="heroConfig()" [eventConfig]="eventConfig()" />
 }
 
 @if (error()) {
@@ -40,3 +37,9 @@
     </app-store-section>
   }
 }
+
+@if (additionalInfo(); as content) {
+  <app-store-section class="store-home__additional-info" title="Información adicional">
+    <div class="store-home__additional-info-content" [innerHTML]="content"></div>
+  </app-store-section>
+}

src/app/features/store/pages/store-home-page/store-home-page.component.scss

@@ -11,6 +11,25 @@ app-store-section + app-store-section {
   margin-top: clamp(3rem, 6vw, 5rem);
 }
 
+:host > .store-home__additional-info:not(:first-child) {
+  margin-top: clamp(3rem, 6vw, 5rem);
+}
+
+.store-home__additional-info-content {
+  width: 100%;
+  text-align: center;
+}
+
+::ng-deep .store-home__additional-info-content img {
+  display: block;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+::ng-deep .store-home__additional-info-content > :last-child {
+  margin-bottom: 0;
+}
+
 .store-home__alert-error {
   margin: 0;
   border-color: rgba(var(--tenant-danger-rgb, 220, 53, 69), 0.18);

src/app/features/store/pages/store-home-page/store-home-page.component.spec.ts

@@ -16,6 +16,7 @@ import { Tenant } from '../../../../core/services/tenant.interface';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
 import { ProductListComponent } from '../../../../shared/components/product-list/product-list.component';
+import { HeroBannerComponent } from '../../../../shared/components/hero-banner/hero-banner.component';
 import { StoreHomePageComponent } from './store-home-page.component';
 import {
   STORE_HOME_PRODUCTS_ERROR_MESSAGE,
@@ -88,7 +89,7 @@ const pageOneItems: CatalogFeaturedItem[] = [
   },
 ];
 
-function createTenant(mainCarouselImages?: string[]): Tenant {
+function createTenant(extras: Tenant['extras'] = {}): Tenant {
   return {
     id: 1,
     codigo: 'acme',
@@ -102,8 +103,18 @@ function createTenant(mainCarouselImages?: string[]): Tenant {
     footer_bg_color: '#ffffff',
     header_logo: '/header.png',
     footer_logo: '/footer.png',
+    website_type_code: 'shopit',
+    website_type: {
+      codigo: 'shopit',
+      nombre: 'ShopIt',
+      primary_color: null,
+      secondary_color: null,
+      danger_color: null,
+      success_color: null,
+      site_logo: null,
+    },
+    extras,
     categories: [],
-    main_carousel_images: mainCarouselImages,
   };
 }
 
@@ -146,11 +157,8 @@ describe('StoreHomePageComponent', () => {
     );
   });
 
-  it('renders the tenant main carousel images at the beginning of the home page', async () => {
-    const mainCarouselImages = [
-      'https://example.com/carousel-1.webp',
-      'https://example.com/carousel-2.webp',
-    ];
+  it('renders the carousel URLs received in tenant extras', async () => {
+    const carousel = ['https://example.com/carousel-1.webp', 'https://example.com/carousel-2.webp'];
 
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
@@ -162,7 +170,7 @@ describe('StoreHomePageComponent', () => {
         },
         {
           provide: TenantService,
-          useValue: createTenantServiceStub(createTenant(mainCarouselImages)),
+          useValue: createTenantServiceStub(createTenant({ carousel })),
         },
       ],
     }).compileComponents();
@@ -171,25 +179,61 @@ describe('StoreHomePageComponent', () => {
     fixture.detectChanges();
 
     const element = fixture.nativeElement as HTMLElement;
-    const carousel = element.querySelector('app-main-carousel');
-    const images = carousel?.querySelectorAll('.main-carousel__image');
+    const carouselElement = element.querySelector('app-main-carousel');
+    const images = carouselElement?.querySelectorAll('.main-carousel__image');
 
-    expect(element.firstElementChild).toBe(carousel);
+    expect(element.firstElementChild).toBe(carouselElement);
     expect(images).toHaveLength(2);
-    expect(images?.[0].getAttribute('src')).toBe(mainCarouselImages[0]);
-    expect(images?.[1].getAttribute('src')).toBeNull();
-    expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(0);
-
-    images?.[0].dispatchEvent(new Event('load'));
-    fixture.detectChanges();
-
-    expect(images?.[1].getAttribute('src')).toBe(mainCarouselImages[1]);
-    expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(1);
-
-    fixture.destroy();
+    expect(images?.[0].getAttribute('src')).toBe(carousel[0]);
   });
 
-  it('does not render the main carousel when the tenant has no images', async () => {
+  it('renders the hero extra and the active tenant event', async () => {
+    const tenant = createTenant({
+      heroConfig: {
+        title_html: '<h1>Fiesta Fútbol Infantil</h1>',
+        description_html: '<p>Viví una jornada inolvidable de fútbol infantil.</p>',
+        background_image_id: 'https://example.com/hero.jpg',
+      },
+    });
+    tenant.active_event_id = 10;
+    tenant.active_event = {
+      id: 10,
+      name: 'Fiesta Fútbol Infantil',
+      address: 'Rosario, Santa Fe',
+      dates: [
+        {
+          id: 20,
+          date: '2026-12-05',
+          time_start: '09:00:00',
+          time_end: '18:00:00',
+        },
+        {
+          id: 21,
+          date: '2026-12-06',
+          time_start: '09:00:00',
+          time_end: '18:00:00',
+        },
+      ],
+    };
+    tenant.website_type_code = 'onticket';
+    tenant.social_media = [
+      {
+        code: 'whatsapp',
+        icon: 'fa-brands fa-whatsapp',
+        name: 'WhatsApp',
+        url: 'https://wa.me/5493410000000',
+      },
+    ];
+    tenant.website_type = {
+      codigo: 'onticket',
+      nombre: 'OnTicket',
+      primary_color: null,
+      secondary_color: null,
+      danger_color: null,
+      success_color: null,
+      site_logo: null,
+    };
+
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
       providers: [
@@ -200,7 +244,7 @@ describe('StoreHomePageComponent', () => {
         },
         {
           provide: TenantService,
-          useValue: createTenantServiceStub(createTenant([])),
+          useValue: createTenantServiceStub(tenant),
         },
       ],
     }).compileComponents();
@@ -208,7 +252,129 @@ describe('StoreHomePageComponent', () => {
     const fixture = TestBed.createComponent(StoreHomePageComponent);
     fixture.detectChanges();
 
-    expect((fixture.nativeElement as HTMLElement).querySelector('app-main-carousel')).toBeNull();
+    const hero = (fixture.nativeElement as HTMLElement).querySelector(
+      'app-hero-banner .hero-banner',
+    ) as HTMLElement;
+
+    expect(hero).not.toBeNull();
+    expect(hero.style.backgroundImage).toContain('https://example.com/hero.jpg');
+    expect(hero.textContent).toContain('Fiesta Fútbol Infantil');
+    expect(hero.textContent).toContain('Viví una jornada inolvidable de fútbol infantil.');
+    expect(hero.textContent).toContain('Rosario, Santa Fe');
+    expect(hero.textContent).toContain('2026-12-05, 2026-12-06');
+    const heroComponent = fixture.debugElement.query(By.directive(HeroBannerComponent))
+      .componentInstance as HeroBannerComponent;
+    expect(heroComponent.eventConfig?.contact).toEqual(tenant.social_media);
+  });
+
+  it('renders additional information as an HTML section', async () => {
+    const description =
+      '<p>Consultá los <strong>términos del evento</strong>.</p><ul><li>Ingreso con DNI</li></ul>';
+
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        {
+          provide: CatalogService,
+          useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
+        },
+        {
+          provide: TenantService,
+          useValue: createTenantServiceStub(
+            createTenant({ additionalInfoConfig: { description } }),
+          ),
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const section = element.querySelector('.store-home__additional-info');
+    const sections = element.querySelectorAll(':scope > app-store-section');
+
+    expect(sections[sections.length - 1]).toBe(section);
+    expect(section?.querySelector('.store-section__title')?.textContent?.trim()).toBe(
+      'Información adicional',
+    );
+    expect(section?.querySelector('strong')?.textContent).toBe('términos del evento');
+    expect(section?.querySelector('li')?.textContent).toBe('Ingreso con DNI');
+  });
+
+  it('does not render the additional information section without content', async () => {
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        {
+          provide: CatalogService,
+          useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
+        },
+        {
+          provide: TenantService,
+          useValue: createTenantServiceStub(
+            createTenant({ additionalInfoConfig: { description: '   ' } }),
+          ),
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+
+    expect(
+      (fixture.nativeElement as HTMLElement).querySelector('.store-home__additional-info'),
+    ).toBeNull();
+  });
+
+  it('renders only the active event data when the tenant does not have the hero extra', async () => {
+    const tenant = createTenant();
+    tenant.active_event_id = 12;
+    tenant.active_event = {
+      id: 12,
+      name: 'Fiesta Fútbol Infantil',
+      address: 'Sunchales, Santa Fe',
+      dates: [
+        {
+          id: 25,
+          date: '2026-10-09',
+          time_start: '09:00:00',
+          time_end: '18:00:00',
+        },
+      ],
+    };
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        {
+          provide: CatalogService,
+          useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
+        },
+        {
+          provide: TenantService,
+          useValue: createTenantServiceStub(tenant),
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const heroComponent = fixture.debugElement.query(By.directive(HeroBannerComponent))
+      .componentInstance as HeroBannerComponent;
+
+    expect(heroComponent.heroConfig).toBeNull();
+    expect(element.querySelector('.hero-banner')).toBeNull();
+    expect(element.querySelector('.hero-banner-container')).toBeNull();
+    expect(element.querySelector('.hero-content')).toBeNull();
+    expect(element.querySelector('.event-card')).not.toBeNull();
+    expect(element.textContent).toContain('Fiesta Fútbol Infantil');
+    expect(element.textContent).toContain('Sunchales, Santa Fe');
+    expect(element.textContent).toContain('2026-10-09');
   });
 
   it('requests another page for the selected featured group', async () => {
@@ -216,7 +382,9 @@ describe('StoreHomePageComponent', () => {
     const catalogServiceStub = {
       getCatalog: vi.fn(),
       getFeaturedGroupItems: vi.fn().mockReturnValue(of(createItemsPage(pageTwoItems, 2, 2))),
+      withCustomLoading: vi.fn(),
     };
+    catalogServiceStub.withCustomLoading.mockReturnValue(catalogServiceStub);
 
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
@@ -232,6 +400,7 @@ describe('StoreHomePageComponent', () => {
     (element.querySelector('[data-testid="paginator-next"]') as HTMLButtonElement).click();
     fixture.detectChanges();
 
+    expect(catalogServiceStub.withCustomLoading).toHaveBeenCalledOnce();
     expect(catalogServiceStub.getFeaturedGroupItems).toHaveBeenCalledWith(7, { page: 2 });
     expect(element.textContent).toContain('Mouse Gamer');
     expect(element.querySelector('[data-testid="paginator-status"]')?.textContent?.trim()).toBe(
@@ -244,7 +413,9 @@ describe('StoreHomePageComponent', () => {
     const catalogServiceStub = {
       getCatalog: vi.fn(),
       getFeaturedGroupItems: vi.fn().mockReturnValue(nextPage.asObservable()),
+      withCustomLoading: vi.fn(),
     };
+    catalogServiceStub.withCustomLoading.mockReturnValue(catalogServiceStub);
 
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
@@ -318,9 +489,9 @@ describe('StoreHomePageComponent', () => {
   it('adds a product-list cart event to the cart', async () => {
     const catalogServiceStub = { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() };
     const cartServiceStub = {
-      addItem: vi.fn().mockReturnValue(
-        of({ data: {}, message: 'Producto agregado correctamente' }),
-      ),
+      addItem: vi
+        .fn()
+        .mockReturnValue(of({ data: {}, message: 'Producto agregado correctamente' })),
     };
     const toastServiceStub = { success: vi.fn(), danger: vi.fn() };
 

src/app/features/store/pages/store-home-page/store-home-page.component.ts

@@ -60,9 +60,34 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
   protected readonly error = signal<string | null>(null);
   protected readonly mainCarouselReady = signal(false);
   protected readonly creatingDirectPurchase = signal(false);
-  protected readonly hasMainCarouselImages = computed(
-    () => (this.tenant()?.main_carousel_images?.length ?? 0) > 0,
+  protected readonly mainCarouselImages = computed(() => this.tenant()?.extras?.carousel ?? []);
+  protected readonly heroConfig = computed(() => this.tenant()?.extras?.heroConfig ?? null);
+  protected readonly additionalInfo = computed(
+    () => this.tenant()?.extras?.additionalInfoConfig?.description?.trim() || null,
   );
+  protected readonly eventConfig = computed(() => {
+    const tenant = this.tenant();
+    const contact = tenant?.social_media ?? [];
+    const activeEvent = tenant?.active_event;
+
+    if (activeEvent) {
+      return {
+        id: activeEvent.id,
+        title: activeEvent.name,
+        location: activeEvent.address,
+        dates: activeEvent.dates.map((eventDate) => ({
+          id: eventDate.id,
+          date: eventDate.date,
+          start_time: eventDate.time_start,
+          end_time: eventDate.time_end,
+        })),
+        contact,
+      };
+    }
+
+    return null;
+  });
+  protected readonly hasMainCarouselImages = computed(() => this.mainCarouselImages().length > 0);
 
   private catalogRequestSubscription: Subscription | null = null;
   private readonly groupRequestSubscriptions = new Map<number, Subscription>();
@@ -105,21 +130,24 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
     this.setGroupLoading(groupId, true);
     this.groupRequestSubscriptions.get(groupId)?.unsubscribe();
 
-    const subscription = this.catalogService.getFeaturedGroupItems(groupId, { page }).subscribe({
-      next: (items) => {
-        this.catalog.update((groups) =>
-          groups.map((candidate) =>
-            candidate.id === groupId ? { ...candidate, items } : candidate,
-          ),
-        );
-        this.error.set(null);
-      },
-      error: () => {
-        this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
-        this.setGroupLoading(groupId, false);
-      },
-      complete: () => this.setGroupLoading(groupId, false),
-    });
+    const subscription = this.catalogService
+      .withCustomLoading()
+      .getFeaturedGroupItems(groupId, { page })
+      .subscribe({
+        next: (items) => {
+          this.catalog.update((groups) =>
+            groups.map((candidate) =>
+              candidate.id === groupId ? { ...candidate, items } : candidate,
+            ),
+          );
+          this.error.set(null);
+        },
+        error: () => {
+          this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+          this.setGroupLoading(groupId, false);
+        },
+        complete: () => this.setGroupLoading(groupId, false),
+      });
 
     this.groupRequestSubscriptions.set(groupId, subscription);
   }
@@ -182,15 +210,18 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
     this.error.set(null);
     this.catalogRequestSubscription?.unsubscribe();
 
-    this.catalogRequestSubscription = this.catalogService.getCatalog().subscribe({
-      next: (catalog) => this.catalog.set(catalog),
-      error: () => {
-        this.catalog.set([]);
-        this.loading.set(false);
-        this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
-      },
-      complete: () => this.loading.set(false),
-    });
+    this.catalogRequestSubscription = this.catalogService
+      .withCustomLoading()
+      .getCatalog()
+      .subscribe({
+        next: (catalog) => this.catalog.set(catalog),
+        error: () => {
+          this.catalog.set([]);
+          this.loading.set(false);
+          this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+        },
+        complete: () => this.loading.set(false),
+      });
   }
 
   private applyResolvedData(resolvedData: StoreHomeCatalogResolvedData): void {

src/app/features/store/store.routes.ts

@@ -116,9 +116,13 @@ export const routes: Routes = [
       {
         path: 'ayuda',
         canActivate: [hasMenuGuard('help')],
+        data: {
+          menuCode: 'help',
+          navigationLabel: 'Secciones de ayuda',
+        },
         loadComponent: () =>
-          import('./pages/help-page/sidebar-layout/help-sidebar-layout').then(
-            (m) => m.HelpSidebarLayout,
+          import('./components/menu-page-layout/menu-page-layout.component').then(
+            (m) => m.MenuPageLayoutComponent,
           ),
         children: [
           {
@@ -152,8 +156,14 @@ export const routes: Routes = [
       {
         path: 'mi-cuenta',
         canActivate: [authGuard, hasMenuGuard('account')],
+        data: {
+          menuCode: 'account',
+          navigationLabel: 'Secciones de mi cuenta',
+        },
         loadComponent: () =>
-          import('./pages/account-page/sidebar-layout/sidebar-layout').then((m) => m.SidebarLayout),
+          import('./components/menu-page-layout/menu-page-layout.component').then(
+            (m) => m.MenuPageLayoutComponent,
+          ),
         children: [
           {
             path: 'datos-personales',

src/app/shared/components/button/button.component.scss

@@ -1,8 +1,4 @@
 :host {
-  display: inline-block;
-}
-
-:host(.product-detail__cta) {
   display: block;
   width: 100%;
 }
@@ -11,10 +7,6 @@
   min-height: 40px;
   font-weight: 700;
   font-size: 15px;
-  min-width: 216px;
-}
-
-:host(.product-detail__cta) .btn {
   width: 100%;
 }
 

src/app/shared/components/cart/cart.component.scss

@@ -87,3 +87,13 @@
   display: flex;
   gap: 12px;
 }
+
+@media (max-width: 767.98px) {
+  .cart-actions {
+    flex-direction: column;
+
+    ::ng-deep app-button {
+      width: 100%;
+    }
+  }
+}

src/app/shared/components/global-loading/global-loading.component.html

@@ -0,0 +1,11 @@
+@if (isLoading()) {
+  <div
+    class="global-loading"
+    role="status"
+    aria-live="polite"
+    aria-label="Cargando"
+  >
+    <span class="global-loading__spinner" aria-hidden="true"></span>
+    <span class="visually-hidden">Cargando...</span>
+  </div>
+}

src/app/shared/components/global-loading/global-loading.component.scss

@@ -0,0 +1,31 @@
+.global-loading {
+  position: fixed;
+  inset: 0;
+  z-index: 3000;
+  display: grid;
+  place-items: center;
+  background: rgba(255, 255, 255, 0.64);
+  backdrop-filter: blur(2px);
+  cursor: wait;
+}
+
+.global-loading__spinner {
+  width: 3rem;
+  height: 3rem;
+  border: 0.25rem solid rgba(32, 32, 32, 0.12);
+  border-top-color: var(--tenant-primary, #6376f3);
+  border-radius: 50%;
+  animation: global-loading-spin 0.75s linear infinite;
+}
+
+@keyframes global-loading-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .global-loading__spinner {
+    animation-duration: 1.5s;
+  }
+}

src/app/shared/components/global-loading/global-loading.component.spec.ts

@@ -0,0 +1,54 @@
+import '@angular/compiler';
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { GlobalLoadingService } from '../../../core/services/global-loading/global-loading.service';
+import { GlobalLoadingComponent } from './global-loading.component';
+
+describe('GlobalLoadingComponent', () => {
+  afterEach(() => {
+    TestBed.resetTestingModule();
+  });
+
+  it('renders an accessible overlay while the app is loading', async () => {
+    const loadingState = signal(true);
+
+    await TestBed.configureTestingModule({
+      imports: [GlobalLoadingComponent],
+      providers: [
+        {
+          provide: GlobalLoadingService,
+          useValue: { isLoading: loadingState.asReadonly() }
+        }
+      ]
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(GlobalLoadingComponent);
+    fixture.detectChanges();
+
+    const overlay = fixture.nativeElement.querySelector('.global-loading');
+    expect(overlay).not.toBeNull();
+    expect(overlay.getAttribute('role')).toBe('status');
+    expect(overlay.getAttribute('aria-label')).toBe('Cargando');
+  });
+
+  it('does not render the overlay while the app is idle', async () => {
+    const loadingState = signal(false);
+
+    await TestBed.configureTestingModule({
+      imports: [GlobalLoadingComponent],
+      providers: [
+        {
+          provide: GlobalLoadingService,
+          useValue: { isLoading: loadingState.asReadonly() }
+        }
+      ]
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(GlobalLoadingComponent);
+    fixture.detectChanges();
+
+    expect(fixture.nativeElement.querySelector('.global-loading')).toBeNull();
+  });
+});

src/app/shared/components/global-loading/global-loading.component.ts

@@ -0,0 +1,15 @@
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+
+import { GlobalLoadingService } from '../../../core/services/global-loading/global-loading.service';
+
+@Component({
+  selector: 'app-global-loading',
+  templateUrl: './global-loading.component.html',
+  styleUrl: './global-loading.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class GlobalLoadingComponent {
+  private readonly loadingService = inject(GlobalLoadingService);
+
+  protected readonly isLoading = this.loadingService.isLoading;
+}