currency for market

src/app/components/header/header.component.html

@@ -3,7 +3,7 @@
   <header class="novo-header">
     <div class="novo-header-container">
       <div class="novo-left">
-        <a [routerLink]="'/' | langRoute" class="novo-logo" (click)="closeMenu()">
+        <a [attr.href]="homeUrl" class="novo-logo" (click)="navigateHome($event)">
           <app-logo />
           <!-- <span class="novo-brand">{{ brandName }}</span> -->
         </a>
@@ -36,13 +36,18 @@
         <app-language-selector />
         
         <a [routerLink]="'/cart' | langRoute" routerLinkActive="novo-cart-active" class="novo-cart" (click)="closeMenu()" [attr.aria-label]="'header.cart' | translate">
-          <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" aria-hidden="true">
+          <span class="novo-cart-icon">
-            <circle cx="9" cy="21" r="1"></circle>
+            <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" aria-hidden="true">
-            <circle cx="20" cy="21" r="1"></circle>
+              <circle cx="9" cy="21" r="1"></circle>
-            <path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"></path>
+              <circle cx="20" cy="21" r="1"></circle>
-          </svg>
+              <path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"></path>
+            </svg>
+            @if (cartItemCount() > 0) {
+              <span class="novo-cart-badge">{{ cartItemCount() }}</span>
+            }
+          </span>
           @if (cartItemCount() > 0) {
-            <span class="novo-cart-badge">{{ cartItemCount() }}</span>
+            <span class="novo-cart-total">{{ formatCartTotal(cartTotal()) }}</span>
           }
         </a>
         
@@ -59,7 +64,7 @@
   <header class="dexar-header">
     <div class="dexar-header-container">
       <!-- Logo -->
-      <a [routerLink]="'/' | langRoute" class="dexar-logo" (click)="closeMenu()">
+      <a [attr.href]="homeUrl" class="dexar-logo" (click)="navigateHome($event)">
         <app-logo />
       </a>
 
@@ -102,13 +107,18 @@
       <div class="dexar-actions">
         <!-- Cart Button -->
         <a [routerLink]="'/cart' | langRoute" routerLinkActive="dexar-cart-active" class="dexar-cart-btn" (click)="closeMenu()">
