Merge remote-tracking branch 'origin/develop' into develop

graphefruit · Nov 23, 2024 · e8b4315 · e8b4315
2 parents f2ac7ab + 6304279
commit e8b4315
Show file tree

Hide file tree

Showing 182 changed files with 4,229 additions and 3,177 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,12 +18,12 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "^18.2.7",
-    "@angular/core": "^18.2.7",
-    "@angular/forms": "^18.2.7",
-    "@angular/platform-browser": "^18.2.7",
-    "@angular/platform-browser-dynamic": "^18.2.7",
-    "@angular/router": "^18.2.7",
+    "@angular/common": "^19.0.0",
+    "@angular/core": "^19.0.0",
+    "@angular/forms": "^19.0.0",
+    "@angular/platform-browser": "^19.0.0",
+    "@angular/platform-browser-dynamic": "^19.0.0",
+    "@angular/router": "^19.0.0",
     "@awesome-cordova-plugins/android-permissions": "^6.4.0",
     "@awesome-cordova-plugins/core": "^6.4.0",
     "@capacitor-community/keep-awake": "^5.0.1",
@@ -63,7 +63,7 @@
     "javascript-color-gradient": "^1.3.2",
     "localforage-cordovasqlitedriver": "^1.8.0",
     "lodash": "^4.17.21",
-    "long": "^5.2.0",
+    "long": "^5.2.3",
     "luxon": "^2.3.0",
     "moment": "^2.29.4",
     "ngx-stars": "^1.6.4",
@@ -73,17 +73,17 @@
     "rxjs": "^7.5.0",
     "swiper": "^11.1.14",
     "tslib": "^2.0.0",
-    "zone.js": "~0.14.10"
+    "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "^0.1802.7",
-    "@angular-devkit/build-angular": "^18.2.7",
-    "@angular-devkit/core": "^18.2.7",
-    "@angular-devkit/schematics": "^18.2.7",
-    "@angular/cli": "^18.2.7",
-    "@angular/compiler": "^18.2.7",
-    "@angular/compiler-cli": "^18.2.7",
-    "@angular/language-service": "^18.2.7",
+    "@angular-devkit/architect": "^0.1900.1",
+    "@angular-devkit/build-angular": "^19.0.1",
+    "@angular-devkit/core": "^19.0.1",
+    "@angular-devkit/schematics": "^19.0.1",
+    "@angular/cli": "^19.0.1",
+    "@angular/compiler": "^19.0.0",
+    "@angular/compiler-cli": "^19.0.0",
+    "@angular/language-service": "^19.0.0",
     "@capacitor/assets": "^3.0.5",
     "@capacitor/cli": "6.1.2",
     "@ionic/angular-toolkit": "^9.0.0",
@@ -114,7 +114,7 @@
     "stylelint-config-standard": "^20.0.0",
     "ts-node": "~8.3.0",
     "ts-proto": "^1.122.0",
