Merge branch 'back-office-integration'

# Conflicts: # src/app/pages/cart/cart.component.ts # src/app/pages/category/category.component.html # src/app/pages/category/category.component.ts # src/app/pages/item-detail/item-detail.component.html # src/app/pages/item-detail/item-detail.component.ts # src/app/pages/legal/company-details/en/company-details-en.component.html # src/app/pages/legal/company-details/hy/company-details-hy.component.html # src/app/pages/legal/company-details/ru/company-details-ru.component.html # src/app/pages/legal/public-offer/en/public-offer-en.component.html # src/app/pages/legal/public-offer/ru/public-offer-ru.component.html # src/app/pages/search/search.component.ts # src/app/services/api.service.ts
2026-03-24 00:18:13 +04:00
parent 0b3b2ee463 56f4c56b9e
commit 97214c3a90
76 changed files with 6828 additions and 2331 deletions
--- a/angular.json
+++ b/angular.json
@@ -154,7 +154,8 @@
        },
        "serve": {
          "options": {
-            "allowedHosts": ["novo.market", "dexarmarket.ru", "localhost"]
+            "allowedHosts": ["novo.market", "dexarmarket.ru", "localhost"],
+            "proxyConfig": "proxy.conf.json"
          },
          "builder": "@angular/build:dev-server",
          "configurations": {