-          <svg width="32" height="24" viewBox="0 0 48 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <span class="dexar-cart-icon">
-            <path d="M12 0.5H36C42.3513 0.5 47.5 5.64873 47.5 12V20C47.5 26.3513 42.3513 31.5 36 31.5H12C5.64873 31.5 0.5 26.3513 0.5 20V12C0.5 5.64873 5.64873 0.5 12 0.5Z" fill="transparent" />
+            <svg width="32" height="24" viewBox="0 0 48 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M12 0.5H36C42.3513 0.5 47.5 5.64873 47.5 12V20C47.5 26.3513 42.3513 31.5 36 31.5H12C5.64873 31.5 0.5 26.3513 0.5 20V12C0.5 5.64873 5.64873 0.5 12 0.5Z" stroke="#677B78" />
+              <path d="M12 0.5H36C42.3513 0.5 47.5 5.64873 47.5 12V20C47.5 26.3513 42.3513 31.5 36 31.5H12C5.64873 31.5 0.5 26.3513 0.5 20V12C0.5 5.64873 5.64873 0.5 12 0.5Z" fill="transparent" />
-            <path d="M10 3.9C10 3.40294 10.4029 3 10.9 3H13.6C14.013 3 14.373 3.28107 14.4731 3.68172L15.2027 6.6H36.1C36.3677 6.6 36.6216 6.7192 36.7925 6.92523C36.9635 7.13125 37.0339 7.40271 36.9846 7.66586L34.2846 22.0659C34.2048 22.4915 33.8331 22.8 33.4 22.8H31.6H19H17.2C16.7669 22.8 16.3952 22.4915 16.3154 22.0659L13.6204 7.69224L12.8973 4.8H10.9C10.4029 4.8 10 4.39706 10 3.9ZM15.5844 8.4L17.9469 21H32.6531L35.0156 8.4H15.5844ZM19 22.8C17.0118 22.8 15.4 24.4118 15.4 26.4C15.4 28.3882 17.0118 30 19 30C20.9882 30 22.6 28.3882 22.6 26.4C22.6 24.4118 20.9882 22.8 19 22.8ZM31.6 22.8C29.6118 22.8 28 24.4118 28 26.4C28 28.3882 29.6118 30 31.6 30C33.5882 30 35.2 28.3882 35.2 26.4C35.2 24.4118 33.5882 22.8 31.6 22.8ZM19 24.6C19.9941 24.6 20.8 25.4059 20.8 26.4C20.8 27.3941 19.9941 28.2 19 28.2C18.0059 28.2 17.2 27.3941 17.2 26.4C17.2 25.4059 18.0059 24.6 19 24.6ZM31.6 24.6C32.5941 24.6 33.4 25.4059 33.4 26.4C33.4 27.3941 32.5941 28.2 31.6 28.2C30.6059 28.2 29.8 27.3941 29.8 26.4C29.8 25.4059 30.6059 24.6 31.6 24.6Z" fill="#1E3C38" />
+              <path d="M12 0.5H36C42.3513 0.5 47.5 5.64873 47.5 12V20C47.5 26.3513 42.3513 31.5 36 31.5H12C5.64873 31.5 0.5 26.3513 0.5 20V12C0.5 5.64873 5.64873 0.5 12 0.5Z" stroke="#677B78" />
-          </svg>
+              <path d="M10 3.9C10 3.40294 10.4029 3 10.9 3H13.6C14.013 3 14.373 3.28107 14.4731 3.68172L15.2027 6.6H36.1C36.3677 6.6 36.6216 6.7192 36.7925 6.92523C36.9635 7.13125 37.0339 7.40271 36.9846 7.66586L34.2846 22.0659C34.2048 22.4915 33.8331 22.8 33.4 22.8H31.6H19H17.2C16.7669 22.8 16.3952 22.4915 16.3154 22.0659L13.6204 7.69224L12.8973 4.8H10.9C10.4029 4.8 10 4.39706 10 3.9ZM15.5844 8.4L17.9469 21H32.6531L35.0156 8.4H15.5844ZM19 22.8C17.0118 22.8 15.4 24.4118 15.4 26.4C15.4 28.3882 17.0118 30 19 30C20.9882 30 22.6 28.3882 22.6 26.4C22.6 24.4118 20.9882 22.8 19 22.8ZM31.6 22.8C29.6118 22.8 28 24.4118 28 26.4C28 28.3882 29.6118 30 31.6 30C33.5882 30 35.2 28.3882 35.2 26.4C35.2 24.4118 33.5882 22.8 31.6 22.8ZM19 24.6C19.9941 24.6 20.8 25.4059 20.8 26.4C20.8 27.3941 19.9941 28.2 19 28.2C18.0059 28.2 17.2 27.3941 17.2 26.4C17.2 25.4059 18.0059 24.6 19 24.6ZM31.6 24.6C32.5941 24.6 33.4 25.4059 33.4 26.4C33.4 27.3941 32.5941 28.2 31.6 28.2C30.6059 28.2 29.8 27.3941 29.8 26.4C29.8 25.4059 30.6059 24.6 31.6 24.6Z" fill="#1E3C38" />
+            </svg>
+            @if (cartItemCount() > 0) {
+              <span class="dexar-cart-badge">{{ cartItemCount() }}</span>
+            }
+          </span>
           @if (cartItemCount() > 0) {
-            <span class="dexar-cart-badge">{{ cartItemCount() }}</span>
+            <span class="dexar-cart-total">{{ formatCartTotal(cartTotal()) }}</span>
           }
         </a>
 

src/app/components/header/header.component.scss

