Merge pull request #19 from PnEcrins/use-api

add api services
PnEcrins · Jul 18, 2024 · 277497a · 277497a
2 parents ec64b95 + ccd9d7b
commit 277497a
Show file tree

Hide file tree

Showing 63 changed files with 1,838 additions and 553 deletions.
diff --git a/front-end/angular.json b/front-end/angular.json
@@ -15,12 +15,14 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:application",
+          "builder": "@ngx-env/builder:application",
           "options": {
             "outputPath": "dist/regard-d-altitude",
             "index": "src/index.html",
             "browser": "src/main.ts",
-            "polyfills": ["zone.js"],
+            "polyfills": [
+              "zone.js"
+            ],
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
@@ -79,7 +81,7 @@
           "defaultConfiguration": "production"
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@ngx-env/builder:dev-server",
           "configurations": {
             "production": {
               "buildTarget": "regard-d-altitude:build:production"
@@ -91,12 +93,15 @@
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n"
+          "builder": "@ngx-env/builder:extract-i18n"
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@ngx-env/builder:karma",
           "options": {
-            "polyfills": ["zone.js", "zone.js/testing"],
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ],
             "tsConfig": "tsconfig.spec.json",
             "inlineStyleLanguage": "scss",
             "assets": [
@@ -122,4 +127,4 @@
       }
     }
   }
-}
+}
diff --git a/front-end/package-lock.json b/front-end/package-lock.json
diff --git a/front-end/package.json b/front-end/package.json
@@ -45,6 +45,7 @@
     "@angular-devkit/build-angular": "^18.0.6",
     "@angular/cli": "^18.0.6",
     "@angular/compiler-cli": "^18.0.5",
+    "@ngx-env/builder": "^18.0.1",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~5.1.0",
     "@types/leaflet": "^1.9.12",

diff --git a/front-end/src/app/app.component.html b/front-end/src/app/app.component.html
@@ -7,7 +7,11 @@
   <button mat-icon-button (click)="sidenav.toggle()">
     <mat-icon
       aria-hidden="false"
-      [matBadge]="this.offlineService.observationsPending | async"
+      [matBadge]="
+        (authService.isAuth | async)
+          ? (offlineService.observationsPending | async)
+          : null
+      "
       >account_circle</mat-icon
     >
   </button>
@@ -18,7 +22,10 @@
   </button>
   <span>{{ title }}</span>
 </mat-toolbar>
-<mat-sidenav-container [style.marginTop.px]="0">
+<mat-sidenav-container
+  [class.mat-sidenav-container-home]="!backButton"
+  [style.marginTop.px]="0"
+>
   <mat-sidenav
     #sidenav
     mode="over"
@@ -42,7 +49,7 @@
           <div
             [matBadge]="
               currentSideNavItem.observationsPending
-                ? (this.offlineService.observationsPending | async)
+                ? (offlineService.observationsPending | async)
                 : null
             "
           >