Moved to Angular 20

Moved to Tailwind 4
Moved to Python 3.13
Enabled arm64/v8 Builds

bookie/src/app/modifiers/modifier-detail/modifier-detail.component.ts

@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild, inject } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
@@ -32,6 +32,12 @@ import { ModifierService } from '../modifier.service';
   ],
 })
 export class ModifierDetailComponent implements OnInit, AfterViewInit {
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private dialog = inject(MatDialog);
+  private toaster = inject(ToasterService);
+  private ser = inject(ModifierService);
+
   @ViewChild('name', { static: true }) nameElement?: ElementRef;
   form: FormGroup<{
     name: FormControl<string>;
@@ -44,13 +50,7 @@ export class ModifierDetailComponent implements OnInit, AfterViewInit {
   modifierCategories: ModifierCategory[] = [];
   item: Modifier = new Modifier();
 
-  constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-    private dialog: MatDialog,
-    private toaster: ToasterService,
-    private ser: ModifierService,
-  ) {
+  constructor() {
     // Create form
     this.form = new FormGroup({
       name: new FormControl<string>('', { nonNullable: true }),

bookie/src/app/modifiers/modifier-list.resolver.ts

@@ -2,7 +2,6 @@ import { inject } from '@angular/core';
 import { ResolveFn } from '@angular/router';
 
 import { Modifier } from '../core/modifier';
-
 import { ModifierService } from './modifier.service';
 
 export const modifierListResolver: ResolveFn<Modifier[]> = () => {

bookie/src/app/modifiers/modifier-list/modifier-list.component.ts

@@ -1,5 +1,5 @@
 import { CurrencyPipe } from '@angular/common';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
@@ -13,7 +13,6 @@ import { BehaviorSubject } from 'rxjs';
 
 import { Modifier } from '../../core/modifier';
 import { ModifierCategory } from '../../core/modifier-category';
-
 import { ModifierListDataSource } from './modifier-list-datasource';
 
 @Component({
@@ -34,6 +33,9 @@ import { ModifierListDataSource } from './modifier-list-datasource';
   ],
 })
 export class ModifierListComponent implements OnInit {
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+
   // @ViewChild('table', { static: true }) table?: MatTable<Modifier>;
   filter = new BehaviorSubject<string>('');
   data: BehaviorSubject<Modifier[]> = new BehaviorSubject<Modifier[]>([]);
@@ -47,10 +49,7 @@ export class ModifierListComponent implements OnInit {
   /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
   displayedColumns: string[] = ['name', 'showInBill', 'price', 'isActive', 'modifierCategory'];
 
-  constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-  ) {
+  constructor() {
     this.form = new FormGroup({
       modifierCategory: new FormControl<string | null>(''),
     });

bookie/src/app/modifiers/modifier.resolver.ts

@@ -2,7 +2,6 @@ import { inject } from '@angular/core';
 import { ResolveFn } from '@angular/router';
 
 import { Modifier } from '../core/modifier';
-
 import { ModifierService } from './modifier.service';
 
 export const modifierResolver: ResolveFn<Modifier> = (route) => {

bookie/src/app/modifiers/modifier.service.ts

@@ -1,5 +1,5 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
@@ -15,10 +15,8 @@ const serviceName = 'ModifierService';
 
 @Injectable({ providedIn: 'root' })
 export class ModifierService {
-  constructor(
-    private http: HttpClient,
-    private log: ErrorLoggerService,
-  ) {}
+  private http = inject(HttpClient);
+  private log = inject(ErrorLoggerService);
 
   get(id: string | null): Observable<Modifier> {
     const getUrl: string = id === null ? url : `${url}/${id}`;

bookie/src/app/modifiers/modifiers.routes.ts

@@ -2,10 +2,9 @@ import { Routes } from '@angular/router';
 
 import { authGuard } from '../auth/auth-guard.service';
 import { modifierCategoryListResolver } from '../modifier-categories/modifier-category-list.resolver';
-
 import { ModifierDetailComponent } from './modifier-detail/modifier-detail.component';
-import { ModifierListComponent } from './modifier-list/modifier-list.component';
 import { modifierListResolver } from './modifier-list.resolver';
+import { ModifierListComponent } from './modifier-list/modifier-list.component';
 import { modifierResolver } from './modifier.resolver';
 
 export const routes: Routes = [