Moved to Angular v20 and Tailwind v4 plus all related dependencies

Renamed Docker directory.

Also serving static files from FastAPI.

overlord/src/app/purchase/purchase-dialog.component.ts

@@ -1,17 +1,17 @@
 import { CdkScrollable } from '@angular/cdk/scrolling';
 import { AsyncPipe } from '@angular/common';
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, inject, OnInit } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
-import { MatAutocompleteSelectedEvent, MatAutocompleteTrigger, MatAutocomplete } from '@angular/material/autocomplete';
+import { MatAutocomplete, MatAutocompleteSelectedEvent, MatAutocompleteTrigger } from '@angular/material/autocomplete';
 import { MatButton } from '@angular/material/button';
 import { MatOption } from '@angular/material/core';
 import {
   MAT_DIALOG_DATA,
-  MatDialogRef,
-  MatDialogTitle,
-  MatDialogContent,
   MatDialogActions,
   MatDialogClose,
+  MatDialogContent,
+  MatDialogRef,
+  MatDialogTitle,
 } from '@angular/material/dialog';
 import { MatFormField, MatLabel } from '@angular/material/form-field';
 import { MatInput } from '@angular/material/input';
@@ -30,7 +30,6 @@ import { MathService } from '../shared/math.service';
   selector: 'app-purchase-dialog',
   templateUrl: './purchase-dialog.component.html',
   styleUrls: ['./purchase-dialog.component.css'],
