feat(contact): enhance contact page to support dynamic social media links and improve data structure

Reviewed-on: https://gitea.quo.ar/tbianchini/shopit-front/pulls/9

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

@@ -1,8 +1,8 @@
 <header class="immersive-header" [class.immersive-header--compact]="!showHero()">
-  <div class="immersive-header__backdrop">
+  <div class="ih-backdrop">
     @if (showHero() && backgroundImageUrl(); as backgroundImage) {
       <img
-        class="immersive-header__backdrop-image"
+        class="ih-backdrop-image"
         [src]="backgroundImage"
         alt=""
         loading="eager"
@@ -12,12 +12,12 @@
     }
   </div>
 
-  <div class="immersive-header__content">
+  <div class="ih-content">
     <nav
-      class="immersive-header__nav container-xl px-3 px-md-4"
+      class="ih-nav container-xl px-3 px-md-4"
       aria-label="Navegación de la tienda"
     >
-      <a routerLink="/" class="immersive-header__brand" aria-label="Ir al inicio">
+      <a routerLink="/" class="ih-brand" aria-label="Ir al inicio">
         @if (logoUrl()) {
           <img
             [src]="logoUrl()"
@@ -29,12 +29,12 @@
         }
       </a>
 
-      <div class="immersive-header__actions">
+      <div class="ih-actions">
         @if (displaySearchBar()) {
           <form
             id="immersive-search"
-            class="immersive-header__search"
+            class="ih-search"
-            [class.immersive-header__search--open]="isSearchOpen()"
+            [class.ih-search--open]="isSearchOpen()"
             role="search"
             (submit)="submitSearch($event)"
           >
@@ -48,7 +48,7 @@
               (valueChange)="showSearchError.set(false)"
             />
             @if (showSearchError()) {
-              <span id="immersive-search-error" class="immersive-header__search-error" role="alert"
+              <span id="immersive-search-error" class="ih-search-error" role="alert"
                 >Ingresá al menos 3 caracteres.</span
               >
             }
@@ -59,7 +59,7 @@
           @if (ticketsMenu(); as menu) {
             <app-button
               variant="primary"
-              hostClass="immersive-header__tickets"
+              hostClass="ih-tickets"
               data-testid="store-header-tickets"
               (click)="ticketsClick.emit()"
             >
@@ -72,7 +72,7 @@
           <button
             #searchToggle
             type="button"
-            class="immersive-header__search-toggle"
+            class="ih-search-toggle"
             aria-label="Buscar productos"
             aria-controls="immersive-search"
             [attr.aria-expanded]="isSearchOpen()"
@@ -93,7 +93,7 @@
           />
         }
 
-        <div class="immersive-header__account">
+        <div class="ih-account">
           <app-icon-button
             variant="user"
             ariaLabel="Mi cuenta"
@@ -109,7 +109,7 @@
               (logoutClick)="onLogoutClick()"
             />
           } @else if (isUserDropdownOpen()) {
-            <div id="immersive-user-dropdown" class="immersive-header__guest-menu">
+            <div id="immersive-user-dropdown" class="ih-guest-menu">
               <button type="button" (click)="isUserDropdownOpen.set(false); loginClick.emit()">
                 Iniciar sesión
               </button>
@@ -121,7 +121,7 @@
 
     @if (checkoutRemainingTime(); as remainingTime) {
       <div
-        class="immersive-header__timer container-xl px-3 px-md-4"
+        class="ih-timer container-xl px-3 px-md-4"
         role="timer"
         aria-label="Tiempo restante de compra"
       >
@@ -131,10 +131,10 @@
 
     @if (showHero()) {
       @if (heroContent(); as content) {
-        <div class="immersive-header__copy">
+        <div class="ih-copy">
-          <p class="immersive-header__eyebrow">{{ content.eyebrow }}</p>
+          <p class="ih-eyebrow">{{ content.eyebrow }}</p>
-          <h1 class="immersive-header__title">{{ content.title }}</h1>
+          <h1 class="ih-title">{{ content.title }}</h1>
-          <p class="immersive-header__description">{{ content.description }}</p>
+          <p class="ih-description">{{ content.description }}</p>
         </div>
       }
 

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

@@ -11,7 +11,7 @@
   background: #f5f5f5;
 }
 
-.immersive-header__content {
+.ih-content {
   grid-area: 1 / 1;
   position: relative;
   z-index: 1;
@@ -20,7 +20,7 @@
   padding-bottom: clamp(1rem, 2vw, 1.5rem);
 }
 
-.immersive-header__backdrop {
+.ih-backdrop {
   grid-area: 1 / 1;
   position: relative;
   z-index: 0;
@@ -28,7 +28,7 @@
   background-color: #101010;
 }
 
-.immersive-header__backdrop-image {
+.ih-backdrop-image {
   position: absolute;
   inset: 0;
   z-index: 0;
@@ -39,8 +39,8 @@
   object-position: center 42%;
 }
 
-.immersive-header__backdrop::before,
+.ih-backdrop::before,
-.immersive-header__backdrop::after {
+.ih-backdrop::after {
   content: '';
   position: absolute;
   inset: 0;
@@ -48,15 +48,15 @@
   pointer-events: none;
 }
 
-.immersive-header__backdrop::before {
+.ih-backdrop::before {
   background: rgba(0, 0, 0, 0.7);
 }
 
-.immersive-header__backdrop::after {
+.ih-backdrop::after {
   background: linear-gradient(180deg, rgba(0, 0, 0, 0.48) 0%, rgba(0, 0, 0, 0.4) 47%, #f5f5f5 100%);
 }
 
-.immersive-header__nav {
+.ih-nav {
   position: relative;
   // Keep the whole navigation stacking context above the hero copy and carousel.
   // Otherwise those later siblings can sit on top of the dropdown and capture
@@ -69,28 +69,28 @@
   min-height: 2.25rem;
 }
 
-.immersive-header__brand {
+.ih-brand {
   display: inline-flex;
   flex: none;
   align-items: center;
 }
-.immersive-header__brand img {
+.ih-brand img {
   display: block;
   width: clamp(105px, 13vw, 145px);
   max-height: 2.25rem;
   object-fit: contain;
 }
-.immersive-header__actions {
+.ih-actions {
   display: flex;
   align-items: center;
   gap: clamp(0.35rem, 1vw, 1rem);
 }
 
-.immersive-header__search {
+.ih-search {
   position: relative;
   width: clamp(115px, 17vw, 205px);
 }
-.immersive-header__search-error {
+.ih-search-error {
   position: absolute;
   top: calc(100% + 0.25rem);
   right: 0;
@@ -99,52 +99,52 @@
   font-size: 0.7rem;
 }
 
-:host ::ng-deep .immersive-header__tickets {
+:host ::ng-deep .ih-tickets {
   width: auto;
 }
-.immersive-header__account {
+.ih-account {
   position: relative;
   // The nav becomes display: contents on mobile, so it cannot provide the
   // stacking context there. Keep the dropdown trigger above following rows.
   z-index: 10;
   display: flex;
 }
-:host ::ng-deep .immersive-header__actions .icon-btn,
+:host ::ng-deep .ih-actions .icon-btn,
-:host ::ng-deep .immersive-header__actions .cart-icon {
+:host ::ng-deep .ih-actions .cart-icon {
   color: var(--tenant-primary, #ff7006);
 }
 
-.immersive-header__copy {
+.ih-copy {
   position: relative;
   z-index: 1;
   margin: clamp(2.1rem, 5vw, 3.25rem) auto 0;
   padding-inline: 1rem;
   text-align: center;
 }
-.immersive-header__eyebrow,
+.ih-eyebrow,
-.immersive-header__title {
+.ih-title {
   font-family: 'Smooch', cursive;
   font-weight: 400;
   text-shadow: 0 2px 12px rgba(0, 0, 0, 0.55);
 }
-.immersive-header__eyebrow {
+.ih-eyebrow {
   margin: 0;
   font-size: 50px;
   line-height: 1;
 }
-.immersive-header__title {
+.ih-title {
   margin: -0.15rem 0 0;
   font-size: 140px;
   line-height: 0.7;
 }
-.immersive-header__description {
+.ih-description {
   margin: 30px 0 0;
   font-family: 'Gotham Book', sans-serif;
   font-size: 18px;
   font-weight: 300;
   text-shadow: 0 1px 5px rgba(0, 0, 0, 0.6);
 }
-.immersive-header__timer {
+.ih-timer {
   position: relative;
   z-index: 1;
   margin-top: 0.75rem;
@@ -163,27 +163,27 @@
   color: #666666;
   background: transparent;
 
-  .immersive-header__content {
+  .ih-content {
     padding: 35px 0 36px;
   }
 
-  .immersive-header__nav {
+  .ih-nav {
     flex-wrap: nowrap;
     gap: 0.75rem;
     min-height: 44px;
   }
 
-  .immersive-header__brand img {
+  .ih-brand img {
     width: clamp(92px, 24vw, 145px);
   }
 
-  .immersive-header__actions {
+  .ih-actions {
     flex: 0 1 auto;
     gap: 0.375rem;
   }
 }
 
-.immersive-header__search-toggle {
+.ih-search-toggle {
   display: none;
   flex: none;
   align-items: center;
@@ -203,7 +203,7 @@
   }
 }
 
-.immersive-header__guest-menu {
+.ih-guest-menu {
   position: absolute;
   top: calc(100% + 0.5rem);
   right: 0;
@@ -224,7 +224,7 @@
 }
 
 :host ::ng-deep .immersive-header--compact {
-  .immersive-header__tickets {
+  .ih-tickets {
     flex: none;
     width: auto;
 
@@ -234,58 +234,58 @@
     }
   }
 
-  .immersive-header__account .icon-btn {
+  .ih-account .icon-btn {
     width: 32px;
     height: 44px;
     color: #888;
   }
 }
-.immersive-header--compact .immersive-header__backdrop {
+.immersive-header--compact .ih-backdrop {
   display: none;
 }
 
-:host ::ng-deep .immersive-header--compact .immersive-header__actions .icon-btn,
+:host ::ng-deep .immersive-header--compact .ih-actions .icon-btn,
-:host ::ng-deep .immersive-header--compact .immersive-header__actions .cart-icon {
+:host ::ng-deep .immersive-header--compact .ih-actions .cart-icon {
   color: #888;
 }
 
 @media (max-width: 359.98px) {
-  .immersive-header--compact .immersive-header__nav {
+  .immersive-header--compact .ih-nav {
     padding-inline: 1rem !important;
     gap: 0.375rem;
   }
 
-  .immersive-header--compact .immersive-header__actions {
+  .immersive-header--compact .ih-actions {
     gap: 0.125rem;
   }
 }
 
 @media (max-width: 600px) {
-  .immersive-header__nav {
+  .ih-nav {
     flex-wrap: wrap;
     gap: 0.5rem;
   }
-  .immersive-header__actions {
+  .ih-actions {
     flex: 1;
     justify-content: flex-end;
   }
-  .immersive-header__search {
+  .ih-search {
     width: clamp(105px, 38vw, 180px);
   }
-  .immersive-header__copy {
+  .ih-copy {
     margin-top: 3rem;
   }
-  .immersive-header__eyebrow {
+  .ih-eyebrow {
     font-size: clamp(2rem, 8vw, 50px);
   }
-  .immersive-header__title {
+  .ih-title {
     font-size: clamp(3rem, 12vw, 5rem);
   }
 }
 
 @media (max-width: 767.98px) {
   .immersive-header--compact {
-    .immersive-header__search {
+    .ih-search {
       position: absolute;
       top: calc(100% + 0.5rem);
       right: 8vw;
@@ -297,17 +297,17 @@
       box-shadow: 0 4px 16px #0002;
     }
 
-    .immersive-header__search--open {
+    .ih-search--open {
       display: block;
     }
 
-    .immersive-header__search-error {
+    .ih-search-error {
       position: static;
       display: block;
       margin-top: 0.25rem;
     }
 
-    .immersive-header__search-toggle {
+    .ih-search-toggle {
       display: inline-flex;
     }
   }
@@ -315,7 +315,7 @@
   .immersive-header:not(.immersive-header--compact) {
     min-height: 0;
 
-    .immersive-header__content {
+    .ih-content {
       display: grid;
       grid-template-columns: minmax(0, 1fr) auto auto;
       align-items: center;
@@ -324,17 +324,17 @@
     }
 
     // Keep one search form while placing it below the hero copy on mobile.
-    .immersive-header__nav,
+    .ih-nav,
-    .immersive-header__actions {
+    .ih-actions {
       display: contents;
     }
 
-    .immersive-header__brand {
+    .ih-brand {
       grid-area: 1 / 1;
       margin-left: 8vw;
     }
 
-    .immersive-header__brand img {
+    .ih-brand img {
       width: clamp(105px, 34vw, 145px);
     }
 
@@ -342,30 +342,30 @@
       grid-area: 1 / 2;
     }
 
-    .immersive-header__account {
+    .ih-account {
       grid-area: 1 / 3;
       margin-right: calc(8vw - 0.75rem);
     }
 
-    .immersive-header__timer {
+    .ih-timer {
       grid-area: 2 / 1 / auto / -1;
     }
 
-    .immersive-header__copy {
+    .ih-copy {
       grid-area: 3 / 1 / auto / -1;
       margin: 1.25rem 0 0;
     }
 
-    .immersive-header__eyebrow {
+    .ih-eyebrow {
       font-size: clamp(18px, 5.5vw, 24px);
     }
 
-    .immersive-header__title {
+    .ih-title {
       font-size: clamp(40px, 12vw, 56px);
       line-height: 0.7;
     }
 
-    .immersive-header__description {
+    .ih-description {
       margin-top: 30px;
       font-size: clamp(11px, 3vw, 14px);
       line-height: 1.5;
@@ -373,14 +373,14 @@
       text-shadow: none;
     }
 
-    .immersive-header__search {
+    .ih-search {
       grid-area: 4 / 1 / auto / -1;
       width: 74%;
       max-width: 28rem;
       margin: 0.5rem auto 0;
     }
 
-    .immersive-header__search-error {
+    .ih-search-error {
       right: auto;
       left: 0;
       width: 100%;
@@ -395,11 +395,11 @@
       --carousel-offset: -9vw;
     }
 
-    .immersive-header__backdrop-image {
+    .ih-backdrop-image {
       object-position: center 42%;
     }
 
-    .immersive-header__backdrop {
+    .ih-backdrop {
       // Keep the fade tied to the hero, independent of the content below it.
       align-self: start;
       height: 12.5rem;
@@ -407,7 +407,7 @@
       mask-image: linear-gradient(#000 calc(100% - 8px), transparent 100%);
     }
 
-    .immersive-header__backdrop::after {
+    .ih-backdrop::after {
       background: linear-gradient(
         180deg,
         rgba(0, 0, 0, 0.25) 0%,
@@ -420,7 +420,7 @@
   }
 
   :host ::ng-deep .immersive-header:not(.immersive-header--compact) {
-    .immersive-header__search .form-control {
+    .ih-search .form-control {
       min-height: 36px;
       padding: 0.25rem 2.5rem 0.25rem 0.75rem;
       border: 1px solid #888;
@@ -439,12 +439,12 @@
       }
     }
 
-    .immersive-header__search .input-search-icon {
+    .ih-search .input-search-icon {
       color: #666;
       right: 0.75rem;
     }
 
-    .immersive-header__account .icon-btn {
+    .ih-account .icon-btn {
       min-width: 44px;
       min-height: 44px;
 

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

@@ -73,8 +73,8 @@
     [logoUrl]="tenant()?.footer_logo ?? null"
     [backgroundImageUrl]="tenant()?.footer_bg_image ?? null"
     [storeName]="tenant()?.nombre ?? null"
-    [address]="tenant()?.address ?? null"
+    [address]="tenant()?.main_address?.address_text ?? null"
-    [phone]="tenant()?.phone ?? null"
+    [phone]="tenant()?.main_phone_number?.number ?? null"
     (logoutClick)="onLogoutClick()"
   />
 </div>

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

@@ -35,7 +35,9 @@ const tenant: Tenant = {
   nombre: 'Test Tenant',
   dominio: 'localhost',
   address: 'Calle Test 123, Rosario',
+  main_address: { id: 1, label: 'Principal', address_text: 'Calle Test 123, Rosario', latitude: null, longitude: null },
   phone: '+54 341 555 1234',
+  main_phone_number: { id: 1, label: 'Principal', number: '+54 341 555 1234', tel_url: 'tel:+543415551234' },
   primary_color: '#6376F3',
   secondary_color: '#A0A0A0',
   danger_color: '#FF8888',
@@ -274,21 +276,21 @@ describe('StoreLayoutComponent', () => {
     expect(header.componentInstance.headerType()).toBe('immersive');
     expect(element.querySelector('app-standard-store-header')).toBeNull();
     expect(element.querySelector('app-immersive-store-header')).not.toBeNull();
-    expect(element.querySelector('.immersive-header__eyebrow')?.textContent).toContain(
+    expect(element.querySelector('.ih-eyebrow')?.textContent).toContain(
       'Encendé tu',
     );
-    expect(element.querySelector('.immersive-header__title')?.textContent).toContain('experiencia');
+    expect(element.querySelector('.ih-title')?.textContent).toContain('experiencia');
-    expect(element.querySelector('.immersive-header__description')?.textContent).toContain(
+    expect(element.querySelector('.ih-description')?.textContent).toContain(
       'Reservá tu entrada',
     );
     const backdropImage = element.querySelector<HTMLImageElement>(
-      '.immersive-header__backdrop-image',
+      '.ih-backdrop-image',
     );
     expect(backdropImage?.getAttribute('src')).toBe(tenant.header_bg_image);
     expect(backdropImage?.getAttribute('loading')).toBe('eager');
     expect(backdropImage?.getAttribute('fetchpriority')).toBe('high');
     expect(backdropImage?.getAttribute('decoding')).toBe('async');
-    const headerLogo = element.querySelector<HTMLImageElement>('.immersive-header__brand img');
+    const headerLogo = element.querySelector<HTMLImageElement>('.ih-brand img');
     expect(headerLogo?.getAttribute('loading')).toBe('eager');
     expect(headerLogo?.getAttribute('fetchpriority')).toBe('high');
     expect(headerLogo?.getAttribute('decoding')).toBe('async');
@@ -563,6 +565,36 @@ describe('StoreLayoutComponent', () => {
     );
   });
 
+  it('uses only the main address in the footer', () => {
+    tenantState.set({ ...tenant, main_address: {
+      id: 10, label: 'Principal', address_text: 'Sede principal 456', latitude: null, longitude: null,
+    } });
+    const fixture = TestBed.createComponent(StoreLayoutComponent);
+    fixture.detectChanges();
+    const footer = fixture.nativeElement.querySelector('app-store-footer') as HTMLElement;
+    expect(footer.textContent).toContain('Sede principal 456');
+    expect(footer.textContent).not.toContain(tenant.address);
+    tenantState.set({ ...tenant, main_address: null });
+    fixture.detectChanges();
+    expect(footer.textContent).not.toContain('Sede principal 456');
+    expect(footer.textContent).not.toContain(tenant.address);
+  });
+
+  it('uses only the main phone number in the footer', () => {
+    tenantState.set({ ...tenant, main_phone_number: {
+      id: 10, label: 'Principal', number: '3411234567', tel_url: 'tel:3411234567',
+    } });
+    const fixture = TestBed.createComponent(StoreLayoutComponent);
+    fixture.detectChanges();
+    const footer = fixture.nativeElement.querySelector('app-store-footer') as HTMLElement;
+    expect(footer.textContent).toContain('3411234567');
+    expect(footer.textContent).not.toContain(tenant.phone);
+    tenantState.set({ ...tenant, main_phone_number: null });
+    fixture.detectChanges();
+    expect(footer.textContent).not.toContain('3411234567');
+    expect(footer.textContent).not.toContain(tenant.phone);
+  });
+
   it('navigates to search results when the search button is clicked', () => {
     const router = TestBed.inject(Router);
     vi.spyOn(router, 'navigate');

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

@@ -0,0 +1,11 @@
+export interface Address {
+  id: number;
+  label: string;
+  address_text: string;
+  latitude: number | null;
+  longitude: number | null;
+}
+
+export interface TenantAddress extends Address {
+  is_main: boolean;
+}

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

@@ -1,4 +1,5 @@
 import { ApiPaginatedResponse } from '../api-paginated-response.interface';
+import { Address } from '../address.interface';
 
 export interface StoreEvent {
   id: number;
@@ -8,6 +9,7 @@ export interface StoreEvent {
   subtitle: string | null;
   description: string | null;
   location: string | null;
+  address?: Address | null;
   exact_location: { latitude: number; longitude: number } | null;
   date_text: string | null;
   start_time?: string | null;

src/app/core/services/phone-number.interface.ts

@@ -0,0 +1,10 @@
+export interface PhoneNumber {
+  id: number;
+  label: string;
+  number: string;
+  tel_url: string;
+}
+
+export interface TenantPhoneNumber extends PhoneNumber {
+  is_main: boolean;
+}

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

@@ -1,4 +1,6 @@
 import { ApiResponse } from './api-response.interface';
+import { Address, TenantAddress } from './address.interface';
+import { PhoneNumber, TenantPhoneNumber } from './phone-number.interface';
 
 export type CartEditingPolicyCode = 'disabled' | 'quantity_and_remove' | 'full';
 
@@ -69,13 +71,14 @@ export interface TenantEvent {
   subtitle: string | null;
   description: string | null;
   location: string | null;
+  address?: Address | null;
   date_text: string | null;
   dates: ActiveEventDate[];
   social_media: SocialMedia[];
 }
 
 export interface WebsiteExtras {
-  carousel?: string[];
+  carousel?: (string | { desktop: string; mobile: string })[];
   immersiveHeroCarousel?: string[];
   immersiveHero?: {
     eyebrow: string;
@@ -121,7 +124,11 @@ export interface Tenant {
   site_title?: string | null;
   asset_url?: string | null;
   address?: string | null;
+  addresses?: TenantAddress[];
+  main_address?: Address | null;
   phone?: string | null;
+  phone_numbers?: TenantPhoneNumber[];
+  main_phone_number?: PhoneNumber | null;
   favicon?: string | null;
   primary_color: string;
   secondary_color: string;

src/app/features/store/components/event-card/event-card.component.html

@@ -12,8 +12,8 @@
     @if (event().date_text) {
       <p class="event-card__meta"><i class="fa-regular fa-calendar" aria-hidden="true"></i>{{ event().date_text }}</p>
     }
-    @if (event().location) {
+    @if (event().address?.address_text; as location) {
-      <p class="event-card__meta"><i class="fa-solid fa-location-dot" aria-hidden="true"></i>{{ event().location }}</p>
+      <p class="event-card__meta"><i class="fa-solid fa-location-dot" aria-hidden="true"></i>{{ location }}</p>
     }
   </div>
 </a>

src/app/features/store/components/product-carousel/product-carousel.component.html

@@ -62,13 +62,7 @@
           (click)="selectImage(idx)"
           [attr.aria-label]="'Select image ' + (idx + 1)"
         >
-          <img
+          <img [src]="image" alt="Product thumbnail" class="w-100 h-100 object-fit-cover" />
-            [src]="image"
-            alt="Product thumbnail"
-            loading="lazy"
-            decoding="async"
-            class="w-100 h-100 object-fit-cover"
-          />
         </button>
       }
     </div>

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

@@ -24,8 +24,8 @@
               {{ item.date_text }}@if (item.dates?.length === 1 && item.start_time) { · {{ item.start_time.slice(0, 5) }} h }
             </p>
           }
-          @if (item.location) {
+          @if (item.address?.address_text; as location) {
-            <p><i class="fa-solid fa-location-dot" aria-hidden="true"></i>{{ item.location }}</p>
+            <p><i class="fa-solid fa-location-dot" aria-hidden="true"></i>{{ location }}</p>
           }
         </div>
       </header>

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

@@ -0,0 +1,67 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute, convertToParamMap, provideRouter } from '@angular/router';
+import { of } from 'rxjs';
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import { AuthService } from '../../../../core/services/auth/auth.service';
+import { CheckoutService } from '../../../../core/services/checkout.service';
+import { StoreEvent } from '../../../../core/services/event/event.interface';
+import { EventService } from '../../../../core/services/event/event.service';
+import { TenantService } from '../../../../core/services/tenant.service';
+import { ToastService } from '../../../../core/services/toast.service';
+import { LocationMapComponent } from '../../../../shared/components/location-map/location-map.component';
+import { EventDetailPageComponent } from './event-detail-page.component';
+
+const event: StoreEvent = {
+  id: 1, slug: 'festival', title: 'Festival', event_category_id: null,
+  subtitle: null, description: null, location: 'Ubicación anterior',
+  exact_location: { latitude: 10, longitude: 20 }, date_text: null,
+  attachment_id: null, image: null,
+  address: { id: 20, label: 'Predio', address_text: 'Dirección del evento 123', latitude: 0, longitude: -60 },
+};
+
+describe('EventDetailPageComponent address', () => {
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [EventDetailPageComponent],
+      providers: [
+        provideRouter([]),
+        { provide: ActivatedRoute, useValue: { paramMap: of(convertToParamMap({ slug: 'festival' })) } },
+        { provide: EventService, useValue: { get: () => of({ data: event }) } },
+        { provide: AuthService, useValue: {} },
+        { provide: CheckoutService, useValue: {} },
+        { provide: TenantService, useValue: { tenant: signal(null) } },
+        { provide: ToastService, useValue: {} },
+      ],
+    }).compileComponents();
+  });
+
+  it('uses the event address for its text and map including zero coordinates', () => {
+    const fixture = TestBed.createComponent(EventDetailPageComponent);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toContain('Dirección del evento 123');
+    expect(fixture.nativeElement.textContent).not.toContain('Ubicación anterior');
+    const map = fixture.debugElement.query(By.directive(LocationMapComponent)).componentInstance as LocationMapComponent;
+    expect(map.locations).toEqual([{ id: 20, label: 'Predio', latitude: 0, longitude: -60, address: 'Dirección del evento 123' }]);
+  });
+
+  it('shows address text without using old map coordinates when the new address has none', () => {
+    TestBed.overrideProvider(EventService, { useValue: { get: () => of({ data: {
+      ...event, address: { ...event.address!, latitude: null, longitude: null },
+    } }) } });
+    const fixture = TestBed.createComponent(EventDetailPageComponent);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toContain('Dirección del evento 123');
+    expect(fixture.nativeElement.querySelector('app-location-map')).toBeNull();
+  });
+
+  it('does not use old location fields when the event has no address', () => {
+    TestBed.overrideProvider(EventService, { useValue: { get: () => of({ data: { ...event, address: null } }) } });
+    const fixture = TestBed.createComponent(EventDetailPageComponent);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).not.toContain('Ubicación anterior');
+    expect(fixture.nativeElement.querySelector('app-location-map')).toBeNull();
+  });
+});

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

@@ -41,15 +41,15 @@ export class EventDetailPageComponent {
   protected readonly submitting = signal(false);
   protected readonly mapLocations = computed<MapLocation[]>(() => {
     const event = this.event();
-    const coordinates = event?.exact_location;
+    const address = event?.address;
-    if (!event || !coordinates) return [];
+    if (!event || !address || address.latitude === null || address.longitude === null) return [];
 
     return [{
-      id: event.id,
+      id: address.id,
-      label: event.title,
+      label: address.label,
-      latitude: coordinates.latitude,
+      latitude: address.latitude,
-      longitude: coordinates.longitude,
+      longitude: address.longitude,
-      address: event.location ?? undefined,
+      address: address.address_text,
     }];
   });
   protected readonly total = computed(() => (this.event()?.catalog_items ?? []).reduce((sum, product) => {

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

@@ -1,22 +1,34 @@
 <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) {
+      @for (whatsapp of contact().whatsapp; track whatsapp.code) {
         <a
           class="contact-page__contact-link"
-          [href]="contact().whatsappUrl"
+          [href]="whatsapp.url"
           target="_blank"
           rel="noopener noreferrer"
         >
-          <i class="fa-brands fa-whatsapp" aria-hidden="true"></i>
+          <i [class]="whatsapp.icon" aria-hidden="true"></i>
-          <span>{{ contact().whatsappLabel }}</span>
+          <span>{{ whatsapp.name }}</span>
         </a>
       }
 
-      @if (contact().phone; as phone) {
+      @for (social of contact().socialMedia; track social.code) {
-        <a class="contact-page__contact-link" [href]="phoneUrl(phone)">
+        <a
+          class="contact-page__contact-link"
+          [href]="social.url"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <i [class]="social.icon" aria-hidden="true"></i>
+          <span>{{ social.name }}</span>
+        </a>
+      }
+
+      @for (phone of contact().phones; track phone.id) {
+        <a class="contact-page__contact-link" [href]="phone.tel_url">
           <i class="fa-solid fa-phone" aria-hidden="true"></i>
-          <span>{{ phone }}</span>
+          <span>{{ phone.label }}: {{ phone.number }}</span>
         </a>
       }
 
@@ -35,7 +47,12 @@
         </article>
       }
 
-      @if (!contact().whatsappUrl && !contact().phone && contact().locations.length === 0) {
+      @if (
+        contact().whatsapp.length === 0 &&
+        contact().socialMedia.length === 0 &&
+        contact().phones.length === 0 &&
+        contact().locations.length === 0
+      ) {
         <p class="contact-page__empty">No hay datos de contacto disponibles.</p>
       }
     </div>

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

@@ -19,6 +19,56 @@ const tenant: Tenant = {
   header_logo: '',
   footer_logo: '',
   categories: [],
+  social_media: [
+    {
+      code: 'whatsapp',
+      name: 'WhatsApp',
+      icon: 'fa-brands fa-whatsapp',
+      url: 'https://wa.me/543412602222',
+    },
+    {
+      code: 'instagram',
+      name: 'Instagram',
+      icon: 'fa-brands fa-instagram',
+      url: 'https://www.instagram.com/comercio',
+    },
+  ],
+  phone_numbers: [
+    {
+      id: 1,
+      label: 'Principal',
+      number: '+54 9 (0341) 6658247',
+      tel_url: 'tel:+54903416658247',
+      is_main: true,
+    },
+    { id: 2, label: 'Ventas', number: '3411234567', tel_url: 'tel:3411234567', is_main: false },
+  ],
+  addresses: [
+    {
+      id: 1,
+      label: 'Gigante de Arroyito',
+      address_text: 'Av. Génova 640, Rosario',
+      latitude: -32.913997,
+      longitude: -60.674567,
+      is_main: true,
+    },
+    {
+      id: 2,
+      label: 'Telepagos',
+      address_text: 'Rioja 1150, piso 12, dpto. 3, Rosario',
+      latitude: -32.94682,
+      longitude: -60.63932,
+      is_main: false,
+    },
+    {
+      id: 3,
+      label: 'San Martín 2450',
+      address_text: 'San Martín 2450, Santa Fe',
+      latitude: -31.63333,
+      longitude: -60.7,
+      is_main: false,
+    },
+  ],
   menues: [
     {
       id: 1,
@@ -33,42 +83,8 @@ const tenant: Tenant = {
           code: 'help.contact',
           label: 'Contacto',
           parent_menu_code: 'help',
-          content_type: 'static',
+          content_type: 'dynamic',
           route: '/ayuda/contacto',
-          static_content: {
-            whatsapp: {
-              whatsapp_url: 'https://wa.me/543412602222',
-              whatsapp_label: 'Chatea con nosotros',
-            },
-            phone: '+54 9 (0341) 6658247',
-            locations: {
-              rosario: {
-                label: 'Rosario',
-                addresses: [
-                  {
-                    label: 'Gigante de Arroyito',
-                    address: 'Av. Génova 640, Rosario',
-                    coordinates: [-32.913997, -60.674567],
-                  },
-                  {
-                    label: 'Telepagos',
-                    address: 'Rioja 1150, piso 12, dpto. 3, Rosario',
-                    coordinates: [-32.94682, -60.63932],
-                  },
-                ],
-              },
-              santa_fe: {
-                label: 'Santa Fe',
-                addresses: [
-                  {
-                    label: 'San Martín 2450',
-                    address: 'San Martín 2450, Santa Fe',
-                    coordinates: [-31.63333, -60.7],
-                  },
-                ],
-              },
-            },
-          },
           submenues: [],
         },
       ],
@@ -78,15 +94,17 @@ const tenant: Tenant = {
 
 describe('ContactPage', () => {
   let fixture: ComponentFixture<ContactPage>;
+  let tenantState = signal<Tenant | null>(tenant);
 
   beforeEach(async () => {
+    tenantState = signal<Tenant | null>(tenant);
     await TestBed.configureTestingModule({
       imports: [ContactPage],
       providers: [
         {
           provide: TenantService,
           useValue: {
-            tenant: signal<Tenant | null>(tenant).asReadonly(),
+            tenant: tenantState.asReadonly(),
           },
         },
       ],
@@ -104,7 +122,10 @@ describe('ContactPage', () => {
     const phone = element.querySelector<HTMLAnchorElement>('a[href="tel:+54903416658247"]');
 
     expect(element.textContent).toContain('CONTACTO');
-    expect(whatsapp?.textContent).toContain('Chatea con nosotros');
+    expect(whatsapp?.textContent).toContain('WhatsApp');
+    expect(
+      element.querySelector('a[href="https://www.instagram.com/comercio"]')?.textContent,
+    ).toContain('Instagram');
     expect(phone?.textContent).toContain('+54 9 (0341) 6658247');
     expect(element.textContent).toContain('Rosario');
     expect(element.textContent).toContain('Gigante de Arroyito');
@@ -112,11 +133,9 @@ describe('ContactPage', () => {
     expect(element.querySelector('.contact-page__addresses')?.textContent).toContain(
       'Av. Génova 640, Rosario',
     );
-    expect(element.querySelector('.contact-page__addresses')?.textContent).toContain(
+    expect(element.textContent).toContain('Rioja 1150, piso 12, dpto. 3, Rosario');
-      'Rioja 1150, piso 12, dpto. 3, Rosario',
+    expect(element.textContent).toContain('Santa Fe');
-    );
+    expect(element.textContent).toContain('San Martín 2450');
-    expect(element.textContent).not.toContain('Santa Fe');
-    expect(element.textContent).not.toContain('San Martín 2450');
   });
 
   it('passes the tenant map coordinates to the reusable map component', () => {
@@ -129,12 +148,147 @@ describe('ContactPage', () => {
 
     expect(map).not.toBeNull();
     expect(map?.getAttribute('mapstyle')).toBe('standard');
-    expect(accessibleLocations).toHaveLength(2);
+    expect(accessibleLocations).toHaveLength(3);
     expect(map?.textContent).toContain('Gigante de Arroyito');
     expect(map?.textContent).toContain('Telepagos');
     expect(map?.textContent).toContain('Av. Génova 640, Rosario');
     expect(map?.textContent).toContain('Rioja 1150, piso 12, dpto. 3, Rosario');
-    expect(directionsLinks).toHaveLength(2);
+    expect(directionsLinks).toHaveLength(3);
-    expect(map?.textContent).not.toContain('San Martín 2450');
+    expect(map?.textContent).toContain('San Martín 2450');
+  });
+
+  it('renders canonical numbers with the main first and never restores legacy numbers', () => {
+    const element = fixture.nativeElement as HTMLElement;
+    expect(element.querySelectorAll('a[href^="tel:"]')).toHaveLength(2);
+    expect(element.querySelector('a[href^="tel:"]')?.textContent).toContain('Principal');
+    tenantState.set({ ...tenant, phone: '999999', phone_numbers: [] });
+    fixture.detectChanges();
+    expect(element.querySelectorAll('a[href^="tel:"]')).toHaveLength(0);
+    expect(element.textContent).not.toContain('999999');
+    expect(element.textContent).not.toContain('+54 9 (0341) 6658247');
+  });
+
+  it('shows every canonical address and maps only addresses with coordinates', () => {
+    tenantState.set({
+      ...tenant,
+      addresses: [
+        {
+          id: 10,
+          label: 'Principal',
+          address_text: 'Nueva sede 123',
+          latitude: 0,
+          longitude: 0,
+          is_main: true,
+        },
+        {
+          id: 11,
+          label: 'Sucursal sin mapa',
+          address_text: 'Otra calle 456',
+          latitude: null,
+          longitude: null,
+          is_main: false,
+        },
+        {
+          id: 12,
+          label: 'Otra ciudad',
+          address_text: 'Tercera 789',
+          latitude: -31,
+          longitude: -60,
+          is_main: false,
+        },
+      ],
+    });
+    fixture.detectChanges();
+    const element = fixture.nativeElement as HTMLElement;
+    expect(element.textContent).toContain('Nueva sede 123');
+    expect(element.textContent).toContain('Otra calle 456');
+    expect(element.textContent).toContain('Tercera 789');
+    expect(element.textContent).not.toContain('Av. Génova 640');
+    expect(element.querySelectorAll('.contact-page__location')).toHaveLength(3);
+    expect(element.querySelectorAll('app-location-map .visually-hidden li')).toHaveLength(2);
+  });
+
+  it('does not restore old menu addresses when the canonical list is empty', () => {
+    tenantState.set({ ...tenant, addresses: [] });
+    fixture.detectChanges();
+    expect(fixture.nativeElement.querySelectorAll('.contact-page__location')).toHaveLength(0);
+    expect(fixture.nativeElement.querySelector('app-location-map')).toBeNull();
+  });
+
+  it('does not read old menu addresses when the address list is absent', () => {
+    tenantState.set({ ...tenant, addresses: undefined });
+    fixture.detectChanges();
+    expect(fixture.nativeElement.querySelectorAll('.contact-page__location')).toHaveLength(0);
+  });
+
+  it('updates contact when the resolved social media changes to the active event channels', () => {
+    tenantState.set({
+      ...tenant,
+      social_media: [
+        {
+          code: 'whatsapp',
+          name: 'WhatsApp del evento',
+          icon: 'fa-brands fa-whatsapp',
+          url: 'https://wa.me/541111111111',
+        },
+      ],
+    });
+    fixture.detectChanges();
+    const element = fixture.nativeElement as HTMLElement;
+    expect(element.querySelector('a[href="https://wa.me/541111111111"]')?.textContent).toContain(
+      'WhatsApp del evento',
+    );
+    expect(element.querySelector('a[href="https://wa.me/543412602222"]')).toBeNull();
+    expect(element.textContent).not.toContain('Instagram');
+  });
+
+  it('shows the main address first without reordering tenant data', () => {
+    const addresses = [...tenant.addresses!].reverse();
+    tenantState.set({ ...tenant, addresses });
+    fixture.detectChanges();
+    expect(
+      fixture.nativeElement.querySelector('.contact-page__location-title')?.textContent,
+    ).toContain('Gigante de Arroyito');
+    expect(addresses[0].id).toBe(3);
+  });
+
+  it('ignores legacy static content and shows the empty state when no canonical data exists', () => {
+    tenantState.set({
+      ...tenant,
+      addresses: [],
+      phone_numbers: [],
+      social_media: [],
+      menues: [
+        {
+          ...tenant.menues![0].submenues[0],
+          static_content: {
+            whatsapp: {
+              whatsapp_url: 'https://wa.me/549999999999',
+              whatsapp_label: 'Legacy WhatsApp',
+            },
+          },
+        },
+      ],
+    });
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toContain('No hay datos de contacto disponibles.');
+    expect(fixture.nativeElement.textContent).not.toContain('Legacy WhatsApp');
+    expect(fixture.nativeElement.querySelector('a')).toBeNull();
+    expect(fixture.nativeElement.querySelector('app-location-map')).toBeNull();
+  });
+
+  it('shows social-only contact and ignores blank social URLs', () => {
+    tenantState.set({
+      ...tenant,
+      addresses: [],
+      phone_numbers: [],
+      social_media: [tenant.social_media![1], { ...tenant.social_media![0], url: '   ' }],
+    });
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toContain('Instagram');
+    expect(fixture.nativeElement.textContent).not.toContain(
+      'No hay datos de contacto disponibles.',
+    );
+    expect(fixture.nativeElement.textContent).not.toContain('WhatsApp');
   });
 });

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

@@ -1,7 +1,8 @@
 import { Component, computed, inject } from '@angular/core';
 
-import { findMenu } from '../../../../../../core/services/menu.utils';
 import { TenantService } from '../../../../../../core/services/tenant.service';
+import { TenantPhoneNumber } from '../../../../../../core/services/phone-number.interface';
+import { SocialMedia } from '../../../../../../core/services/tenant.interface';
 import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import {
   LocationMapComponent,
@@ -18,13 +19,13 @@ type ContactAddress = {
   id: string;
   label: string;
   address: string;
-  coordinates: [number, number];
+  coordinates: [number, number] | null;
 };
 
 type ContactContent = {
-  whatsappUrl: string | null;
+  whatsapp: SocialMedia[];
-  whatsappLabel: string | null;
+  socialMedia: SocialMedia[];
-  phone: string | null;
+  phones: TenantPhoneNumber[];
   locations: ContactLocation[];
   mapLocations: MapLocation[];
 };
@@ -42,108 +43,52 @@ export class ContactPage {
     () => this.tenantService.tenant()?.primary_color ?? '#6376f3',
   );
 
-  protected readonly contact = computed(() =>
+  protected readonly contact = computed(() => this.buildContactContent());
-    this.parseContactContent(
-      findMenu(this.tenantService.tenant()?.menues ?? [], 'help.contact')?.static_content,
-    ),
-  );
 
-  protected phoneUrl(phone: string): string {
+  private buildContactContent(): ContactContent {
-    const normalizedPhone = phone.replace(/[^\d+]/g, '');
+    const tenant = this.tenantService.tenant();
-    return `tel:${normalizedPhone}`;
+    const socialMedia = (tenant?.social_media ?? []).filter((social) => social.url.trim());
-  }
+    const addresses = [...(tenant?.addresses ?? [])].sort(
-
+      (a, b) => Number(b.is_main) - Number(a.is_main),
-  private parseContactContent(value: unknown): ContactContent {
+    );
-    const empty: ContactContent = {
+    const locations: ContactLocation[] = addresses.map((address) => ({
-      whatsappUrl: null,
+      id: String(address.id),
-      whatsappLabel: null,
+      label: address.label,
-      phone: null,
+      addresses: [
-      locations: [],
+        {
-      mapLocations: [],
+          id: String(address.id),
-    };
+          label: address.label,
-
+          address: address.address_text,
-    if (!this.isRecord(value)) {
+          coordinates:
-      return empty;
+            address.latitude !== null && address.longitude !== null
-    }
+              ? [address.latitude, address.longitude]
-
+              : null,
-    const whatsapp = this.isRecord(value['whatsapp']) ? value['whatsapp'] : null;
+        },
-    const locations = this.parseLocations(value['locations']).slice(0, 1);
+      ],
+    }));
 
     return {
-      whatsappUrl: whatsapp ? this.stringValue(whatsapp['whatsapp_url']) : null,
+      whatsapp: socialMedia.filter((social) => social.code === 'whatsapp'),
-      whatsappLabel: whatsapp ? this.stringValue(whatsapp['whatsapp_label']) : null,
+      socialMedia: socialMedia.filter((social) => social.code !== 'whatsapp'),
-      phone: this.stringValue(value['phone']),
+      phones: [...(tenant?.phone_numbers ?? [])].sort(
+        (a, b) => Number(b.is_main) - Number(a.is_main),
+      ),
       locations,
       mapLocations: locations.flatMap((location) =>
-        location.addresses.map(
+        location.addresses.flatMap((address): MapLocation[] =>
-          (address): MapLocation => ({
+          address.coordinates === null
-            id: address.id,
+            ? []
-            label: address.label,
+            : [
-            latitude: address.coordinates[0],
+                {
-            longitude: address.coordinates[1],
+                  id: address.id,
-            address: address.address,
+                  label: address.label,
-          }),
+                  latitude: address.coordinates[0],
+                  longitude: address.coordinates[1],
+                  address: address.address,
+                },
+              ],
         ),
       ),
     };
   }
-
-  private parseLocations(value: unknown): ContactLocation[] {
-    return this.recordEntries(value).flatMap(([id, item]): ContactLocation[] => {
-      if (!this.isRecord(item)) {
-        return [];
-      }
-
-      const label = this.stringValue(item['label']);
-      const addresses: ContactAddress[] = Array.isArray(item['addresses'])
-        ? item['addresses'].flatMap((address, index): ContactAddress[] => {
-            if (!this.isRecord(address)) {
-              return [];
-            }
-
-            const addressLabel = this.stringValue(address['label']);
-            const addressText = this.stringValue(address['address']);
-            const coordinates = address['coordinates'];
-
-            if (
-              !addressLabel ||
-              !addressText ||
-              !Array.isArray(coordinates) ||
-              coordinates.length !== 2 ||
-              typeof coordinates[0] !== 'number' ||
-              typeof coordinates[1] !== 'number'
-            ) {
-              return [];
-            }
-
-            return [
-              {
-                id: `${id}-${index}`,
-                label: addressLabel,
-                address: addressText,
-                coordinates: [coordinates[0], coordinates[1]],
-              },
-            ];
-          })
-        : [];
-
-      return label && addresses.length > 0 ? [{ id, label, addresses }] : [];
-    });
-  }
-
-  private recordEntries(value: unknown): [string, unknown][] {
-    if (Array.isArray(value)) {
-      return value.map((item, index) => [String(index), item]);
-    }
-
-    return this.isRecord(value) ? Object.entries(value) : [];
-  }
-
-  private stringValue(value: unknown): string | null {
-    return typeof value === 'string' && value.trim() ? value.trim() : null;
-  }
-
-  private isRecord(value: unknown): value is Record<string, unknown> {
-    return typeof value === 'object' && value !== null && !Array.isArray(value);
-  }
 }

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

@@ -23,49 +23,24 @@
   </p>
 } @else {
   @for (group of catalog(); track group.id; let first = $first) {
-    @if (first) {
+    <app-store-section [attr.id]="group.code" [title]="group.title">
-      <ng-container
+      <app-product-list
-        [ngTemplateOutlet]="catalogGroup"
+        [layout]="group.layout"
-        [ngTemplateOutletContext]="{ $implicit: group, prioritizeFirstImage: true }"
+        [groupLayout]="group.group_layout"
+        [items]="group.items"
+        [loading]="isGroupLoading(group.id)"
+        [loadImages]="!hasMainCarouselImages() || mainCarouselReady()"
+        [prioritizeFirstImage]="first && !hasMainCarouselImages()"
+        [unavailableVariantIds]="unavailableVariantIds()"
+        [savingProductIds]="savingProductIds()"
+        (buy)="onBuyProduct($event)"
+        (addToCart)="onAddToCart($event)"
+        (pageChange)="onPageChange(group.id, $event)"
       />
-    } @else {
+    </app-store-section>
-      @defer (on viewport; prefetch on idle) {
-        <ng-container
-          [ngTemplateOutlet]="catalogGroup"
-          [ngTemplateOutletContext]="{ $implicit: group, prioritizeFirstImage: false }"
-        />
-      } @placeholder {
-        <section
-          class="store-home__deferred-group-placeholder"
-          [attr.aria-label]="group.title"
-        ></section>
-      }
-    }
   }
 }
 
-<ng-template
-  #catalogGroup
-  let-group
-  let-prioritizeFirstImage="prioritizeFirstImage"
->
-  <app-store-section [attr.id]="group.code" [title]="group.title">
-    <app-product-list
-      [layout]="group.layout"
-      [groupLayout]="group.group_layout"
-      [items]="group.items"
-      [loading]="isGroupLoading(group.id)"
-      [loadImages]="!hasMainCarouselImages() || mainCarouselReady()"
-      [prioritizeFirstImage]="prioritizeFirstImage && !hasMainCarouselImages()"
-      [unavailableVariantIds]="unavailableVariantIds()"
-      [savingProductIds]="savingProductIds()"
-      (buy)="onBuyProduct($event)"
-      (addToCart)="onAddToCart($event)"
-      (pageChange)="onPageChange(group.id, $event)"
-    />
-  </app-store-section>
-</ng-template>
-
 @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>

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

@@ -15,13 +15,6 @@ app-store-section[id] {
   scroll-margin-top: 8rem;
 }
 
-.store-home__deferred-group-placeholder {
-  display: block;
-  min-height: clamp(24rem, 42vw, 34rem);
-  content-visibility: auto;
-  contain-intrinsic-size: auto 30rem;
-}
-
 :host > .store-home__additional-info:not(:first-child) {
   margin-top: clamp(3rem, 6vw, 5rem);
 }

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

@@ -8,7 +8,6 @@ import {
   inject,
   signal,
 } from '@angular/core';
-import { NgTemplateOutlet } from '@angular/common';
 import { HttpErrorResponse } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
 import { finalize, Subscription } from 'rxjs';
@@ -45,7 +44,6 @@ import {
     ProductListComponent,
     HeroBannerComponent,
     MainCarouselComponent,
-    NgTemplateOutlet,
   ],
   templateUrl: './store-home-page.component.html',
   styleUrl: './store-home-page.component.scss',
@@ -83,7 +81,7 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
       return {
         id: event.id,
         title: event.title,
-        location: event.location,
+        location: event.address?.address_text ?? null,
         dates_text: event.date_text,
         dates: event.dates.map((eventDate) => ({
           id: eventDate.id,

src/app/shared/components/carousel/carousel.component.html

@@ -1,10 +1,4 @@
 <section class="carousel" role="region" [attr.aria-label]="ariaLabel()">
-  <span
-    #sizeProbe
-    class="carousel__size-probe"
-    aria-hidden="true"
-    [style.width]="itemBasis()"
-  ></span>
   <div class="carousel__frame" [class.carousel__frame--with-controls]="hasMultipleItems()">
     <div
       #viewport

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

@@ -4,17 +4,8 @@
 }
 
 .carousel {
-  position: relative;
   width: 100%;
 
-  &__size-probe {
-    position: absolute;
-    height: 0;
-    visibility: hidden;
-    pointer-events: none;
-    contain: strict;
-  }
-
   &__frame {
     position: relative;
     display: grid;

src/app/shared/components/carousel/carousel.component.spec.ts

@@ -1,6 +1,6 @@
 import { Component, signal, TemplateRef, viewChild } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { CarouselComponent, CarouselItemContext } from './carousel.component';
 
 interface TestItem {
@@ -16,7 +16,7 @@ interface TestItem {
     </ng-template>
 
     <app-carousel
-      [items]="items()"
+      [items]="items"
       [itemTemplate]="itemTemplate"
       [scrollStep]="120"
       [gap]="16"
@@ -28,11 +28,11 @@ interface TestItem {
 class TestHostComponent {
   readonly circular = signal(false);
 
-  readonly items = signal<TestItem[]>([
+  readonly items: TestItem[] = [
     { id: 1, label: 'Primero' },
     { id: 2, label: 'Segundo' },
     { id: 3, label: 'Tercero' },
-  ]);
+  ];
 
   readonly carousel = viewChild.required(CarouselComponent<TestItem>);
   readonly itemTemplate =
@@ -41,47 +41,8 @@ class TestHostComponent {
 
 describe('CarouselComponent', () => {
   let fixture: ComponentFixture<TestHostComponent>;
-  let frames: Map<number, FrameRequestCallback>;
-  let resize: () => void;
-  let disconnect: ReturnType<typeof vi.fn>;
-  const flushLayout = () => {
-    const pending = [...frames.values()];
-    frames.clear();
-    pending.forEach((callback) => callback(0));
-    fixture.detectChanges();
-  };
-  const setDimensions = (width: number, basis: number) => {
-    const host = fixture.nativeElement.querySelector('app-carousel');
-    Object.defineProperty(host, 'clientWidth', { configurable: true, value: width });
-    const probe = fixture.nativeElement.querySelector('.carousel__size-probe');
-    probe.getBoundingClientRect = () => ({ width: basis }) as DOMRect;
-  };
 
   beforeEach(async () => {
-    frames = new Map();
-    let frameId = 0;
-    vi.stubGlobal(
-      'requestAnimationFrame',
-      vi.fn((callback: FrameRequestCallback) => {
-        frames.set(++frameId, callback);
-        return frameId;
-      }),
-    );
-    vi.stubGlobal(
-      'cancelAnimationFrame',
-      vi.fn((id: number) => frames.delete(id)),
-    );
-    disconnect = vi.fn();
-    vi.stubGlobal(
-      'ResizeObserver',
-      class {
-        constructor(callback: () => void) {
-          resize = callback;
-        }
-        observe() {}
-        disconnect = disconnect;
-      },
-    );
     await TestBed.configureTestingModule({
       imports: [TestHostComponent],
     }).compileComponents();
@@ -90,75 +51,6 @@ describe('CarouselComponent', () => {
     fixture.detectChanges();
   });
 
-  afterEach(() => {
-    fixture.destroy();
-    vi.unstubAllGlobals();
-  });
-
-  it('agrupa las mediciones y no se realimenta al renderizar o navegar', async () => {
-    fixture.componentInstance.circular.set(true);
-    setDimensions(650, 200);
-    fixture.detectChanges();
-    resize();
-    resize();
-    expect(frames.size).toBe(1);
-    flushLayout();
-    await Promise.resolve();
-    expect(frames.size).toBe(0);
-    const carousel = fixture.componentInstance.carousel();
-    expect(carousel['itemsPerPage']()).toBe(2);
-    carousel.next();
-    fixture.detectChanges();
-    const track = fixture.nativeElement.querySelector('.carousel__track');
-    track.dispatchEvent(new TransitionEvent('transitionend', { propertyName: 'transform' }));
-    fixture.detectChanges();
-    await Promise.resolve();
-    resize(); // Same width, even if the new cards have a different height.
-    expect(frames.size).toBe(0);
-    expect(carousel['currentPage']()).toBe(1);
-    expect(carousel['itemWidth']()).toBe(269);
-  });
-
-  it('recalcula al cambiar el ancho y la base responsive de las tarjetas', () => {
-    setDimensions(650, 200);
-    resize();
-    flushLayout();
-    setDimensions(350, 200);
-    resize();
-    flushLayout();
-    expect(fixture.componentInstance.carousel()['itemsPerPage']()).toBe(1);
-    setDimensions(350, 100);
-    resize();
-    flushLayout();
-    expect(fixture.componentInstance.carousel()['itemsPerPage']()).toBe(2);
-    expect(frames.size).toBe(0);
-  });
-
-  it('actualiza productos y admite una lista vacía sin anchos inválidos', () => {
-    setDimensions(650, 200);
-    flushLayout();
-    fixture.componentInstance.items.set([]);
-    fixture.detectChanges();
-    expect(frames.size).toBe(1);
-    flushLayout();
-    const carousel = fixture.componentInstance.carousel();
-    expect(carousel['itemWidth']()).toBeNull();
-    expect(carousel['hasOverflow']()).toBe(false);
-    fixture.componentInstance.items.set([{ id: 4, label: 'Nuevo' }]);
-    fixture.detectChanges();
-    flushLayout();
-    expect(carousel['itemWidth']()).toBe(650);
-    expect(fixture.nativeElement.querySelectorAll('article')).toHaveLength(1);
-    expect(frames.size).toBe(0);
-  });
-
-  it('cancela mediciones pendientes y desconecta el observador al destruirse', () => {
-    expect(frames.size).toBe(1);
-    fixture.destroy();
-    expect(frames.size).toBe(0);
-    expect(disconnect).toHaveBeenCalledOnce();
-  });
-
   it('renderiza el template provisto para cada elemento', () => {
     const articles = fixture.nativeElement.querySelectorAll('article');
 
@@ -167,17 +59,6 @@ describe('CarouselComponent', () => {
     expect(articles[1].getAttribute('data-index')).toBe('1');
   });
 
-  it('permite inspeccionar las páginas antes de medir el viewport sin generar listas enormes', () => {
-    const carousel = fixture.componentInstance.carousel();
-    fixture.componentInstance.circular.set(true);
-    carousel['itemsPerPage'].set(Number.MAX_SAFE_INTEGER);
-
-    expect(carousel['circularPages']()).toEqual([]);
-    expect(carousel['createPage']('current', 0).items.map((entry) => entry.item.id)).toEqual([
-      1, 2, 3,
-    ]);
-  });
-
   it('expone una región accesible y controles con etiquetas', () => {
     const region = fixture.nativeElement.querySelector('[role="region"]');
     const buttons = fixture.nativeElement.querySelectorAll('button');
@@ -218,7 +99,7 @@ describe('CarouselComponent', () => {
 
   it('usa todo el ancho y distribuye el espacio sobrante entre elementos completos', () => {
     const host = fixture.nativeElement.querySelector('app-carousel') as HTMLElement;
-    const firstItem = fixture.nativeElement.querySelector('.carousel__size-probe') as HTMLElement;
+    const firstItem = fixture.nativeElement.querySelector('.carousel__item') as HTMLElement;
 
     Object.defineProperty(host, 'clientWidth', {
       configurable: true,
@@ -231,7 +112,7 @@ describe('CarouselComponent', () => {
         }) as DOMRect,
     );
 
-    flushLayout();
+    fixture.componentInstance.carousel().ngAfterViewInit();
     fixture.detectChanges();
 
     const frame = fixture.nativeElement.querySelector('.carousel__frame') as HTMLElement;
@@ -247,7 +128,7 @@ describe('CarouselComponent', () => {
     fixture.detectChanges();
 
     const host = fixture.nativeElement.querySelector('app-carousel') as HTMLElement;
-    const firstItem = fixture.nativeElement.querySelector('.carousel__size-probe') as HTMLElement;
+    const firstItem = fixture.nativeElement.querySelector('.carousel__item') as HTMLElement;
 
     Object.defineProperty(host, 'clientWidth', {
       configurable: true,
@@ -260,7 +141,7 @@ describe('CarouselComponent', () => {
         }) as DOMRect,
     );
 
-    flushLayout();
+    fixture.componentInstance.carousel().ngAfterViewInit();
     fixture.detectChanges();
 
     const pages = fixture.nativeElement.querySelectorAll('.carousel__page');

src/app/shared/components/carousel/carousel.component.ts

@@ -1,6 +1,5 @@
 import {
   AfterViewInit,
-  afterRenderEffect,
   ChangeDetectionStrategy,
   Component,
   DestroyRef,
@@ -11,7 +10,6 @@ import {
   inject,
   input,
   signal,
-  untracked,
   viewChild,
 } from '@angular/core';
 import { isPlatformBrowser, NgTemplateOutlet } from '@angular/common';
@@ -47,15 +45,12 @@ export class CarouselComponent<T> implements AfterViewInit {
   private readonly platformId = inject(PLATFORM_ID);
   private readonly host = inject<ElementRef<HTMLElement>>(ElementRef);
   private readonly viewport = viewChild.required<ElementRef<HTMLElement>>('viewport');
-  private readonly sizeProbe = viewChild.required<ElementRef<HTMLElement>>('sizeProbe');
-  private layoutFrame: number | null = null;
 
   readonly items = input.required<readonly T[]>();
   readonly itemTemplate = input.required<TemplateRef<CarouselItemContext<T>>>();
   readonly trackBy = input<CarouselTrackBy<T>>((index) => index);
   readonly scrollStep = input<number | null>(null);
   readonly gap = input(0);
-  readonly itemBasis = input('16rem');
   readonly circular = input(false);
   readonly ariaLabel = input('Carrusel');
   readonly previousLabel = input('Mostrar elementos anteriores');
@@ -75,10 +70,6 @@ export class CarouselComponent<T> implements AfterViewInit {
   );
   protected readonly isCircularLayout = computed(() => this.circular() && this.pageCount() > 1);
   protected readonly circularPages = computed<CarouselPage<T>[]>(() => {
-    if (!this.isCircularLayout()) {
-      return [];
-    }
-
     const pageCount = this.pageCount();
     const currentPage = this.normalizePage(this.currentPage(), pageCount);
 
@@ -95,51 +86,27 @@ export class CarouselComponent<T> implements AfterViewInit {
     () => !this.hasOverflow() || (!this.circular() && !this.canScrollNext()),
   );
 
-  constructor() {
-    afterRenderEffect(() => {
-      this.items();
-      this.gap();
-      this.circular();
-      this.itemBasis();
-      this.itemTemplate();
-      // Layout outputs must never become dependencies of this effect.
-      untracked(() => this.scheduleLayout());
-    });
-  }
-
-  private scheduleLayout(): void {
-    if (this.destroyRef.destroyed || this.layoutFrame !== null) return;
-    this.layoutFrame = requestAnimationFrame(() => {
-      this.layoutFrame = null;
-      this.refreshLayout();
-    });
-  }
-
   ngAfterViewInit(): void {
     if (!isPlatformBrowser(this.platformId)) {
       return;
     }
 
-    let previousWidth = -1;
+    const viewport = this.viewport().nativeElement;
-    let previousBasis = -1;
+    this.refreshLayout();
+
     const resizeObserver =
-      typeof ResizeObserver === 'undefined'
+      typeof ResizeObserver === 'undefined' ? null : new ResizeObserver(() => this.refreshLayout());
-        ? null
-        : new ResizeObserver(() => {
-            const width = this.host.nativeElement.clientWidth;
-            const basis = this.sizeProbe().nativeElement.getBoundingClientRect().width;
-            // Image loads and page rotation can change height, but not the layout inputs.
-            if (width === previousWidth && basis === previousBasis) return;
-            previousWidth = width;
-            previousBasis = basis;
-            this.scheduleLayout();
-          });
     resizeObserver?.observe(this.host.nativeElement);
-    resizeObserver?.observe(this.sizeProbe().nativeElement);
+
+    const mutationObserver =
+      typeof MutationObserver === 'undefined'
+        ? null
+        : new MutationObserver(() => this.refreshLayout());
+    mutationObserver?.observe(viewport, { childList: true, subtree: true });
 
     this.destroyRef.onDestroy(() => {
       resizeObserver?.disconnect();
-      if (this.layoutFrame !== null) cancelAnimationFrame(this.layoutFrame);
+      mutationObserver?.disconnect();
     });
   }
 
@@ -251,32 +218,24 @@ export class CarouselComponent<T> implements AfterViewInit {
   }
 
   private refreshLayout(): void {
-    const itemCount = this.items().length;
+    const viewport = this.viewport().nativeElement;
+    const firstItem = viewport.querySelector<HTMLElement>('.carousel__item');
     const availableWidth = this.host.nativeElement.clientWidth;
     const availableViewportWidth = Math.max(
       availableWidth - (this.hasMultipleItems() ? CarouselComponent.CONTROL_SLOT_WIDTH * 2 : 0),
       0,
     );
 
-    if (itemCount === 0) {
+    if (!firstItem || availableViewportWidth <= 0) {
-      this.itemsPerPage.set(1);
-      this.currentPage.set(0);
-      this.transitionDirection.set(0);
-      this.itemWidth.set(null);
-      this.hasOverflow.set(false);
-      this.canScrollPrevious.set(false);
-      this.canScrollNext.set(false);
-      return;
-    }
-
-    if (availableViewportWidth <= 0) {
       this.itemWidth.set(null);
       this.refreshNavigation();
       return;
     }
 
-    // Measure a stable CSS basis, never a card whose content/width we just changed.
+    const assignedWidth = firstItem.style.width;
-    const naturalItemWidth = this.sizeProbe().nativeElement.getBoundingClientRect().width;
+    firstItem.style.width = '';
+    const naturalItemWidth = firstItem.getBoundingClientRect().width;
+    firstItem.style.width = assignedWidth;
 
     if (naturalItemWidth <= 0) {
       this.itemWidth.set(null);
@@ -285,9 +244,9 @@ export class CarouselComponent<T> implements AfterViewInit {
     }
 
     const gap = this.resolvedGap();
-    const fittingItems = Math.min(
+    const fittingItems = Math.max(
-      itemCount,
+      1,
-      Math.max(1, Math.floor((availableViewportWidth + gap) / (naturalItemWidth + gap))),
+      Math.floor((availableViewportWidth + gap) / (naturalItemWidth + gap)),
     );
     const visibleItems = Math.min(fittingItems, this.items().length);
     const distributedItemWidth =
@@ -299,12 +258,7 @@ export class CarouselComponent<T> implements AfterViewInit {
       this.transitionDirection.set(0);
     }
 
-    if (this.itemWidth() !== distributedItemWidth) this.itemWidth.set(distributedItemWidth);
+    this.itemWidth.set(distributedItemWidth);
-    const normalizedPage = this.normalizePage(this.currentPage(), this.pageCount());
-    if (normalizedPage !== this.currentPage()) {
-      this.currentPage.set(normalizedPage);
-      this.transitionDirection.set(0);
-    }
     if (this.circular()) {
       const hasOverflow = this.items().length > fittingItems;
       this.hasOverflow.set(hasOverflow);
@@ -316,20 +270,14 @@ export class CarouselComponent<T> implements AfterViewInit {
   }
 
   private createPage(slot: CarouselPage<T>['slot'], page: number): CarouselPage<T> {
-    const sourceItems = this.items();
-    // Layout has not necessarily been measured when a computed value is inspected.
-    const pageSize = Math.min(this.itemsPerPage(), sourceItems.length);
-    if (pageSize === 0) {
-      return { slot, items: [] };
-    }
     const pageCount = this.pageCount();
     const normalizedPage = this.normalizePage(page, pageCount);
-    const start = normalizedPage * pageSize;
+    const start = normalizedPage * this.itemsPerPage();
     const items: CarouselPageItem<T>[] = [];
 
-    for (let offset = 0; offset < pageSize; offset += 1) {
+    for (let offset = 0; offset < this.itemsPerPage(); offset += 1) {
-      const index = (start + offset) % sourceItems.length;
+      const index = (start + offset) % this.items().length;
-      items.push({ item: sourceItems[index], index });
+      items.push({ item: this.items()[index], index });
     }
 
     return { slot, items };

src/app/shared/components/main-carousel/main-carousel.component.html

@@ -12,18 +12,21 @@
 >
   <div class="main-carousel__viewport" aria-live="off">
     @for (image of images(); track $index; let index = $index) {
-      <img
+      <picture>
-        class="main-carousel__image"
+        <source media="(max-width: 576px)" [attr.srcset]="mobileImageSource(image, index)" />
-        [class.main-carousel__image--active]="index === activeIndex()"
+        <img
-        [attr.src]="imageSource(image, index)"
+          class="main-carousel__image"
-        [alt]="imageAlt(index)"
+          [class.main-carousel__image--active]="index === activeIndex()"
-        [attr.aria-hidden]="index === activeIndex() ? null : 'true'"
+          [attr.src]="imageSource(image, index)"
-        loading="eager"
+          [alt]="imageAlt(index)"
-        [attr.fetchpriority]="index === activeIndex() ? 'high' : 'low'"
+          [attr.aria-hidden]="index === activeIndex() ? null : 'true'"
-        draggable="false"
+          loading="eager"
-        (load)="handleImageLoad(index)"
+          [attr.fetchpriority]="index === activeIndex() ? 'high' : 'low'"
-        (error)="handleImageError(index)"
+          draggable="false"
-      />
+          (load)="handleImageLoad(index)"
+          (error)="handleImageError(index)"
+        />
+      </picture>
     }
   </div>
 

src/app/shared/components/main-carousel/main-carousel.component.scss

@@ -17,9 +17,7 @@
   &__viewport {
     position: relative;
     width: 100%;
-    aspect-ratio: 4 / 1;
+    aspect-ratio: 355 / 90;
-    min-height: 9rem;
-    max-height: 25rem;
   }
 
   &__image {

src/app/shared/components/main-carousel/main-carousel.component.spec.ts

@@ -18,12 +18,20 @@ class TestHostComponent {
   readonly images = ['/images/one.webp', '/images/two.webp', '/images/three.webp'];
 }
 
+@Component({
+  imports: [MainCarouselComponent],
+  template: `<app-main-carousel [images]="images" />`,
+})
+class ResponsiveTestHostComponent {
+  readonly images = [{ desktop: '/images/desktop.webp', mobile: '/images/mobile.webp' }];
+}
+
 describe('MainCarouselComponent', () => {
   let fixture: ComponentFixture<TestHostComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [TestHostComponent],
+      imports: [TestHostComponent, ResponsiveTestHostComponent],
     }).compileComponents();
 
     fixture = TestBed.createComponent(TestHostComponent);
@@ -41,6 +49,19 @@ describe('MainCarouselComponent', () => {
     expect(images[0].classList).toContain('main-carousel__image--active');
   });
 
+  it('usa la variante móvil del crop cuando está disponible', () => {
+    const responsiveFixture = TestBed.createComponent(ResponsiveTestHostComponent);
+    responsiveFixture.detectChanges();
+
+    const picture = responsiveFixture.nativeElement.querySelector('picture') as HTMLPictureElement;
+    const source = picture.querySelector('source') as HTMLSourceElement;
+    const image = picture.querySelector('img') as HTMLImageElement;
+
+    expect(source.getAttribute('media')).toBe('(max-width: 576px)');
+    expect(source.getAttribute('srcset')).toBe('/images/mobile.webp');
+    expect(image.getAttribute('src')).toBe('/images/desktop.webp');
+  });
+
   it('carga las imágenes secuencialmente y prioriza la imagen visible', () => {
     const images = fixture.nativeElement.querySelectorAll(
       '.main-carousel__image',

src/app/shared/components/main-carousel/main-carousel.component.ts

@@ -11,6 +11,9 @@ import {
   signal,
 } from '@angular/core';
 import { isPlatformBrowser } from '@angular/common';
+import type { WebsiteExtras } from '../../../core/services/tenant.interface';
+
+type CarouselImage = NonNullable<WebsiteExtras['carousel']>[number];
 
 @Component({
   selector: 'app-main-carousel',
@@ -26,7 +29,7 @@ export class MainCarouselComponent {
   private readonly settledIndexes = signal<ReadonlySet<number>>(new Set());
   private firstImageReadyEmitted = false;
 
-  readonly images = input.required<readonly string[]>();
+  readonly images = input.required<readonly CarouselImage[]>();
   readonly imageAlts = input<readonly string[]>([]);
   readonly autoSlideInterval = input(5000);
   readonly ariaLabel = input('Imágenes destacadas');
@@ -91,13 +94,21 @@ export class MainCarouselComponent {
     this.paused.set(paused);
   }
 
-  protected imageSource(image: string, index: number): string | null {
+  protected imageSource(image: CarouselImage, index: number): string | null {
     const shouldLoad =
       this.loadedIndexes().has(index) ||
       index === this.sequentialLoadIndex() ||
       index === this.activeIndex();
 
-    return shouldLoad ? image : null;
+    return shouldLoad ? (typeof image === 'string' ? image : image.desktop) : null;
+  }
+
+  protected mobileImageSource(image: CarouselImage, index: number): string | null {
+    if (typeof image === 'string' || this.imageSource(image, index) === null) {
+      return null;
+    }
+
+    return image.mobile;
   }
 
   protected handleImageLoad(index: number): void {

src/app/shared/components/product-list/product-list.component.html

@@ -67,9 +67,6 @@
     [itemTemplate]="productItem"
     [trackBy]="trackProduct"
     [gap]="24"
-    [itemBasis]="
-      effectiveLayout() === 'row' ? 'clamp(18rem, 70vw, 32rem)' : 'clamp(15rem, 30vw, 18rem)'
-    "
     [circular]="true"
     ariaLabel="Productos destacados"
   />