diff --git a/src/app/components/back-button/back-button.component.ts b/src/app/components/back-button/back-button.component.ts index 9db8137..afd18ea 100644 --- a/src/app/components/back-button/back-button.component.ts +++ b/src/app/components/back-button/back-button.component.ts @@ -1,19 +1,16 @@ import { Component, ChangeDetectionStrategy, inject } from '@angular/core'; import { Location } from '@angular/common'; import { TranslateService } from '../../i18n/translate.service'; -import { UiRuntimeFacade } from '../../facades/runtime/ui-runtime.facade'; @Component({ selector: 'app-back-button', template: ` - @if (!isMarketplaceNovo) { - - } + `, styles: [` .dexar-back-btn { @@ -62,13 +59,8 @@ import { UiRuntimeFacade } from '../../facades/runtime/ui-runtime.facade'; changeDetection: ChangeDetectionStrategy.OnPush }) export class BackButtonComponent { - private readonly uiRuntime = inject(UiRuntimeFacade); i18n = inject(TranslateService); - get isMarketplaceNovo(): boolean { - return this.uiRuntime.isMarketplaceVariant('novo'); - } - constructor(private location: Location) {} goBack(): void { diff --git a/src/app/components/footer/footer.component.html b/src/app/components/footer/footer.component.html index 6219e2f..1f15d27 100644 --- a/src/app/components/footer/footer.component.html +++ b/src/app/components/footer/footer.component.html @@ -1,123 +1,41 @@ - -@if (isMarketplaceNovo) { - - diff --git a/src/app/components/footer/footer.component.scss b/src/app/components/footer/footer.component.scss index 2ccf900..e5f2943 100644 --- a/src/app/components/footer/footer.component.scss +++ b/src/app/components/footer/footer.component.scss @@ -1,560 +1,108 @@ -:host { +:host { display: block; width: 100%; + margin-top: auto; +} + +.app-footer { + background: var(--text-primary, #1e3c38); + color: #fff; +} + +.app-footer__container { + width: 100%; } -// ========== LAVERO FOOTER STYLES ========== -.lavero-footer { - background: linear-gradient(135deg, #1a1208 0%, #2d1a00 100%); - color: white; - margin-top: auto; - padding: 3rem 0 0; - border-top: 3px solid var(--primary-color, #FD7300); -} - -.lavero-footer-container { - max-width: 1400px; - margin: 0 auto; - padding: 0 2rem; -} - -.lavero-footer-top { +.app-footer__top { display: grid; - grid-template-columns: 2fr 1fr 1fr 1fr; - gap: 3rem; - padding-bottom: 3rem; - border-bottom: 1px solid rgba(253, 115, 0, 0.2); -} - -.lavero-footer-brand { - display: flex; - flex-direction: column; - gap: 1rem; -} - -.lavero-footer-logo { - width: 140px; - height: 48px; - - app-logo { - display: block; - width: 100%; - height: 100%; - } -} - -.lavero-footer-col { - h4 { - font-size: 1.1rem; - font-weight: 600; - margin-bottom: 1.25rem; - color: var(--primary-color, #FD7300); - } - - .lavero-footer-desc { - color: rgba(255, 255, 255, 0.65); - line-height: 1.6; - font-size: 0.9rem; - } -} - -.lavero-footer-links { - list-style: none; - padding: 0; - margin: 0; - - li { - margin-bottom: 0.75rem; - - a { - color: rgba(255, 255, 255, 0.7); - text-decoration: none; - font-size: 0.9rem; - transition: color 0.2s, transform 0.2s; - display: inline-block; - - &:hover { - color: var(--primary-color, #FD7300); - transform: translateX(4px); - } - } - } -} - -.lavero-footer-bottom { - display: flex; - justify-content: space-between; - align-items: center; - padding: 1.5rem 0; -} - -.lavero-copyright { - p { - color: rgba(255, 255, 255, 0.5); - font-size: 0.85rem; - margin: 0; - } -} - -.lavero-payment-icons { - display: flex; - gap: 0.75rem; - align-items: center; - - img { - height: 26px; - width: auto; - background: white; - padding: 0.25rem 0.5rem; - border-radius: 5px; - opacity: 0.85; - transition: opacity 0.2s; - - &:hover { - opacity: 1; - } - } -} - -@media (max-width: 968px) { - .lavero-footer-top { - grid-template-columns: 1fr 1fr; - gap: 2rem; - } -} - -@media (max-width: 600px) { - .lavero-footer { - padding: 2rem 0 0; - } - - .lavero-footer-container { - padding: 0 1rem; - } - - .lavero-footer-top { - grid-template-columns: 1fr; - gap: 1.5rem; - padding-bottom: 1.5rem; - } - - .lavero-footer-bottom { - flex-direction: column; - gap: 1rem; - padding: 1rem 0; - text-align: center; - } -} - -.footer { - background-color: #1a1a1a; - color: #ffffff; - margin-top: auto; - padding: 3rem 0 1rem; - border-top: 1px solid #333; - - .footer-container { - max-width: 1200px; - margin: 0 auto; - padding: 0 2rem; - display: grid; - grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); - gap: 2rem; - } - - .footer-section { - h3 { - font-size: 1.1rem; - font-weight: 600; - margin-bottom: 1rem; - color: #ffffff; - } - - ul { - list-style: none; - padding: 0; - margin: 0; - - li { - margin-bottom: 0.5rem; - - a { - color: #b0b0b0; - text-decoration: none; - transition: color 0.2s ease; - font-size: 0.95rem; - - &:hover { - color: #ffffff; - } - } - } - } - - &.payment-systems { - .payment-logos { - display: flex; - gap: 1rem; - align-items: center; - flex-wrap: wrap; - - .payment-logo { - height: 40px; - width: auto; - background: white; - padding: 0.5rem; - border-radius: 4px; - } - } - } - } - - .footer-bottom { - max-width: 1200px; - margin: 0 auto; - padding: 2rem 2rem 0; - margin-top: 2rem; - border-top: 1px solid #333; - text-align: center; - - p { - color: #808080; - font-size: 0.9rem; - margin: 0; - } - } - - @media (max-width: 768px) { - padding: 2rem 0 1rem; - - .footer-container { - grid-template-columns: 1fr; - gap: 1.5rem; - padding: 0 1rem; - } - - .footer-section { - h3 { - font-size: 1rem; - } - } - } -} - -// ========== novo FOOTER STYLES ========== -.novo-footer { - background: var(--text-primary); - color: white; - margin-top: auto; - padding: 3rem 0 0; -} - -.novo-footer-container { - max-width: 1400px; - margin: 0 auto; - padding: 0 2rem; -} - -.novo-footer-top { - display: grid; - grid-template-columns: 2fr 1fr 1fr 1fr; - gap: 3rem; - padding-bottom: 3rem; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); -} - -.novo-footer-col { - h4 { - font-size: 1.1rem; - font-weight: 600; - margin-bottom: 1.25rem; - color: white; - } - - .novo-footer-desc { - color: rgba(255, 255, 255, 0.7); - line-height: 1.6; - font-size: 0.95rem; - } -} - -.novo-footer-links { - list-style: none; - padding: 0; - margin: 0; - - li { - margin-bottom: 0.75rem; - - a { - color: rgba(255, 255, 255, 0.7); - text-decoration: none; - font-size: 0.95rem; - transition: all 0.3s; - display: inline-block; - - &:hover { - color: white; - transform: translateX(4px); - } - } - } -} - -.novo-footer-bottom { - display: flex; - justify-content: space-between; - align-items: center; - padding: 1.5rem 0; -} - -.novo-copyright { - p { - color: rgba(255, 255, 255, 0.6); - font-size: 0.9rem; - margin: 0; - } -} - -.novo-payment-icons { - display: flex; - gap: 0.75rem; - align-items: center; - - img { - height: 28px; - width: auto; - background: white; - padding: 0.25rem 0.5rem; - border-radius: 6px; - opacity: 0.9; - transition: opacity 0.3s; - - &:hover { - opacity: 1; - } - } -} - -@media (max-width: 968px) { - .novo-footer-top { - grid-template-columns: 1fr 1fr; - gap: 2rem; - } -} - -@media (max-width: 600px) { - .novo-footer { - padding: 2rem 0 0; - } - - .novo-footer-container { - padding: 0 1rem; - } - - .novo-footer-top { - grid-template-columns: 1fr; - gap: 2rem; - padding-bottom: 2rem; - } - - .novo-footer-bottom { - flex-direction: column; - gap: 1rem; - padding: 1rem 0; - text-align: center; - } -} - -// ========== DEXAR FOOTER STYLES ========== -.dexar-footer { - margin-top: auto; -} - -.dexar-footer-bg { - background-image: url('/assets/images/footer_bg.webp'); - background-size: cover; - background-position: center; - background-repeat: no-repeat; - position: relative; - overflow: hidden; - - &::before { - content: ''; - position: absolute; - inset: 0; - background: rgba(30, 60, 56, 0.85); - } -} - -.dexar-footer-container { - position: relative; - z-index: 1; - max-width: 1440px; - margin: 0 auto; - padding: 48px 40px 24px; -} - -.dexar-footer-top { - display: flex; - gap: 48px; - padding-bottom: 32px; + grid-template-columns: 2fr repeat(3, minmax(160px, 1fr)); + gap: 1.5rem; + padding-bottom: 1.5rem; border-bottom: 1px solid rgba(255, 255, 255, 0.15); } -.dexar-footer-logo { - flex-shrink: 0; - display: flex; - align-items: flex-start; - padding-top: 4px; - - .dexar-footer-logo-desktop { - display: block; - height: 40px; - width: auto; - filter: brightness(0) invert(1); - } - - .dexar-footer-logo-mobile { - display: none; - height: 32px; - width: auto; - filter: brightness(0) invert(1); - } -} - -.dexar-footer-columns { - flex: 1; +.app-footer__brand { display: grid; - grid-template-columns: repeat(4, 1fr); - gap: 32px; + gap: 0.75rem; + + p { + margin: 0; + color: rgba(255, 255, 255, 0.8); + line-height: 1.5; + } } -.dexar-footer-col { +.app-footer__group { h4 { - font-family: "DM Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; - font-size: 15px; - font-weight: 600; - color: #ffffff; - margin: 0 0 16px 0; + margin: 0 0 0.75rem; + font-size: 0.95rem; + color: #fff; } ul { list-style: none; - padding: 0; margin: 0; - - li { - margin-bottom: 10px; - - a { - font-family: "DM Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; - font-size: 13px; - font-weight: 400; - color: rgba(255, 255, 255, 0.7); - text-decoration: none; - transition: color 0.2s ease; - - &:hover { - color: #ffffff; - } - } - } + padding: 0; + display: grid; + gap: 0.5rem; } -} -.dexar-payment-logos { - display: flex; - gap: 10px; - flex-wrap: wrap; - align-items: center; - - img { - height: 28px; - max-height: 28px; - width: auto; - max-width: 60px; - background: rgba(255, 255, 255, 0.9); - padding: 4px 8px; - border-radius: 4px; - transition: opacity 0.2s; - object-fit: contain; + a { + color: rgba(255, 255, 255, 0.8); + text-decoration: none; &:hover { - opacity: 0.85; + color: #fff; } } } -.dexar-footer-bottom { - padding: 20px 0 0; - text-align: center; +.app-footer__payments { + display: flex; + gap: 0.5rem; + flex-wrap: wrap; + + img { + border-radius: 4px; + background: #fff; + padding: 2px 6px; + } +} + +.app-footer__bottom { + display: flex; + justify-content: space-between; + align-items: center; + gap: 1rem; + padding-top: 1rem; + padding-bottom: 0.5rem; p { - font-family: "DM Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; - font-size: 12px; - color: rgba(255, 255, 255, 0.5); margin: 0; + color: rgba(255, 255, 255, 0.7); + font-size: 0.85rem; + } + + a { + color: rgba(255, 255, 255, 0.85); + text-decoration: none; + font-size: 0.85rem; } } -// Responsive -@media (max-width: 992px) { - .dexar-footer-container { - padding: 40px 32px 20px; +@media (max-width: 960px) { + .app-footer__top { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } +} + +@media (max-width: 640px) { + .app-footer__top { + grid-template-columns: 1fr; } - .dexar-footer-top { + .app-footer__bottom { flex-direction: column; - gap: 32px; - } - - .dexar-footer-columns { - grid-template-columns: repeat(2, 1fr); - } -} - -@media (max-width: 768px) { - .dexar-footer-bg { - background-image: url('/assets/images/footer_bg_mobile.webp'); - } - - .dexar-footer-container { - padding: 32px 20px 16px; - } - - .dexar-footer-logo { - .dexar-footer-logo-desktop { - display: none; - } - - .dexar-footer-logo-mobile { - display: block; - } - } - - .dexar-footer-columns { - grid-template-columns: repeat(2, 1fr); - gap: 24px; - } - - .dexar-footer-col h4 { - font-size: 14px; - margin-bottom: 12px; - } - - .dexar-footer-col ul li a { - font-size: 12px; - } -} - -@media (max-width: 480px) { - .dexar-footer-container { - padding: 24px 16px 12px; - } - - .dexar-footer-columns { - grid-template-columns: repeat(2, 1fr); - gap: 16px; + align-items: flex-start; } } diff --git a/src/app/components/footer/footer.component.ts b/src/app/components/footer/footer.component.ts index 8ed4238..26a6f2d 100644 --- a/src/app/components/footer/footer.component.ts +++ b/src/app/components/footer/footer.component.ts @@ -58,14 +58,6 @@ export class FooterComponent { return this.uiRuntime.contactEmail(); } - get isMarketplaceNovo(): boolean { - return this.uiRuntime.isMarketplaceVariant('novo'); - } - - get isMarketplaceLavero(): boolean { - return this.uiRuntime.isMarketplaceVariant('lavero'); - } - private resolveFooterGroups(bootstrap: BootstrapConfig): FooterResolvedGroup[] { const footer = bootstrap.navigation?.footer ?? []; const lang = this.languageService.currentLanguage(); diff --git a/src/app/components/header/header.component.html b/src/app/components/header/header.component.html index 796a153..07c1db5 100644 --- a/src/app/components/header/header.component.html +++ b/src/app/components/header/header.component.html @@ -1,60 +1,3 @@ - -@if (isMarketplaceNovo) { -
-
-
- -
- - - -
- - - - - - - @if (cartItemCount() > 0) { - {{ cartItemCount() }} - } - - @if (cartItemCount() > 0) { - {{ formatCartTotal(cartTotal()) }} - } - - - -
-
-
-} @else {
@@ -171,4 +114,3 @@
-} diff --git a/src/app/components/header/header.component.ts b/src/app/components/header/header.component.ts index 2919f68..ae9c30e 100644 --- a/src/app/components/header/header.component.ts +++ b/src/app/components/header/header.component.ts @@ -39,10 +39,6 @@ export class HeaderComponent { return this.uiRuntime.logoUrl(); } - get isMarketplaceNovo(): boolean { - return this.uiRuntime.isMarketplaceVariant('novo'); - } - get homeUrl(): string { return `/${this.langService.currentLanguage()}`; } diff --git a/src/app/components/items-carousel/items-carousel.component.html b/src/app/components/items-carousel/items-carousel.component.html index 7a57445..b5cd63c 100644 --- a/src/app/components/items-carousel/items-carousel.component.html +++ b/src/app/components/items-carousel/items-carousel.component.html @@ -1,4 +1,4 @@ -
+
@if (loading()) {
diff --git a/src/app/components/items-carousel/items-carousel.component.ts b/src/app/components/items-carousel/items-carousel.component.ts index 3587418..6a63bb7 100644 --- a/src/app/components/items-carousel/items-carousel.component.ts +++ b/src/app/components/items-carousel/items-carousel.component.ts @@ -10,7 +10,6 @@ import { getDiscountedPrice, getMainImage, getBadgeClass, getTranslatedField } f import { LanguageService } from '../../services/language.service'; import { LangRoutePipe } from '../../pipes/lang-route.pipe'; import { TranslatePipe } from '../../i18n/translate.pipe'; -import { UiRuntimeFacade } from '../../facades/runtime/ui-runtime.facade'; import { ProductFacade } from '../../facades/platform/product.facade'; @Component({ @@ -23,7 +22,6 @@ import { ProductFacade } from '../../facades/platform/product.facade'; export class ItemsCarouselComponent implements OnInit { products = signal([]); loading = signal(true); - private readonly uiRuntime = inject(UiRuntimeFacade); private readonly productFacade = inject(ProductFacade); responsiveOptions: { breakpoint: string; numVisible: number; numScroll: number }[] | undefined; @@ -103,7 +101,6 @@ export class ItemsCarouselComponent implements OnInit { readonly getBadgeClass = getBadgeClass; private langService = inject(LanguageService); - get isMarketplaceNovo(): boolean { return this.uiRuntime.isMarketplaceVariant('novo'); } itemName(product: Item): string { return getTranslatedField(product, 'name', this.langService.currentLanguage()); } addToCart(event: Event, item: Item): void { diff --git a/src/app/facades/runtime/ui-runtime.facade.ts b/src/app/facades/runtime/ui-runtime.facade.ts index e3ecb5f..3ae0e07 100644 --- a/src/app/facades/runtime/ui-runtime.facade.ts +++ b/src/app/facades/runtime/ui-runtime.facade.ts @@ -1,7 +1,6 @@ import { Injectable, signal } from '@angular/core'; import { take } from 'rxjs/operators'; import { ConfigService } from '../../core/config/config.service'; -import { environment } from '../../../environments/environment'; interface UiRuntimeState { marketplaceName: string; @@ -9,18 +8,16 @@ interface UiRuntimeState { logoUrl: string; contactEmail: string; themeId: string; - marketplaceVariant: string; } @Injectable({ providedIn: 'root' }) export class UiRuntimeFacade { private readonly state = signal({ - marketplaceName: environment.brandName, - marketplaceDisplayName: environment.brandFullName, - logoUrl: environment.logo, - contactEmail: environment.contactEmail, - themeId: environment.theme, - marketplaceVariant: this.resolveMarketplaceVariant(environment.theme) + marketplaceName: '', + marketplaceDisplayName: '', + logoUrl: '', + contactEmail: '', + themeId: '' }); constructor(private readonly configService: ConfigService) { @@ -30,9 +27,8 @@ export class UiRuntimeFacade { marketplaceName: bootstrap.branding.brandName, marketplaceDisplayName: bootstrap.branding.brandName, logoUrl: bootstrap.branding.logoUrl, - contactEmail: bootstrap.branding.supportEmail ?? environment.contactEmail, - themeId: bootstrap.theme.themeId, - marketplaceVariant: this.resolveMarketplaceVariant(bootstrap.theme.themeId) + contactEmail: bootstrap.branding.supportEmail ?? '', + themeId: bootstrap.theme.themeId }); } }); @@ -57,17 +53,4 @@ export class UiRuntimeFacade { themeId(): string { return this.state().themeId; } - - marketplaceVariant(): string { - return this.state().marketplaceVariant; - } - - isMarketplaceVariant(variant: string): boolean { - return this.marketplaceVariant() === variant; - } - - private resolveMarketplaceVariant(themeId: string): string { - void themeId; - return 'default'; - } } \ No newline at end of file diff --git a/src/app/layouts/containers/dynamic-page-layout.component.ts b/src/app/layouts/containers/dynamic-page-layout.component.ts index d3a819f..d55a4ee 100644 --- a/src/app/layouts/containers/dynamic-page-layout.component.ts +++ b/src/app/layouts/containers/dynamic-page-layout.component.ts @@ -1,11 +1,14 @@ import { CommonModule } from '@angular/common'; import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { NgComponentOutlet } from '@angular/common'; +import { Router } from '@angular/router'; import { Observable } from 'rxjs'; import { PageRenderModel } from '../../dynamic-renderer/page-renderer/page-renderer.model'; import { WidgetRenderNode } from '../../dynamic-renderer/widget-host/widget-host.model'; import { ResolvedWidget } from '../../widgets/contracts/widget-component.contract'; import { WidgetHostService } from '../../dynamic-renderer/widget-host/widget-host.service'; +import { LanguageService } from '../../services/language.service'; +import { Category } from '../../core/categories/models/category-domain.model'; @Component({ selector: 'app-dynamic-page-layout', @@ -33,7 +36,7 @@ import { WidgetHostService } from '../../dynamic-renderer/widget-host/widget-hos @for (widget of section.widgets; track widget.id) {
@if (resolveWidget(widget, section, model.id) | async; as resolved) { - + }
} @@ -78,9 +81,17 @@ import { WidgetHostService } from '../../dynamic-renderer/widget-host/widget-hos export class DynamicPageLayoutComponent { @Input() model: PageRenderModel | null = null; - constructor(private readonly widgetHost: WidgetHostService) {} + constructor( + private readonly widgetHost: WidgetHostService, + private readonly router: Router, + private readonly languageService: LanguageService + ) {} resolveWidget(widget: WidgetRenderNode, section: PageRenderModel['sections'][number], pageId: string): Observable { return this.widgetHost.resolveWidget(widget.source, section.source, pageId); } + + onCategorySelected(category: Category): void { + this.router.navigate([`/${this.languageService.currentLanguage()}/catalog`, category.id]); + } } diff --git a/src/app/pages/cart/cart.component.html b/src/app/pages/cart/cart.component.html index f6db6b9..2d6262b 100644 --- a/src/app/pages/cart/cart.component.html +++ b/src/app/pages/cart/cart.component.html @@ -1,4 +1,4 @@ -
+

{{ 'cart.title' | translate }}

@if (itemCount() > 0) { diff --git a/src/app/pages/cart/cart.component.ts b/src/app/pages/cart/cart.component.ts index dbeb372..55d79cb 100644 --- a/src/app/pages/cart/cart.component.ts +++ b/src/app/pages/cart/cart.component.ts @@ -15,7 +15,6 @@ import { LangRoutePipe } from '../../pipes/lang-route.pipe'; import { TranslatePipe } from '../../i18n/translate.pipe'; import { TranslateService } from '../../i18n/translate.service'; import { PAYMENT_POLL_INTERVAL_MS, PAYMENT_MAX_CHECKS, PAYMENT_TIMEOUT_CLOSE_MS, LINK_COPIED_DURATION_MS } from '../../config/constants'; -import { UiRuntimeFacade } from '../../facades/runtime/ui-runtime.facade'; type PaymentMethod = 'qr' | 'card'; @@ -35,14 +34,9 @@ export class CartComponent implements OnDestroy { hasDeliveryPrice; allRequiredDeliveriesSelected; termsAccepted = false; - private readonly uiRuntime = inject(UiRuntimeFacade); private i18n = inject(TranslateService); private authService = inject(AuthService); - - get isMarketplaceNovo(): boolean { - return this.uiRuntime.isMarketplaceVariant('novo'); - } isAuthenticated = this.authService.isAuthenticated; diff --git a/src/app/pages/item-detail/item-detail.component.html b/src/app/pages/item-detail/item-detail.component.html index 68315a9..599185f 100644 --- a/src/app/pages/item-detail/item-detail.component.html +++ b/src/app/pages/item-detail/item-detail.component.html @@ -1,319 +1,3 @@ -@if (isMarketplaceNovo) { - -
- @if (loading()) { -
- -

{{ 'itemDetail.loading' | translate }}

-
- } - - @if (error()) { -
-

{{ error() }}

- {{ 'itemDetail.back' | translate }} -
- } - - @if (item() && !loading()) { -
-
- @if (item()?.photos && item()!.photos!.length > 0) { -
- @if (item()!.photos![selectedPhotoIndex()]?.video) { - - } @else { - - } -
- - @if (item()!.photos!.length > 1) { -
- @for (photo of item()!.photos!; track $index) { -
- @if (photo.video) { -
â–¶
- } - -
- } -
- } - } @else { -
- - - - - -

{{ 'itemDetail.noImage' | translate }}

-
- } -
- -
-

{{ getItemName() }}

- - @if (item()!.badges && item()!.badges!.length > 0) { -
- @for (badge of item()!.badges!; track badge) { - {{ badge }} - } -
- } - - @if (item()!.tags && item()!.tags!.length > 0) { -
- @for (tag of item()!.tags!; track tag) { - #{{ tag }} - } -
- } - -
- {{ getRatingStars(item()!.rating) }} - {{ item()!.rating }} - ({{ item()!.callbacks?.length || 0 }}) -
- -
- @if (item()!.discount > 0) { -
- {{ effectivePrice() }} {{ effectiveCurrency() }} - -{{ item()!.discount }}% -
-
{{ getDiscountedPrice() | number:'1.2-2' }} {{ effectiveCurrency() }}
- } @else { -
{{ effectivePrice() }} {{ effectiveCurrency() }}
- } -
- -
- {{ 'itemDetail.stock' | translate }} -
- - {{ getStockLabel() }} -
- @if (effectiveRemaining() != null) { - ({{ effectiveRemaining() }} шт.) - } -
- - @if (availableColours().length || availableSizes().length || item()!.colour || (item()!.size && item()!.size!.toLowerCase() !== 'default')) { -
- @if (availableColours().length) { -
- {{ 'itemDetail.colour' | translate }}: - @for (c of availableColours(); track c) { - - } -
- } @else if (item()!.colour) { -
- {{ 'itemDetail.colour' | translate }}: - -
- } - @if (availableSizes().length) { -
- {{ 'itemDetail.size' | translate }}: - @for (s of availableSizes(); track s) { - {{ s }} - } -
- } @else if (item()!.size && item()!.size!.toLowerCase() !== 'default') { -
- {{ 'itemDetail.size' | translate }}: - {{ item()!.size }} -
- } -
- } - - @if (item()!.attributes && item()!.attributes!.length > 0) { -
- @for (attr of item()!.attributes!; track attr.key) { -
- {{ attr.key }} - {{ attr.value }} -
- } -
- } - - @if (hasDeliveryInfo()) { -
-

{{ 'cart.deliveryLabel' | translate }}

- - @if (isDigitalDelivery()) { -
{{ 'cart.digitalDelivery' | translate }}
- } @else { -
- @for (option of deliveryOptions(); track trackByDeliveryOption($index, option)) { -
-
- @if (option.deliveryPlace) { - {{ 'cart.deliveryPlace' | translate }}: {{ option.deliveryPlace }} - } - @if (option.deliveryTime) { - {{ 'cart.deliveryTime' | translate }}: {{ option.deliveryTime }} - } -
- {{ option.deliveryPrice | number:'1.2-2' }} {{ getDeliveryCurrency() }} -
- } -
- } -
- } - - - -
- @if (getSimpleDescription()) { -

{{ getSimpleDescription() }}

- } - - @if (hasDescriptionFields()) { -

{{ 'itemDetail.specifications' | translate }}

- - - @for (field of getTranslatedDescriptionFields(); track field.key) { - - - - - } - -
{{ field.key }}{{ field.value }}
- } @else { -

{{ 'itemDetail.description' | translate }}

-
- } -
-
-
- -
-

{{ 'itemDetail.reviews' | translate }} ({{ item()!.callbacks?.length || 0 }})

- - -
-

{{ 'itemDetail.yourReview' | translate }}

-
- -
- @for (star of [1, 2, 3, 4, 5]; track star) { - - ★ - - } -
-
- -
- - @if (!newReview.anonymous && getUserDisplayName()) { - {{ getUserDisplayName() }} - } - -
- - @if (reviewSubmitStatus() === 'success') { -
- - - - {{ 'itemDetail.reviewSuccess' | translate }} -
- } - - @if (reviewSubmitStatus() === 'error') { -
- - - - {{ 'itemDetail.reviewError' | translate }} -
- } -
- -
- @if (item()!.callbacks && item()!.callbacks!.length > 0) { - @for (review of item()!.callbacks!; track review.userID) { -
-
-
- {{ review.userID ? review.userID : ('itemDetail.defaultUser' | translate) }} - @if (review.timestamp) { - {{ formatDate(review.timestamp) }} - } -
- {{ getRatingStars(review.rating || 0) }} -
-

{{ review.content }}

-
- } - } @else { -

{{ 'itemDetail.noReviews' | translate }}

- } -
-
- - @if (relatedProducts().length > 0) { -
- -
- @for (related of relatedProducts(); track related.itemID) { - - } -
-
- } - } -
-} @else {
@if (loading()) { @@ -342,7 +26,7 @@ [class.active]="selectedPhotoIndex() === $index" (click)="selectPhoto($index)"> @if (photo.video) { -
â–¶
+
?
}
@@ -420,7 +104,7 @@ {{ getStockLabel() }} @if (effectiveRemaining() != null) { - ({{ effectiveRemaining() }} шт.) + ({{ effectiveRemaining() }} øò.) }
@@ -541,7 +225,7 @@ class="dx-star-pick" [class.selected]="newReview.rating >= star" (click)="setRating(star)"> - ★ + ? }
@@ -629,11 +313,11 @@ @for (question of item()!.questions!; track $index) {
- Ð’ + Â {{ question.question }}
- О + Π{{ question.answer }}
@@ -670,4 +354,3 @@ } }
-} \ No newline at end of file diff --git a/src/app/pages/item-detail/item-detail.component.ts b/src/app/pages/item-detail/item-detail.component.ts index 585b5dd..f2c4280 100644 --- a/src/app/pages/item-detail/item-detail.component.ts +++ b/src/app/pages/item-detail/item-detail.component.ts @@ -12,7 +12,6 @@ import { getStockStatus, getBadgeClass, getTranslatedField } from '../../utils/i import { LangRoutePipe } from '../../pipes/lang-route.pipe'; import { TranslatePipe } from '../../i18n/translate.pipe'; import { TranslateService } from '../../i18n/translate.service'; -import { UiRuntimeFacade } from '../../facades/runtime/ui-runtime.facade'; import { ProductFacade } from '../../facades/platform/product.facade'; import { ProductCardComponent } from '../../components/product-card/product-card.component'; @@ -29,11 +28,6 @@ export class ItemDetailComponent implements OnInit, OnDestroy { relatedProducts = signal([]); loading = signal(true); error = signal(null); - private readonly uiRuntime = inject(UiRuntimeFacade); - - get isMarketplaceNovo(): boolean { - return this.uiRuntime.isMarketplaceVariant('novo'); - } // Variant selection selectedColour = signal(null); diff --git a/src/app/services/api.service.ts b/src/app/services/api.service.ts index 345d300..9e76e5c 100644 --- a/src/app/services/api.service.ts +++ b/src/app/services/api.service.ts @@ -179,7 +179,9 @@ export class ApiService { private resolveImageUrl(url: string): string { if (!url) return ''; if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('/')) return url; - const origin = `https://${environment.domain}`; + const origin = typeof window !== 'undefined' + ? window.location.origin + : ''; if (url.startsWith('./')) return `${origin}/${url.slice(2)}`; return `${origin}/${url}`; } diff --git a/src/app/services/cart.service.ts b/src/app/services/cart.service.ts index 76d34d5..559c67f 100644 --- a/src/app/services/cart.service.ts +++ b/src/app/services/cart.service.ts @@ -2,7 +2,6 @@ import { Injectable, signal, computed, effect, Injector } from '@angular/core'; import { DeliveryOption, CartItem } from '../models'; import { getDiscountedPrice } from '../utils/item.utils'; import { normalizeDeliveryOption, normalizeOptionalNumber } from '../utils/normalization.utils'; -import { environment } from '../../environments/environment'; import type { } from '../types/telegram.types'; type CartVariant = { colour?: string; size?: string; price?: number; currency?: string }; @@ -11,7 +10,7 @@ type CartVariant = { colour?: string; size?: string; price?: number; currency?: providedIn: 'root' }) export class CartService { - private readonly STORAGE_KEY = `${environment.brandName.toLowerCase().replace(/\s+/g, '_')}_cart`; + private readonly STORAGE_KEY = 'marketplace_cart'; private cartItems = signal([]); private isTelegram = typeof window !== 'undefined' && !!window.Telegram?.WebApp; private addingItems = new Set(); diff --git a/src/app/services/language.service.ts b/src/app/services/language.service.ts index 9c155a0..d089ffb 100644 --- a/src/app/services/language.service.ts +++ b/src/app/services/language.service.ts @@ -1,6 +1,5 @@ import { Injectable, signal } from '@angular/core'; import { Router } from '@angular/router'; -import { environment } from '../../environments/environment'; export interface Language { code: string; @@ -20,8 +19,7 @@ export interface Currency { providedIn: 'root' }) export class LanguageService { - // @ts-ignore - private currentLanguageSignal = signal(environment.defaultLanguage || 'ru'); + private currentLanguageSignal = signal('ru'); private currentCurrencySignal = signal('RUB'); languages: Language[] = [ diff --git a/src/app/services/seo.service.ts b/src/app/services/seo.service.ts index a9eb811..75743bb 100644 --- a/src/app/services/seo.service.ts +++ b/src/app/services/seo.service.ts @@ -1,8 +1,8 @@ import { Injectable, inject, DOCUMENT } from '@angular/core'; import { Meta, Title } from '@angular/platform-browser'; -import { environment } from '../../environments/environment'; import { Item } from '../models'; import { getDiscountedPrice, getMainImage } from '../utils/item.utils'; +import { UiRuntimeFacade } from '../facades/runtime/ui-runtime.facade'; @Injectable({ providedIn: 'root' @@ -11,9 +11,15 @@ export class SeoService { private meta = inject(Meta); private title = inject(Title); private doc = inject(DOCUMENT); + private readonly uiRuntime = inject(UiRuntimeFacade); - private readonly siteUrl = `https://${environment.domain}`; - private readonly siteName = environment.brandFullName; + private get siteUrl(): string { + return this.doc?.location?.origin ?? ''; + } + + private get siteName(): string { + return this.uiRuntime.marketplaceDisplayName() || 'Marketplace'; + } /** * Set Open Graph & Twitter Card meta tags for a product/item page. diff --git a/src/app/widgets/ui/categories-widget.component.ts b/src/app/widgets/ui/categories-widget.component.ts index 1190ef3..4da4979 100644 --- a/src/app/widgets/ui/categories-widget.component.ts +++ b/src/app/widgets/ui/categories-widget.component.ts @@ -1,11 +1,9 @@ import { CommonModule } from '@angular/common'; -import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core'; -import { Router } from '@angular/router'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; import { SectionConfig } from '../../shared/models/config'; import { CatalogCategoryGridComponent } from '../../features/website/catalog/components/category-grid/category-grid.component'; import { CategoriesWidgetData } from '../contracts/widget-data.contract'; import { Category } from '../../core/categories/models/category-domain.model'; -import { LanguageService } from '../../services/language.service'; @Component({ selector: 'app-categories-widget', @@ -38,13 +36,11 @@ import { LanguageService } from '../../services/language.service'; changeDetection: ChangeDetectionStrategy.OnPush }) export class CategoriesWidgetComponent { - private readonly router = inject(Router); - private readonly languageService = inject(LanguageService); - @Input() section: SectionConfig | null = null; @Input() data: CategoriesWidgetData | null = null; + @Output() categorySelected = new EventEmitter(); onCategorySelected(category: Category): void { - this.router.navigate([`/${this.languageService.currentLanguage()}/catalog`, category.id]); + this.categorySelected.emit(category); } } \ No newline at end of file