Merge pull request #204 from wp99cp/develop

wp99cp · web-flow · commit 6a7af3a200c6 · 2023-04-07T16:02:00.000+02:00
Update Dependencies and Angular Version
diff --git a/frontend/angular.json b/frontend/angular.json
@@ -140,8 +140,9 @@
       }
     }
   },
-  "defaultProject": "eMeal",
   "cli": {
-    "defaultCollection": "@angular-eslint/schematics"
+    "schematicCollections": [
+      "@angular-eslint/schematics"
+    ]
   }
 }
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@emeal/menuplanung",
-  "version": "1.14.9",
+  "version": "1.14.10",
   "license": "MIT",
   "copyrights": "© 2019 - 2023 Cevi Züri 11 - eMeal Menüplanung",
   "scripts": {
@@ -10,28 +10,28 @@
     "start:prod": "angular-build-info && ng serve --configuration production --ssl",
     "build": "angular-build-info && ng build",
     "analize-bundle": "angular-build-info && ng build --stats-json && webpack-bundle-analyzer dist/eMeal/stats.json",
-    "build:prod": "angular-build-info && ng build --configuration production --aot=true --buildOptimizer=true --progress=true\n",
+    "build:prod": "angular-build-info && ng build --configuration production --aot=true --progress=true\n",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/schematics": "^13.1.4",
-    "@angular/animations": "^13.1.3",
-    "@angular/cdk": "^13.1.3",
-    "@angular/common": "^13.1.3",
-    "@angular/compiler": "^13.1.3",
-    "@angular/core": "^13.1.3",
+    "@angular-devkit/schematics": "^14.2.11",
+    "@angular/animations": "^14.3.0",
+    "@angular/cdk": "^14.2.7",
+    "@angular/common": "^14.3.0",
+    "@angular/compiler": "^14.3.0",
+    "@angular/core": "^14.3.0",
     "@angular/fire": "^7.2.0",
-    "@angular/forms": "^13.1.3",
-    "@angular/localize": "^13.1.3",
-    "@angular/material": "^13.1.3",
-    "@angular/material-moment-adapter": "^13.1.3",
-    "@angular/platform-browser": "^13.1.3",
-    "@angular/platform-browser-dynamic": "^13.1.3",
-    "@angular/router": "^13.1.3",
-    "@angular/service-worker": "^13.1.3",
+    "@angular/forms": "^14.3.0",
+    "@angular/localize": "^14.3.0",
+    "@angular/material": "^14.2.7",
+    "@angular/material-moment-adapter": "^14.2.7",
+    "@angular/platform-browser": "^14.3.0",
+    "@angular/platform-browser-dynamic": "^14.3.0",
+    "@angular/router": "^14.3.0",
+    "@angular/service-worker": "^14.3.0",
     "@schematics/angular": "^13.3.3",
     "cross": "^1.0.0",
     "firebase": "^9.6.4",
@@ -42,15 +42,15 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^13.1.4",
+    "@angular-devkit/build-angular": "^14.2.11",
     "@angular-eslint/builder": "13.2.1",
     "@angular-eslint/eslint-plugin": "13.1.0",
     "@angular-eslint/eslint-plugin-template": "13.1.0",
-    "@angular-eslint/schematics": "13.1.0",
+    "@angular-eslint/schematics": "^14.0.0",
     "@angular-eslint/template-parser": "13.1.0",
-    "@angular/cli": "^13.1.4",
-    "@angular/compiler-cli": "^13.1.3",
-    "@angular/language-service": "^13.1.3",
+    "@angular/cli": "^14.2.11",
+    "@angular/compiler-cli": "^14.3.0",
+    "@angular/language-service": "^14.3.0",
     "@types/core-js": "^2.5.4",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "^2.0.8",
diff --git a/frontend/src/app/modules/application-module/components/edit-recipe-in-camp/edit-recipe-in-camp.component.ts b/frontend/src/app/modules/application-module/components/edit-recipe-in-camp/edit-recipe-in-camp.component.ts
@@ -1,5 +1,5 @@
 import {Component, EventEmitter, Input, OnChanges, OnInit, Output} from '@angular/core';
-import {FormBuilder} from '@angular/forms';
+import {UntypedFormBuilder} from '@angular/forms';
 import {Observable} from 'rxjs';
 import {mergeMap, take} from 'rxjs/operators';
 import {Camp} from '../../classes/camp';
@@ -42,7 +42,7 @@ export class EditRecipeInCampComponent implements OnInit, Saveable, OnChanges {
   private recipeChanged = false;
 
   constructor(
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private databaseService: DatabaseService,
     public dialog: MatDialog,
     public snackBar: MatSnackBar) {
diff --git a/frontend/src/app/modules/application-module/components/edit-recipe/edit-recipe.component.ts b/frontend/src/app/modules/application-module/components/edit-recipe/edit-recipe.component.ts
@@ -1,6 +1,6 @@
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import {Recipe} from '../../classes/recipe';
-import {FormBuilder, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {DatabaseService} from '../../services/database.service';
 import {OverwritenIngredient} from '../../classes/overwritableIngredient';
 import {Ingredient} from '../../interfaces/firestoreDatatypes';
@@ -24,7 +24,7 @@ export class EditRecipeComponent implements OnInit {
   Math = Math;
   Number = Number;
 
-  public recipeForm: FormGroup;
+  public recipeForm: UntypedFormGroup;
   public ingredients: OverwritenIngredient[];
 
   @Input() public recipe: Recipe;
@@ -43,7 +43,7 @@ export class EditRecipeComponent implements OnInit {
   private selectedIngredientID = '';
 
   constructor(
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private databaseService: DatabaseService,
     private dialog: MatDialog,
     private router: Router,
diff --git a/frontend/src/app/modules/application-module/dialoges/camp-info/camp-info.component.ts b/frontend/src/app/modules/application-module/dialoges/camp-info/camp-info.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { Camp } from '../../classes/camp';
 import { DatabaseService } from '../../services/database.service';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
@@ -15,15 +15,15 @@ import {HelpService} from '../../services/help.service';
 })
 export class CampInfoComponent {
 
-  public campInfosForm: FormGroup;
+  public campInfosForm: UntypedFormGroup;
   public camp: Camp;
 
   public hasAccess: Promise<boolean>
   public valueHasNotChanged = true;
 
   constructor(
     @Inject(MAT_DIALOG_DATA) data: { camp: Camp },
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     dbService: DatabaseService,
     public helpService: HelpService) {
 
diff --git a/frontend/src/app/modules/application-module/dialoges/create-camp/create-camp.component.ts b/frontend/src/app/modules/application-module/dialoges/create-camp/create-camp.component.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {FormBuilder, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import firebase from 'firebase/compat/app';
 import {map} from 'rxjs/operators';
 import {FirestoreObject} from '../../classes/firebaseObject';
@@ -34,10 +34,10 @@ import Timestamp = firebase.firestore.Timestamp;
 export class CreateCampComponent {
 
   // Form data to create new CampClass
-  public newCampInfos: FormGroup;
-  public newCampParticipants: FormGroup;
+  public newCampInfos: UntypedFormGroup;
+  public newCampParticipants: UntypedFormGroup;
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               public dbService: DatabaseService,
               private authService: AuthenticationService,
               public helpService: HelpService) {
diff --git a/frontend/src/app/modules/application-module/dialoges/create-meal/create-meal.component.ts b/frontend/src/app/modules/application-module/dialoges/create-meal/create-meal.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, Inject } from '@angular/core';
 import { AuthenticationService } from '../../services/authentication.service';
 import { map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { empty } from 'rxjs';
 import { FirestoreMeal } from '../../interfaces/firestoreDatatypes';
 import { FirestoreObject } from '../../classes/firebaseObject';
@@ -16,11 +16,11 @@ import {Router} from '@angular/router';
 })
 export class CreateMealComponent implements OnInit {
 
-  public newMealForm: FormGroup;
+  public newMealForm: UntypedFormGroup;
 
   constructor(
     private authService: AuthenticationService,
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     public router: Router,
     public dialogRef: MatDialog,
     @Inject(MAT_DIALOG_DATA) public data: { mealName: string }) {
diff --git a/frontend/src/app/modules/application-module/dialoges/create-recipe/create-recipe.component.ts b/frontend/src/app/modules/application-module/dialoges/create-recipe/create-recipe.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, Inject } from '@angular/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { AuthenticationService } from '../../services/authentication.service';
 import { Observable, empty } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -15,11 +15,11 @@ import {Router} from '@angular/router';
 })
 export class CreateRecipeComponent implements OnInit {
 
-  public newRecipeForm: FormGroup;
+  public newRecipeForm: UntypedFormGroup;
 
   constructor(
     private authService: AuthenticationService,
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     public router: Router,
     public dialogRef: MatDialog,
     @Inject(MAT_DIALOG_DATA) public data: { recipeName: string }) {
diff --git a/frontend/src/app/modules/application-module/dialoges/edit-day/edit-day.component.ts b/frontend/src/app/modules/application-module/dialoges/edit-day/edit-day.component.ts
@@ -1,5 +1,5 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {FormBuilder, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {MAT_DIALOG_DATA} from '@angular/material/dialog';
 
 import {Day} from '../../classes/day';
@@ -31,12 +31,12 @@ import {SwissDateAdapter} from "../../../../shared/utils/format-datapicker";
 })
 export class EditDayComponent implements OnInit {
 
-  public dayInfo: FormGroup;
+  public dayInfo: UntypedFormGroup;
   private currentDate;
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: { day: Day, specificMeals: SpecificMeal[], days: Day[], access: boolean },
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     public swissDateAdapter: SwissDateAdapter) {
   }
 
diff --git a/frontend/src/app/modules/application-module/dialoges/export-settings/export-settings.component.ts b/frontend/src/app/modules/application-module/dialoges/export-settings/export-settings.component.ts
@@ -1,7 +1,7 @@
 import {Component, Inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {HelpService} from '../../services/help.service';
-import {FormBuilder, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {MatStepperIntl} from '@angular/material/stepper';
 
 @Component({
@@ -12,13 +12,13 @@ import {MatStepperIntl} from '@angular/material/stepper';
 })
 export class ExportSettingsComponent implements OnInit {
 
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public campId: string,
     public dialogRef: MatDialogRef<ExportSettingsComponent>,
     public helpService: HelpService,
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     private _matStepperIntl: MatStepperIntl
   ) {
 
diff --git a/frontend/src/app/modules/application-module/dialoges/feedback-dialog/feedback-dialog.component.ts b/frontend/src/app/modules/application-module/dialoges/feedback-dialog/feedback-dialog.component.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {FormBuilder, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {MatSnackBar} from '@angular/material/snack-bar';
 import {TemplateHeaderComponent as Header} from '../../../../shared/components/template-header/template-header.component';
 import {AngularFireAuth} from '@angular/fire/compat/auth';
@@ -14,11 +14,11 @@ import FieldValue = firebase.firestore.FieldValue;
   styleUrls: ['./feedback-dialog.component.sass']
 })
 export class FeedbackDialogComponent {
-  public feedbackForm: FormGroup;
+  public feedbackForm: UntypedFormGroup;
   public valueHasNotChanged = true;
 
   constructor(
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     public snackBar: MatSnackBar,
     public fireAuth: AngularFireAuth,
     private db: AngularFirestore,
diff --git a/frontend/src/app/modules/application-module/dialoges/import/import.component.ts b/frontend/src/app/modules/application-module/dialoges/import/import.component.ts
@@ -1,5 +1,5 @@
 import {Component, OnInit} from '@angular/core';
-import {FormBuilder, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {DatabaseService} from '../../services/database.service';
 import {FirestoreMeal, FirestoreRecipe} from '../../interfaces/firestoreDatatypes';
 import {AuthenticationService} from '../../services/authentication.service';
@@ -22,7 +22,7 @@ import {FirestoreObject} from '../../classes/firebaseObject';
 })
 export class ImportComponent implements OnInit {
 
-  public input: FormGroup;
+  public input: UntypedFormGroup;
   public readyForImport = false;
 
   public mealStr = '';
@@ -37,7 +37,7 @@ export class ImportComponent implements OnInit {
   public recipes: FirestoreRecipe[] = [];
 
 
-  constructor(private formBuilder: FormBuilder, private dbService: DatabaseService, private authService: AuthenticationService) {
+  constructor(private formBuilder: UntypedFormBuilder, private dbService: DatabaseService, private authService: AuthenticationService) {
 
     this.input = this.formBuilder.group({
       url: ''
diff --git a/frontend/src/app/modules/application-module/dialoges/meal-info-without-camp/meal-info-without-camp.component.ts b/frontend/src/app/modules/application-module/dialoges/meal-info-without-camp/meal-info-without-camp.component.ts
@@ -1,5 +1,5 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {FormBuilder, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {MAT_DIALOG_DATA} from '@angular/material/dialog';
 import {Camp} from '../../classes/camp';
 import {Meal} from '../../classes/meal';
@@ -13,14 +13,14 @@ import {DatabaseService} from '../../services/database.service';
 })
 export class MealInfoWithoutCampComponent implements OnInit {
 
-  public mealInfo: FormGroup;
+  public mealInfo: UntypedFormGroup;
   public meal: Meal;
   public mealAccess = false;
   public valueHasChanged = false;
 
 
   constructor(
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     @Inject(MAT_DIALOG_DATA) data: { camp: Camp, meal: Meal, specificMeal: SpecificMeal },
     private db: DatabaseService) {
 
diff --git a/frontend/src/app/modules/application-module/dialoges/meal-info/meal-info.component.ts b/frontend/src/app/modules/application-module/dialoges/meal-info/meal-info.component.ts
@@ -1,5 +1,5 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {FormBuilder, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {MAT_DIALOG_DATA} from '@angular/material/dialog';
 import {Camp} from '../../classes/camp';
 import {Meal} from '../../classes/meal';
@@ -13,7 +13,7 @@ import {DatabaseService} from '../../services/database.service';
 })
 export class MealInfoComponent implements OnInit {
 
-  public mealInfo: FormGroup;
+  public mealInfo: UntypedFormGroup;
 
   public camp: Camp;
   public specificMeal: SpecificMeal;
@@ -25,7 +25,7 @@ export class MealInfoComponent implements OnInit {
 
   constructor(
     @Inject(MAT_DIALOG_DATA) data: { camp: Camp, meal: Meal, specificMeal: SpecificMeal },
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private db: DatabaseService) {
 
     this.camp = data.camp;
diff --git a/frontend/src/app/modules/application-module/dialoges/meal-prepare/meal-prepare.component.ts b/frontend/src/app/modules/application-module/dialoges/meal-prepare/meal-prepare.component.ts
@@ -1,5 +1,5 @@
 import {Component, Inject} from '@angular/core';
-import {FormBuilder, FormControl, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup} from '@angular/forms';
 
 import {SpecificMeal} from '../../classes/specific-meal';
 import {Day} from '../../classes/day';
@@ -13,13 +13,13 @@ import {HelpService} from "../../services/help.service";
 })
 export class MealPrepareComponent {
 
-  public prepareForm: FormGroup;
+  public prepareForm: UntypedFormGroup;
   public dataHasNotChanged = true;
   public readonly dayBeforeDate: Date | undefined;
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public readonly data: { specificMeal: SpecificMeal, days: Day[] },
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     public helpService: HelpService) {
 
     // Select the day before the current day. Only days in the week view are considered
@@ -33,7 +33,7 @@ export class MealPrepareComponent {
     const condition = !this.data.specificMeal.prepare && !this.dayBeforeDate;
 
     this.prepareForm = this.formBuilder.group({
-      hasPrepareDate: new FormControl({value: hasPrepareDate, disabled: condition}),
+      hasPrepareDate: new UntypedFormControl({value: hasPrepareDate, disabled: condition}),
       prepareDate: prepareDate
     });
 
diff --git a/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.ts b/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.ts
diff --git a/frontend/src/app/modules/application-module/dialoges/single-recipe-info/single-recipe-info.component.ts b/frontend/src/app/modules/application-module/dialoges/single-recipe-info/single-recipe-info.component.ts
diff --git a/frontend/src/app/modules/application-module/pages/app-settings-page/app-settings-page.component.ts b/frontend/src/app/modules/application-module/pages/app-settings-page/app-settings-page.component.ts
diff --git a/frontend/src/app/shared/components/header-nav/header-nav.component.sass b/frontend/src/app/shared/components/header-nav/header-nav.component.sass
diff --git a/frontend/src/app/shared/components/main-menu/main-menu.component.sass b/frontend/src/app/shared/components/main-menu/main-menu.component.sass
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,9 @@`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`	`},`
`143`		`- "defaultProject": "eMeal",`
`144`	`143`	`"cli": {`
`145`		`- "defaultCollection": "@angular-eslint/schematics"`
	`144`	`+ "schematicCollections": [`
	`145`	`+ "@angular-eslint/schematics"`
	`146`	`+ ]`
`146`	`147`	`}`
`147`	`148`	`}`