Merge branch 'dev'

WOM-Platform · Sep 6, 2023 · 0d8717f · 0d8717f
2 parents a993fef + faa3122
commit 0d8717f
Show file tree

Hide file tree

Showing 219 changed files with 18,435 additions and 20,061 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@
 docker-compose.secrets.yml
 index-dev.html
 environment.dev-local.ts
+
+/src/Website/.angular/cache
diff --git a/src/Website/angular.json b/src/Website/angular.json
@@ -24,8 +24,9 @@
               "src/favicon.ico"
             ],
             "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/purple-green.css",
+              "./node_modules/leaflet/dist/leaflet.css",
               "src/styles.css",
+              "src/theme.scss",
               "node_modules/primeng/resources/themes/saga-blue/theme.css",
               "node_modules/primeng/resources/primeng.min.css",
               "node_modules/primeicons/primeicons.css"
@@ -125,7 +126,8 @@
             "mock": {
               "browserTarget": "src:build:mock"
             }
-          }
+          },
+          "defaultConfiguration": "development" 
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
@@ -175,8 +177,9 @@
       }
     }
   },
-  "defaultProject": "src",
   "cli": {
-    "defaultCollection": "@angular-eslint/schematics"
+    "schematicCollections": [
+      "@angular-eslint/schematics"
+    ]
   }
 }