Moved to Angular 20

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

bookie/src/app/regimes/regime-detail/regime-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';
@@ -19,6 +19,12 @@ import { RegimeService } from '../regime.service';
   imports: [MatButtonModule, MatCardModule, MatFormFieldModule, MatInputModule, ReactiveFormsModule],
 })
 export class RegimeDetailComponent implements OnInit, AfterViewInit {
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private dialog = inject(MatDialog);
+  private toaster = inject(ToasterService);
+  private ser = inject(RegimeService);
+
   @ViewChild('nameElement', { static: true }) nameElement?: ElementRef;
   form: FormGroup<{
     name: FormControl<string>;
@@ -28,13 +34,7 @@ export class RegimeDetailComponent implements OnInit, AfterViewInit {
 
   item: Regime = new Regime();
 
-  constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-    private dialog: MatDialog,
-    private toaster: ToasterService,
-    private ser: RegimeService,
-  ) {
+  constructor() {
     // Create form
     this.form = new FormGroup({
       name: new FormControl<string>('', { nonNullable: true }),

bookie/src/app/regimes/regime-list.resolver.ts

@@ -2,7 +2,6 @@ import { inject } from '@angular/core';
 import { ResolveFn } from '@angular/router';
 
 import { Regime } from '../core/regime';
-
 import { RegimeService } from './regime.service';
 
 export const regimeListResolver: ResolveFn<Regime[]> = () => {

bookie/src/app/regimes/regime-list/regime-list.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
 import { MatIconModule } from '@angular/material/icon';
@@ -6,7 +6,6 @@ import { MatTableModule } from '@angular/material/table';
 import { ActivatedRoute, RouterLink } from '@angular/router';
 
 import { Regime } from '../../core/regime';
-
 import { RegimeListDataSource } from './regime-list-datasource';
 
 @Component({
@@ -16,13 +15,13 @@ import { RegimeListDataSource } from './regime-list-datasource';
   imports: [MatButtonModule, MatCardModule, MatIconModule, MatTableModule, RouterLink],
 })
 export class RegimeListComponent implements OnInit {
+  private route = inject(ActivatedRoute);
+
   list: Regime[] = [];
   dataSource: RegimeListDataSource = new RegimeListDataSource(this.list);
   /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
   displayedColumns = ['name', 'header', 'prefix', 'isFixture'];
 
-  constructor(private route: ActivatedRoute) {}
-
   ngOnInit() {
     this.route.data.subscribe((value) => {
       const data = value as { list: Regime[] };

bookie/src/app/regimes/regime.resolver.ts

@@ -2,7 +2,6 @@ import { inject } from '@angular/core';
 import { ResolveFn } from '@angular/router';
 
 import { Regime } from '../core/regime';
-
 import { RegimeService } from './regime.service';
 
 export const regimeResolver: ResolveFn<Regime> = (route) => {

bookie/src/app/regimes/regime.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';
 
@@ -16,10 +16,8 @@ const serviceName = 'RegimeService';
   providedIn: 'root',
 })
 export class RegimeService {
-  constructor(
-    private http: HttpClient,
-    private log: ErrorLoggerService,
-  ) {}
+  private http = inject(HttpClient);
+  private log = inject(ErrorLoggerService);
 
   get(id: number | null): Observable<Regime> {
     const getUrl: string = id === null ? url : `${url}/${id}`;

bookie/src/app/regimes/regimes.routes.ts

@@ -1,10 +1,9 @@
 import { Routes } from '@angular/router';
 
 import { authGuard } from '../auth/auth-guard.service';
-
 import { RegimeDetailComponent } from './regime-detail/regime-detail.component';
-import { RegimeListComponent } from './regime-list/regime-list.component';
 import { regimeListResolver } from './regime-list.resolver';
+import { RegimeListComponent } from './regime-list/regime-list.component';
 import { regimeResolver } from './regime.resolver';
 
 export const routes: Routes = [