@@ -333,42 +333,60 @@
 }
 
 .novo-cart {
-  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 0.2rem;
   color: var(--text-primary);
   text-decoration: none;
   padding: 0.5rem;
   border-radius: var(--radius-md);
   transition: all 0.3s;
   
-  svg {
-    display: block;
-  }
-  
   &:hover,
   &.novo-cart-active {
     color: var(--primary-color);
     background: var(--bg-secondary);
   }
-  
+}
-  .novo-cart-badge {
+
-    position: absolute;
+.novo-cart-icon {
-    top: -4px;
+  position: relative;
-    right: -4px;
+  display: flex;
-    background: var(--primary-color);
+  align-items: center;
-    color: white;
+  justify-content: center;
-    font-size: 0.7rem;
+  line-height: 0;
-    font-weight: 700;
+
-    min-width: 18px;
+  svg {
-    height: 18px;
+    display: block;
-    border-radius: 9px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 0 5px;
-    box-shadow: var(--shadow-sm);
   }
 }
 
+.novo-cart-badge {
+  position: absolute;
+  top: -4px;
+  right: -4px;
+  background: var(--primary-color);
+  color: white;
+  font-size: 0.7rem;
+  font-weight: 700;
+  min-width: 18px;
+  height: 18px;
+  border-radius: 9px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 5px;
+  box-shadow: var(--shadow-sm);
+}
+
+.novo-cart-total {
+  font-size: 0.68rem;
+  font-weight: 700;
+  line-height: 1;
+  white-space: nowrap;
+}
+
 .novo-menu-toggle {
   display: none;
   flex-direction: column;
@@ -492,7 +510,7 @@
   display: flex;
   align-items: center;
   gap: 32px;
-  height: 48px;
+  min-height: 48px;
 }
 
 .dexar-logo {
@@ -615,15 +633,15 @@
 }
 
 .dexar-cart-btn {
-  position: relative;
-  width: 36px;
-  height: 28px;
   display: flex;
+  flex-direction: column;
   align-items: center;
   justify-content: center;
+  min-width: 36px;
   text-decoration: none;
   cursor: pointer;
   transition: opacity 0.3s ease;
+  gap: 2px;
   
   svg {
     width: 36px;
@@ -639,6 +657,15 @@
   }
 }
 
+.dexar-cart-icon {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 36px;
+  height: 28px;
+}
+
 .dexar-cart-badge {
   position: absolute;
   top: -8px;
@@ -658,6 +685,15 @@
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
 }
 
+.dexar-cart-total {
+  font-family: "DM Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+  font-weight: 700;
+  font-size: 10px;
+  line-height: 1;
+  color: #1e3c38;
+  white-space: nowrap;
+}
+
 .dexar-lang-selector {
   display: flex;
   align-items: center;

src/app/components/header/header.component.ts

@@ -17,6 +17,7 @@ import { TranslatePipe } from '../../i18n/translate.pipe';
 })
 export class HeaderComponent {
   cartItemCount;
+  cartTotal;
   menuOpen = false;
   brandName = environment.brandFullName;
   logo = environment.logo;
@@ -28,6 +29,11 @@ export class HeaderComponent {
 
   constructor(private cartService: CartService, private router: Router) {
     this.cartItemCount = this.cartService.itemCount;
+    this.cartTotal = this.cartService.totalPrice;
+  }
+
+  get homeUrl(): string {
+    return `/${this.langService.currentLanguage()}`;
   }
 
   toggleMenu(): void {
@@ -44,6 +50,23 @@ export class HeaderComponent {
     this.renderer.removeClass(this.document.body, 'dexar-menu-open');
   }
 
+  navigateHome(event?: Event): void {
+    event?.preventDefault();
+    this.closeMenu();
+
+    const homeUrl = this.homeUrl;
+    const currentUrl = this.router.url.split('?')[0].split('#')[0];
+
+    if (currentUrl === homeUrl || currentUrl === `${homeUrl}/`) {
+      this.document.defaultView?.scrollTo({ top: 0, behavior: 'smooth' });
+      return;
+    }
+
+    this.router.navigateByUrl(homeUrl).then(() => {
+      this.document.defaultView?.scrollTo({ top: 0, behavior: 'auto' });
+    });
+  }
+
   navigateToSearch(): void {
     const lang = this.langService.currentLanguage();
     this.router.navigate([`/${lang}/search`]);
@@ -58,4 +81,20 @@ export class HeaderComponent {
       }, 100);
     });
   }
+
+  formatCartTotal(total: number): string {
+    const locale = this.langService.currentLanguage() === 'en'
+      ? 'en-US'
+      : this.langService.currentLanguage() === 'hy'
+        ? 'hy-AM'
+        : 'ru-RU';
+    const fractionDigits = Number.isInteger(total) ? 0 : 2;
+    const amount = new Intl.NumberFormat(locale, {
+      minimumFractionDigits: fractionDigits,
+      maximumFractionDigits: 2,
+    }).format(total);
+    const currencySymbol = this.langService.getCurrentCurrency()?.symbol ?? this.langService.currentCurrency();
+
+    return `${amount} ${currencySymbol}`;
+  }
 }

src/app/components/logo/logo.component.ts

@@ -3,12 +3,15 @@ import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'app-logo',
-  template: `<img [src]="logoPath" [alt]="brandName + ' logo'" class="logo-img" fetchpriority="high" />`,
+  template: `<img [src]="logoPath" [alt]="brandName + ' logo'" class="logo-img" fetchpriority="high" draggable="false" />`,
   styles: [`
     .logo-img {
+      display: block;
       width: 100%;
       height: 100%;
       object-fit: contain;
+      pointer-events: none;
+      user-select: none;
     }
   `],
   changeDetection: ChangeDetectionStrategy.OnPush