add loccal changes

2026-03-23 21:20:11 +00:00
parent f823df7e15 97214c3a90
commit d29de100c6
93 changed files with 7241 additions and 2478 deletions
--- a/angular.json
+++ b/angular.json
@@ -154,7 +154,12 @@
        },
        "serve": {
          "options": {
+<<<<<<< HEAD
            "allowedHosts": ["novo.market", "dexarmarket.ru", "dexar.market","localhost"]
+=======
+            "allowedHosts": ["novo.market", "dexarmarket.ru", "localhost"],
+            "proxyConfig": "proxy.conf.json"
+>>>>>>> 97214c3a90e09df2e2916cca3ffc2dc71ee4f990
          },
          "builder": "@angular/build:dev-server",
          "configurations": {
@@ -175,26 +180,6 @@
        },
        "extract-i18n": {
          "builder": "@angular/build:extract-i18n"
-        },
-        "test": {
-          "builder": "@angular/build:karma",
-          "options": {
-            "polyfills": [
-              "zone.js",
-              "zone.js/testing"
-            ],
-            "tsConfig": "tsconfig.spec.json",
-            "inlineStyleLanguage": "scss",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
-            ],
-            "styles": [
-              "src/styles.scss"
-            ]
-          }
        }
      }
    }