-    "typescript": "^5.4.5",
+    "typescript": "^5.6.3",
     "typescript-eslint": "8.2.0",
     "webpack-subresource-integrity": "^1.5.2"
   },

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -69,9 +69,10 @@ declare var window;
 register();
 
 @Component({
-  selector: 'app-root',
-  templateUrl: 'app.component.html',
-  encapsulation: ViewEncapsulation.None,
+    selector: 'app-root',
+    templateUrl: 'app.component.html',
+    encapsulation: ViewEncapsulation.None,
+    standalone: false
 })
 export class AppComponent implements AfterViewInit {
   public toggleAbout: boolean = false;

diff --git a/src/app/bean-parameter/bean-list-view-parameter/bean-list-view-parameter.component.ts b/src/app/bean-parameter/bean-list-view-parameter/bean-list-view-parameter.component.ts
@@ -5,9 +5,10 @@ import { UISettingsStorage } from '../../../services/uiSettingsStorage';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 
 @Component({
-  selector: 'app-bean-list-view-parameter',
-  templateUrl: './bean-list-view-parameter.component.html',
-  styleUrls: ['./bean-list-view-parameter.component.scss'],
+    selector: 'app-bean-list-view-parameter',
+    templateUrl: './bean-list-view-parameter.component.html',
+    styleUrls: ['./bean-list-view-parameter.component.scss'],
+    standalone: false
 })
 export class BeanListViewParameterComponent {
   public bean_segment = 'general';

diff --git a/src/app/bean-parameter/bean-manage-parameter/bean-manage-parameter.component.ts b/src/app/bean-parameter/bean-manage-parameter/bean-manage-parameter.component.ts
@@ -6,9 +6,10 @@ import { UISettingsStorage } from '../../../services/uiSettingsStorage';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 
 @Component({
-  selector: 'app-bean-manage-parameter',
-  templateUrl: './bean-manage-parameter.component.html',
-  styleUrls: ['./bean-manage-parameter.component.scss'],
+    selector: 'app-bean-manage-parameter',
+    templateUrl: './bean-manage-parameter.component.html',
+    styleUrls: ['./bean-manage-parameter.component.scss'],
+    standalone: false
 })
 export class BeanManageParameterComponent {
   public bean_segment = 'general';

diff --git a/src/app/bean-parameter/bean-parameter.page.ts b/src/app/bean-parameter/bean-parameter.page.ts
@@ -2,9 +2,10 @@ import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 
 @Component({
-  selector: 'app-bean-parameter',
-  templateUrl: './bean-parameter.page.html',
-  styleUrls: ['./bean-parameter.page.scss'],
+    selector: 'app-bean-parameter',
+    templateUrl: './bean-parameter.page.html',
+    styleUrls: ['./bean-parameter.page.scss'],
+    standalone: false
 })
 export class BeanParameterPage {
   constructor(private readonly router: Router) {}

diff --git a/src/app/beans/bean-archive-popover/bean-archive-popover.component.ts b/src/app/beans/bean-archive-popover/bean-archive-popover.component.ts
@@ -10,9 +10,10 @@ import { UISettingsStorage } from '../../../services/uiSettingsStorage';
 import { UIHelper } from '../../../services/uiHelper';
 
 @Component({
-  selector: 'app-bean-archive-popover',
-  templateUrl: './bean-archive-popover.component.html',
-  styleUrls: ['./bean-archive-popover.component.scss'],
+    selector: 'app-bean-archive-popover',
+    templateUrl: './bean-archive-popover.component.html',
+    styleUrls: ['./bean-archive-popover.component.scss'],
+    standalone: false
 })
 export class BeanArchivePopoverComponent implements OnInit {
   public static COMPONENT_ID = 'bean-archive-popover';

diff --git a/src/app/beans/bean-filter/bean-filter.component.ts b/src/app/beans/bean-filter/bean-filter.component.ts
@@ -13,9 +13,10 @@ import { IBeanPageFilter } from '../../../interfaces/bean/iBeanPageFilter';
 import { BEAN_ROASTING_TYPE_ENUM } from '../../../enums/beans/beanRoastingType';
 
 @Component({
-  selector: 'app-bean-filter',
-  templateUrl: './bean-filter.component.html',
-  styleUrls: ['./bean-filter.component.scss'],
+    selector: 'app-bean-filter',
+    templateUrl: './bean-filter.component.html',
+    styleUrls: ['./bean-filter.component.scss'],
+    standalone: false
 })
 export class BeanFilterComponent implements OnInit {
   public static readonly COMPONENT_ID = 'bean-filter';

diff --git a/.../beans/bean-internal-share-code-generator/bean-internal-share-code-generator.component.ts b/.../beans/bean-internal-share-code-generator/bean-internal-share-code-generator.component.ts
@@ -14,9 +14,10 @@ import { BEAN_CODE_ACTION } from '../../../enums/beans/beanCodeAction';
 import { NfcService } from '../../../services/nfcService/nfc-service.service';
 
 @Component({
-  selector: 'app-bean-internal-share-code-generator.',
-  templateUrl: './bean-internal-share-code-generator.component.html',
-  styleUrls: ['./bean-internal-share-code-generator.component.scss'],
+    selector: 'app-bean-internal-share-code-generator.',
+    templateUrl: './bean-internal-share-code-generator.component.html',
+    styleUrls: ['./bean-internal-share-code-generator.component.scss'],
+    standalone: false
 })
 export class BeanInternalShareCodeGeneratorComponent implements OnInit {
   public static COMPONENT_ID = 'bean-internal-share-code-generator-popover';

diff --git a/src/app/beans/bean-modal-select/bean-modal-select.component.ts b/src/app/beans/bean-modal-select/bean-modal-select.component.ts
@@ -25,9 +25,10 @@ import { BeanSortFilterHelperService } from '../../../services/beanSortFilterHel
 import { BEAN_FUNCTION_PIPE_ENUM } from '../../../enums/beans/beanFunctionPipe';
 
 @Component({
-  selector: 'bean-modal-select',
-  templateUrl: './bean-modal-select.component.html',
-  styleUrls: ['./bean-modal-select.component.scss'],
+    selector: 'bean-modal-select',
+    templateUrl: './bean-modal-select.component.html',
+    styleUrls: ['./bean-modal-select.component.scss'],
+    standalone: false
 })
 export class BeanModalSelectComponent implements OnInit {
   public static COMPONENT_ID = 'bean-modal-select';

diff --git a/src/app/beans/bean-popover-actions/bean-popover-actions.component.ts b/src/app/beans/bean-popover-actions/bean-popover-actions.component.ts
@@ -10,9 +10,10 @@ import { UISettingsStorage } from '../../../services/uiSettingsStorage';
 import { Settings } from '../../../classes/settings/settings';
 
 @Component({
-  selector: 'bean-popover-actions',
-  templateUrl: './bean-popover-actions.component.html',
-  styleUrls: ['./bean-popover-actions.component.scss'],
+    selector: 'bean-popover-actions',
+    templateUrl: './bean-popover-actions.component.html',
+    styleUrls: ['./bean-popover-actions.component.scss'],
+    standalone: false
 })
 export class BeanPopoverActionsComponent implements OnInit {
   public static COMPONENT_ID = 'bean-popover-actions';

diff --git a/src/app/beans/bean-popover-add/bean-popover-add.component.ts b/src/app/beans/bean-popover-add/bean-popover-add.component.ts
@@ -5,9 +5,10 @@ import { ModalController } from '@ionic/angular';
 import { BEAN_POPOVER_ADD_ACTION } from '../../../enums/beans/beanPopoverAddAction';
 
 @Component({
-  selector: 'app-bean-popover-add',
-  templateUrl: './bean-popover-add.component.html',
-  styleUrls: ['./bean-popover-add.component.scss'],
+    selector: 'app-bean-popover-add',
+    templateUrl: './bean-popover-add.component.html',
+    styleUrls: ['./bean-popover-add.component.scss'],
+    standalone: false
 })
 export class BeanPopoverAddComponent implements OnInit {
   public static COMPONENT_ID = 'bean-popover-add';

diff --git a/src/app/beans/bean-popover-freeze/bean-popover-freeze.component.ts b/src/app/beans/bean-popover-freeze/bean-popover-freeze.component.ts
@@ -17,9 +17,10 @@ import { BEAN_FREEZING_STORAGE_ENUM } from '../../../enums/beans/beanFreezingSto
 
 declare var cordova;
 @Component({
-  selector: 'app-bean-popover-freeze',
-  templateUrl: './bean-popover-freeze.component.html',
-  styleUrls: ['./bean-popover-freeze.component.scss'],
+    selector: 'app-bean-popover-freeze',
+    templateUrl: './bean-popover-freeze.component.html',
+    styleUrls: ['./bean-popover-freeze.component.scss'],
+    standalone: false
 })
 export class BeanPopoverFreezeComponent implements OnInit {
   public static COMPONENT_ID = 'bean-popover-freeze';

diff --git a/src/app/beans/bean-popover-frozen-list/bean-popover-frozen-list.component.ts b/src/app/beans/bean-popover-frozen-list/bean-popover-frozen-list.component.ts
@@ -12,9 +12,10 @@ import { ModalController } from '@ionic/angular';
 import { UIBeanHelper } from '../../../services/uiBeanHelper';
 
 @Component({
-  selector: 'app-bean-popover-frozen-list',
-  templateUrl: './bean-popover-frozen-list.component.html',
-  styleUrls: ['./bean-popover-frozen-list.component.scss'],
+    selector: 'app-bean-popover-frozen-list',
+    templateUrl: './bean-popover-frozen-list.component.html',
+    styleUrls: ['./bean-popover-frozen-list.component.scss'],
+    standalone: false
 })
 export class BeanPopoverFrozenListComponent {
   public static readonly COMPONENT_ID = 'bean-popover-frozen-list';

diff --git a/src/app/beans/bean-popover-list/bean-popover-list.component.ts b/src/app/beans/bean-popover-list/bean-popover-list.component.ts
@@ -11,9 +11,10 @@ import { AgVirtualSrollComponent } from 'ag-virtual-scroll';
 import { ModalController } from '@ionic/angular';
 
 @Component({
-  selector: 'app-bean-popover-list',
-  templateUrl: './bean-popover-list.component.html',
-  styleUrls: ['./bean-popover-list.component.scss'],
+    selector: 'app-bean-popover-list',
+    templateUrl: './bean-popover-list.component.html',
+    styleUrls: ['./bean-popover-list.component.scss'],
+    standalone: false
 })
 export class BeanPopoverListComponent {
   public static readonly COMPONENT_ID = 'bean-popover-list';

diff --git a/src/app/beans/bean-sort/bean-sort.component.ts b/src/app/beans/bean-sort/bean-sort.component.ts
@@ -6,9 +6,10 @@ import { BEAN_SORT_AFTER } from '../../../enums/beans/beanSortAfter';
 import { BEAN_SORT_ORDER } from '../../../enums/beans/beanSortOrder';
 
 @Component({
-  selector: 'app-bean-sort',
-  templateUrl: './bean-sort.component.html',
-  styleUrls: ['./bean-sort.component.scss'],
+    selector: 'app-bean-sort',
+    templateUrl: './bean-sort.component.html',
+    styleUrls: ['./bean-sort.component.scss'],
+    standalone: false
 })
 export class BeanSortComponent implements OnInit {
   public static readonly COMPONENT_ID = 'bean-sort';

diff --git a/src/app/beans/beans-add/beans-add.component.ts b/src/app/beans/beans-add/beans-add.component.ts
@@ -18,9 +18,10 @@ import { UISettingsStorage } from '../../../services/uiSettingsStorage';
 import { Settings } from '../../../classes/settings/settings';
 
 @Component({
-  selector: 'beans-add',
-  templateUrl: './beans-add.component.html',
-  styleUrls: ['./beans-add.component.scss'],
+    selector: 'beans-add',
+    templateUrl: './beans-add.component.html',
+    styleUrls: ['./beans-add.component.scss'],
+    standalone: false
 })
 export class BeansAddComponent implements OnInit {
   public static readonly COMPONENT_ID = 'bean-add';

diff --git a/src/app/beans/beans-detail/beans-detail.component.ts b/src/app/beans/beans-detail/beans-detail.component.ts
@@ -16,9 +16,10 @@ import { Settings } from '../../../classes/settings/settings';
 import { UIBeanHelper } from '../../../services/uiBeanHelper';
 
 @Component({
-  selector: 'app-beans-detail',
-  templateUrl: './beans-detail.component.html',
-  styleUrls: ['./beans-detail.component.scss'],
+    selector: 'app-beans-detail',
+    templateUrl: './beans-detail.component.html',
+    styleUrls: ['./beans-detail.component.scss'],
+    standalone: false
 })
 export class BeansDetailComponent implements OnInit {
   public static readonly COMPONENT_ID: string = 'bean-detail';

diff --git a/src/app/beans/beans-edit/beans-edit.component.ts b/src/app/beans/beans-edit/beans-edit.component.ts
@@ -13,9 +13,10 @@ import { UIAlert } from '../../../services/uiAlert';
 import { Subscription } from 'rxjs';
 
 @Component({
-  selector: 'beans-edit',
-  templateUrl: './beans-edit.component.html',
-  styleUrls: ['./beans-edit.component.scss'],
+    selector: 'beans-edit',
+    templateUrl: './beans-edit.component.html',
+    styleUrls: ['./beans-edit.component.scss'],
+    standalone: false
 })
 export class BeansEditComponent implements OnInit {
   public static readonly COMPONENT_ID: string = 'bean-edit';

diff --git a/src/app/beans/beans.page.ts b/src/app/beans/beans.page.ts
@@ -30,9 +30,10 @@ import { BeanSortFilterHelperService } from '../../services/beanSortFilterHelper
 import { NfcService } from '../../services/nfcService/nfc-service.service';
 
 @Component({
-  selector: 'beans',
-  templateUrl: './beans.page.html',
-  styleUrls: ['./beans.page.scss'],
+    selector: 'beans',
+    templateUrl: './beans.page.html',
+    styleUrls: ['./beans.page.scss'],
+    standalone: false
 })
 export class BeansPage implements OnDestroy {
   public beans: Array<Bean> = [];

diff --git a/src/app/brew-parameter/brew-parameter.page.ts b/src/app/brew-parameter/brew-parameter.page.ts
@@ -3,9 +3,10 @@ import { NavController } from '@ionic/angular';
 import { Router } from '@angular/router';
 
 @Component({
-  selector: 'brew-parameter',
-  templateUrl: './brew-parameter.page.html',
-  styleUrls: ['./brew-parameter.page.scss'],
+    selector: 'brew-parameter',
+    templateUrl: './brew-parameter.page.html',
+    styleUrls: ['./brew-parameter.page.scss'],
+    standalone: false
 })
 export class BrewParameterPage implements OnInit {
   constructor(public navCtrl: NavController, private readonly router: Router) {}

diff --git a/src/app/brew-parameter/default-parameter/default-parameter.component.ts b/src/app/brew-parameter/default-parameter/default-parameter.component.ts
@@ -3,9 +3,10 @@ import {UISettingsStorage} from '../../../services/uiSettingsStorage';
 import {Settings} from '../../../classes/settings/settings';
 
 @Component({
-  selector: 'default-parameter',
-  templateUrl: './default-parameter.component.html',
-  styleUrls: ['./default-parameter.component.scss'],
+    selector: 'default-parameter',
+    templateUrl: './default-parameter.component.html',
+    styleUrls: ['./default-parameter.component.scss'],
+    standalone: false
 })
 export class DefaultParameterComponent implements OnInit {
 

diff --git a/src/app/brew-parameter/list-view-parameter/list-view-parameter.component.ts b/src/app/brew-parameter/list-view-parameter/list-view-parameter.component.ts
@@ -3,9 +3,10 @@ import {Settings} from '../../../classes/settings/settings';
 import {UISettingsStorage} from '../../../services/uiSettingsStorage';
 
 @Component({
-  selector: 'list-view-parameter',
-  templateUrl: './list-view-parameter.component.html',
-  styleUrls: ['./list-view-parameter.component.scss'],
+    selector: 'list-view-parameter',
+    templateUrl: './list-view-parameter.component.html',
+    styleUrls: ['./list-view-parameter.component.scss'],
+    standalone: false
 })
 export class ListViewParameterComponent implements OnInit {
 

diff --git a/src/app/brew-parameter/manage-parameter/manage-parameter.component.ts b/src/app/brew-parameter/manage-parameter/manage-parameter.component.ts
@@ -3,9 +3,10 @@ import {UISettingsStorage} from '../../../services/uiSettingsStorage';
 import {Settings} from '../../../classes/settings/settings';
 
 @Component({
-  selector: 'manage-parameter',
-  templateUrl: './manage-parameter.component.html',
-  styleUrls: ['./manage-parameter.component.scss'],
+    selector: 'manage-parameter',
+    templateUrl: './manage-parameter.component.html',
+    styleUrls: ['./manage-parameter.component.scss'],
+    standalone: false
 })
 export class ManageParameterComponent implements OnInit {
 

diff --git a/src/app/brew-parameter/repeat-parameter/repeat-parameter.component.ts b/src/app/brew-parameter/repeat-parameter/repeat-parameter.component.ts
@@ -3,9 +3,10 @@ import { Settings } from '../../../classes/settings/settings';
 import { UISettingsStorage } from '../../../services/uiSettingsStorage';
 
 @Component({
-  selector: 'app-repeat-parameter',
-  templateUrl: './repeat-parameter.component.html',
-  styleUrls: ['./repeat-parameter.component.scss'],
+    selector: 'app-repeat-parameter',
+    templateUrl: './repeat-parameter.component.html',
+    styleUrls: ['./repeat-parameter.component.scss'],
+    standalone: false
 })
 export class RepeatParameterComponent implements OnInit {
   public settings: Settings;

diff --git a/src/app/brew-parameter/sort-parameter/sort-parameter.component.ts b/src/app/brew-parameter/sort-parameter/sort-parameter.component.ts
@@ -3,9 +3,10 @@ import {Settings} from '../../../classes/settings/settings';
 import {UISettingsStorage} from '../../../services/uiSettingsStorage';
 
 @Component({
-  selector: 'sort-parameter',
-  templateUrl: './sort-parameter.component.html',
-  styleUrls: ['./sort-parameter.component.scss'],
+    selector: 'sort-parameter',
+    templateUrl: './sort-parameter.component.html',
+    styleUrls: ['./sort-parameter.component.scss'],
+    standalone: false
 })
 export class SortParameterComponent implements OnInit {
   public settings: Settings;