-  standalone: true,
   imports: [
     MatDialogTitle,
     CdkScrollable,
@@ -49,6 +48,14 @@ import { MathService } from '../shared/math.service';
   ],
 })
 export class PurchaseDialogComponent implements OnInit {
+  dialogRef = inject<MatDialogRef<PurchaseDialogComponent>>(MatDialogRef);
+  data = inject<{
+    inventory: Inventory;
+  }>(MAT_DIALOG_DATA);
+
+  private math = inject(MathService);
+  private productSer = inject(ProductService);
+
   products: Observable<ProductSku[]>;
   form: FormGroup<{
     product: FormControl<string | null>;
@@ -60,12 +67,7 @@ export class PurchaseDialogComponent implements OnInit {
 
   product: ProductSku = new ProductSku();
 
-  constructor(
-    public dialogRef: MatDialogRef<PurchaseDialogComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: { inventory: Inventory },
-    private math: MathService,
-    private productSer: ProductService,
-  ) {
+  constructor() {
     this.form = new FormGroup({
       product: new FormControl<string | null>(null),
       quantity: new FormControl('', { nonNullable: true }),

overlord/src/app/purchase/purchase.component.ts

@@ -1,36 +1,37 @@
 import { COMMA, ENTER } from '@angular/cdk/keycodes';
-import { AsyncPipe, DecimalPipe, PercentPipe, CurrencyPipe } from '@angular/common';
-import { AfterViewInit, Component, ElementRef, OnInit, ViewChild, HostListener } from '@angular/core';
+import { AsyncPipe, CurrencyPipe, DecimalPipe, PercentPipe } from '@angular/common';
+import { AfterViewInit, Component, ElementRef, HostListener, inject, OnInit, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
-import { MatAutocompleteSelectedEvent, MatAutocompleteTrigger, MatAutocomplete } from '@angular/material/autocomplete';
+import { MatAutocomplete, MatAutocompleteSelectedEvent, MatAutocompleteTrigger } from '@angular/material/autocomplete';
 import { MatButton, MatIconButton } from '@angular/material/button';
 import {
   MatCard,
-  MatCardHeader,
-  MatCardTitleGroup,
-  MatCardTitle,
-  MatCardContent,
   MatCardActions,
+  MatCardContent,
+  MatCardHeader,
+  MatCardTitle,
+  MatCardTitleGroup,
 } from '@angular/material/card';
-import { MatChipInputEvent, MatChipGrid, MatChipRow, MatChipRemove, MatChipInput } from '@angular/material/chips';
+import { MatChipGrid, MatChipInput, MatChipInputEvent, MatChipRemove, MatChipRow } from '@angular/material/chips';
 import { MatOption } from '@angular/material/core';
-import { MatDatepickerInput, MatDatepickerToggle, MatDatepicker } from '@angular/material/datepicker';
+import { MatDatepicker, MatDatepickerInput, MatDatepickerToggle } from '@angular/material/datepicker';
 import { MatDialog } from '@angular/material/dialog';
-import { MatSuffix, MatFormField, MatLabel, MatHint, MatPrefix } from '@angular/material/form-field';
+import { MatFormField, MatHint, MatLabel, MatPrefix, MatSuffix } from '@angular/material/form-field';
 import { MatIcon } from '@angular/material/icon';
 import { MatInput } from '@angular/material/input';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import { MatSort } from '@angular/material/sort';
 import {
-  MatTable,
-  MatColumnDef,
-  MatHeaderCellDef,
-  MatHeaderCell,
-  MatCellDef,
   MatCell,
-  MatHeaderRowDef,
+  MatCellDef,
+  MatColumnDef,
+  MatHeaderCell,
+  MatHeaderCellDef,
   MatHeaderRow,
-  MatRowDef,
+  MatHeaderRowDef,
   MatRow,
+  MatRowDef,
+  MatTable,
 } from '@angular/material/table';
 import { ActivatedRoute, Router } from '@angular/router';
 import { round } from 'mathjs';
@@ -47,9 +48,6 @@ import { DbFile } from '../core/db-file';
 import { Inventory } from '../core/inventory';
 import { Product } from '../core/product';
 import { ProductSku } from '../core/product-sku';
-import { Tag } from '../tag/tag';
-import { TagService } from '../tag/tag.service';
-import { MatSnackBar } from '@angular/material/snack-bar';
 import { User } from '../core/user';
 import { Voucher } from '../core/voucher';
 import { VoucherService } from '../core/voucher.service';
@@ -60,7 +58,8 @@ import { ImageDialogComponent } from '../shared/image-dialog/image-dialog.compon
 import { ImageService } from '../shared/image.service';
 import { LocalTimePipe } from '../shared/local-time.pipe';
 import { MathService } from '../shared/math.service';
-
+import { Tag } from '../tag/tag';
+import { TagService } from '../tag/tag.service';
 import { PurchaseDataSource } from './purchase-datasource';
 import { PurchaseDialogComponent } from './purchase-dialog.component';
 
@@ -68,7 +67,6 @@ import { PurchaseDialogComponent } from './purchase-dialog.component';
   selector: 'app-purchase',
   templateUrl: './purchase.component.html',
   styleUrls: ['./purchase.component.css'],
-  standalone: true,
   imports: [
     MatCard,
     MatCardHeader,
@@ -116,6 +114,18 @@ import { PurchaseDialogComponent } from './purchase-dialog.component';
   ],
 })
 export class PurchaseComponent implements OnInit, AfterViewInit {
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private dialog = inject(MatDialog);
+  private snackBar = inject(MatSnackBar);
+  auth = inject(AuthService);
+  private math = inject(MathService);
+  image = inject(ImageService);
+  private ser = inject(VoucherService);
+  private productSer = inject(ProductService);
+  private accountSer = inject(AccountService);
+  private tagSer = inject(TagService);
+
   @ViewChild('accountElement', { static: true }) accountElement!: ElementRef<HTMLInputElement>;
   @ViewChild('productElement', { static: true }) productElement!: ElementRef<HTMLInputElement>;
   @ViewChild('dateElement', { static: true }) dateElement!: ElementRef<HTMLInputElement>;
@@ -172,19 +182,7 @@ export class PurchaseComponent implements OnInit, AfterViewInit {
   tags: Observable<Tag[]>;
   products: Observable<ProductSku[]>;
 
-  constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-    private dialog: MatDialog,
-    private snackBar: MatSnackBar,
-    public auth: AuthService,
-    private math: MathService,
-    public image: ImageService,
-    private ser: VoucherService,
-    private productSer: ProductService,
-    private accountSer: AccountService,
-    private tagSer: TagService,
-  ) {
+  constructor() {
     this.form = new FormGroup({
       date: new FormControl(new Date(), { nonNullable: true }),
       account: new FormControl<string | null>(null),

overlord/src/app/purchase/purchase.resolver.spec.ts

@@ -2,7 +2,6 @@ import { TestBed } from '@angular/core/testing';
 import { ResolveFn } from '@angular/router';
 
 import { Voucher } from '../core/voucher';
-
 import { purchaseResolver } from './purchase.resolver';
 
 describe('purchaseResolver', () => {

overlord/src/app/purchase/purchase.routes.ts

@@ -1,7 +1,6 @@
 import { Routes } from '@angular/router';
 
 import { authGuard } from '../auth/auth-guard.service';
-
 import { PurchaseComponent } from './purchase.component';
 import { purchaseResolver } from './purchase.resolver';