Chore: Upgrade to Angular v18

Chore: Upgrade to Python 3.12
Chore: Upgrade to psycopg3

bookie/src/app/product/product-detail/product-detail.component.html

@@ -32,17 +32,21 @@
         <mat-form-field class="flex-auto mr-5">
           <mat-label>Menu Category</mat-label>
           <mat-select formControlName="menuCategory">
-            <mat-option *ngFor="let mc of menuCategories" [value]="mc.id">
-              {{ mc.name }}
-            </mat-option>
+            @for (mc of menuCategories; track mc) {
+              <mat-option [value]="mc.id">
+                {{ mc.name }}
+              </mat-option>
+            }
           </mat-select>
         </mat-form-field>
         <mat-form-field class="flex-auto">
           <mat-label>Sale Category</mat-label>
           <mat-select formControlName="saleCategory">
-            <mat-option *ngFor="let sc of saleCategories" [value]="sc.id">
-              {{ sc.name }}
-            </mat-option>
+            @for (sc of saleCategories; track sc) {
+              <mat-option [value]="sc.id">
+                {{ sc.name }}
+              </mat-option>
+            }
           </mat-select>
         </mat-form-field>
       </div>
@@ -50,6 +54,8 @@
   </mat-card-content>
   <mat-card-actions>
     <button mat-raised-button color="primary" class="mr-5" (click)="save()">Save</button>
-    <button mat-raised-button color="warn" (click)="confirmDelete()" *ngIf="!!item.id">Delete</button>
+    @if (!!item.id) {
+      <button mat-raised-button color="warn" (click)="confirmDelete()">Delete</button>
+    }
   </mat-card-actions>
 </mat-card>

bookie/src/app/product/product-detail/product-detail.component.spec.ts

@@ -8,7 +8,7 @@ describe('ProductDetailComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [ProductDetailComponent],
+      imports: [ProductDetailComponent],
     }).compileComponents();
   }));
 

bookie/src/app/product/product-detail/product-detail.component.ts

@@ -1,6 +1,13 @@
 import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
+import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { MatButton } from '@angular/material/button';
+import { MatCard, MatCardHeader, MatCardTitle, MatCardContent, MatCardActions } from '@angular/material/card';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { MatOption } from '@angular/material/core';
 import { MatDialog } from '@angular/material/dialog';
+import { MatFormField, MatLabel } from '@angular/material/form-field';
+import { MatInput } from '@angular/material/input';
+import { MatSelect } from '@angular/material/select';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { MenuCategory } from '../../core/menu-category';
@@ -14,6 +21,22 @@ import { ProductService } from '../product.service';
   selector: 'app-product-detail',
   templateUrl: './product-detail.component.html',
   styleUrls: ['./product-detail.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitle,
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatLabel,
+    MatInput,
+    MatCheckbox,
+    MatSelect,
+    MatOption,
+    MatCardActions,
+    MatButton,
+  ],
 })
 export class ProductDetailComponent implements OnInit, AfterViewInit {
   @ViewChild('name', { static: true }) nameElement?: ElementRef;
@@ -88,27 +111,27 @@ export class ProductDetailComponent implements OnInit, AfterViewInit {
   }
 
   save() {
-    this.ser.saveOrUpdate(this.getItem()).subscribe(
-      () => {
+    this.ser.saveOrUpdate(this.getItem()).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/products');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   delete() {
-    this.ser.delete(this.item.id as string).subscribe(
-      () => {
+    this.ser.delete(this.item.id as string).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/products');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   confirmDelete(): void {

bookie/src/app/product/product-list-resolver.service.ts

@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-
-import { Product } from '../core/product';
-
-import { ProductService } from './product.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductListResolver {
-  constructor(private ser: ProductService) {}
-
-  resolve(): Observable<Product[]> {
-    return this.ser.list();
-  }
-}

bookie/src/app/product/product-list.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Product } from '../core/product';
+
+import { ProductService } from './product.service';
+
+export const productListResolver: ResolveFn<Product[]> = () => {
+  return inject(ProductService).list();
+};

bookie/src/app/product/product-list/product-list.component.html

@@ -30,9 +30,11 @@
           <mat-label>Menu Category</mat-label>
           <mat-select formControlName="menuCategory" (selectionChange)="filterOn($event.value)">
             <mat-option>-- All Products --</mat-option>
-            <mat-option *ngFor="let mc of menuCategories" [value]="mc.id">
-              {{ mc.name }}
-            </mat-option>
+            @for (mc of menuCategories; track mc) {
+              <mat-option [value]="mc.id">
+                {{ mc.name }}
+              </mat-option>
+            }
           </mat-select>
         </mat-form-field>
       </div>

bookie/src/app/product/product-list/product-list.component.spec.ts

@@ -8,7 +8,7 @@ describe('ProductListComponent', () => {
 
   beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [ProductListComponent],
+      imports: [ProductListComponent],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ProductListComponent);

bookie/src/app/product/product-list/product-list.component.ts

@@ -1,7 +1,27 @@
-import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { CdkDragDrop, moveItemInArray, CdkDropList, CdkDrag } from '@angular/cdk/drag-drop';
+import { AsyncPipe, DecimalPipe, CurrencyPipe } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
+import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { MatButton, MatIconButton, MatAnchor } from '@angular/material/button';
+import { MatCard, MatCardHeader, MatCardTitleGroup, MatCardTitle, MatCardContent } from '@angular/material/card';
+import { MatOption } from '@angular/material/core';
+import { MatFormField, MatLabel } from '@angular/material/form-field';
+import { MatIcon } from '@angular/material/icon';
+import { MatInput } from '@angular/material/input';
+import { MatSelect } from '@angular/material/select';
+import {
+  MatTable,
+  MatColumnDef,
+  MatHeaderCellDef,
+  MatHeaderCell,
+  MatCellDef,
+  MatCell,
+  MatHeaderRowDef,
+  MatHeaderRow,
+  MatRowDef,
+  MatRow,
+} from '@angular/material/table';
+import { ActivatedRoute, RouterLink } from '@angular/router';
 import { BehaviorSubject } from 'rxjs';
 import { Observable } from 'rxjs';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
@@ -18,6 +38,40 @@ import { ProductListDataSource } from './product-list-datasource';
   selector: 'app-product-list',
   templateUrl: './product-list.component.html',
   styleUrls: ['./product-list.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitleGroup,
+    MatCardTitle,
+    MatButton,
+    MatIconButton,
+    MatIcon,
+    MatAnchor,
+    RouterLink,
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatLabel,
+    MatInput,
+    MatSelect,
+    MatOption,
+    MatTable,
+    CdkDropList,
+    MatColumnDef,
+    MatHeaderCellDef,
+    MatHeaderCell,
+    MatCellDef,
+    MatCell,
+    MatHeaderRowDef,
+    MatHeaderRow,
+    MatRowDef,
+    MatRow,
+    CdkDrag,
+    AsyncPipe,
+    DecimalPipe,
+    CurrencyPipe,
+  ],
 })
 export class ProductListComponent implements OnInit {
   searchFilter: Observable<string> = new Observable();
@@ -69,15 +123,15 @@ export class ProductListComponent implements OnInit {
   }
 
   updateSortOrder() {
-    this.ser.updateSortOrder(this.dataSource.filteredData).subscribe(
-      (result: Product[]) => {
+    this.ser.updateSortOrder(this.dataSource.filteredData).subscribe({
+      next: (result: Product[]) => {
         this.toaster.show('Success', '');
         this.loadData(result, this.menuCategories);
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   dropTable(event: CdkDragDrop<ProductListDataSource>) {

bookie/src/app/product/product-resolver.service.ts

@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-
-import { Product } from '../core/product';
-
-import { ProductService } from './product.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductResolver {
-  constructor(private ser: ProductService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Product> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}

bookie/src/app/product/product.resolver.ts

@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Product } from '../core/product';
+
+import { ProductService } from './product.service';
+
+export const productResolver: ResolveFn<Product> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(ProductService).get(id);
+};

bookie/src/app/product/products-routing.module.spec.ts

@@ -1,13 +0,0 @@
-import { ProductsRoutingModule } from './products-routing.module';
-
-describe('ProductsRoutingModule', () => {
-  let productsRoutingModule: ProductsRoutingModule;
-
-  beforeEach(() => {
-    productsRoutingModule = new ProductsRoutingModule();
-  });
-
-  it('should create an instance', () => {
-    expect(productsRoutingModule).toBeTruthy();
-  });
-});

bookie/src/app/product/products-routing.module.ts

@@ -1,60 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-import { AuthGuard } from '../auth/auth-guard.service';
-import { MenuCategoryListResolver } from '../menu-category/menu-category-list-resolver.service';
-import { SaleCategoryListResolver } from '../sale-category/sale-category-list-resolver.service';
-
-import { ProductDetailComponent } from './product-detail/product-detail.component';
-import { ProductListComponent } from './product-list/product-list.component';
-import { ProductListResolver } from './product-list-resolver.service';
-import { ProductResolver } from './product-resolver.service';
-
-const productsRoutes: Routes = [
-  {
-    path: '',
-    component: ProductListComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Products',
-    },
-    resolve: {
-      list: ProductListResolver,
-      menuCategories: MenuCategoryListResolver,
-    },
-  },
-  {
-    path: 'new',
-    component: ProductDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Products',
-    },
-    resolve: {
-      item: ProductResolver,
-      menuCategories: MenuCategoryListResolver,
-      saleCategories: SaleCategoryListResolver,
-    },
-  },
-  {
-    path: ':id',
-    component: ProductDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Products',
-    },
-    resolve: {
-      item: ProductResolver,
-      menuCategories: MenuCategoryListResolver,
-      saleCategories: SaleCategoryListResolver,
-    },
-  },
-];
-
-@NgModule({
-  imports: [CommonModule, RouterModule.forChild(productsRoutes)],
-  exports: [RouterModule],
-  providers: [ProductListResolver, ProductResolver],
-})
-export class ProductsRoutingModule {}

bookie/src/app/product/products.module.spec.ts

@@ -1,13 +0,0 @@
-import { ProductsModule } from './products.module';
-
-describe('ProductsModule', () => {
-  let productsModule: ProductsModule;
-
-  beforeEach(() => {
-    productsModule = new ProductsModule();
-  });
-
-  it('should create an instance', () => {
-    expect(productsModule).toBeTruthy();
-  });
-});

bookie/src/app/product/products.module.ts

@@ -1,39 +0,0 @@
-import { DragDropModule } from '@angular/cdk/drag-drop';
-import { CdkTableModule } from '@angular/cdk/table';
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCardModule } from '@angular/material/card';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { MatOptionModule } from '@angular/material/core';
-import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatSelectModule } from '@angular/material/select';
-import { MatTableModule } from '@angular/material/table';
-
-import { ProductDetailComponent } from './product-detail/product-detail.component';
-import { ProductListComponent } from './product-list/product-list.component';
-import { ProductsRoutingModule } from './products-routing.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    CdkTableModule,
-    DragDropModule,
-    MatTableModule,
-    MatCardModule,
-    MatProgressSpinnerModule,
-    MatInputModule,
-    MatButtonModule,
-    MatIconModule,
-    MatOptionModule,
-    MatSelectModule,
-    MatCheckboxModule,
-    ReactiveFormsModule,
-    ProductsRoutingModule,
-  ],
-  declarations: [ProductListComponent, ProductDetailComponent],
-})
-export class ProductsModule {}

bookie/src/app/product/products.routes.ts

@@ -0,0 +1,51 @@
+import { Routes } from '@angular/router';
+
+import { authGuard } from '../auth/auth-guard.service';
+import { menuCategoryListResolver } from '../menu-category/menu-category-list.resolver';
+import { saleCategoryListResolver } from '../sale-category/sale-category-list.resolver';
+
+import { ProductDetailComponent } from './product-detail/product-detail.component';
+import { ProductListComponent } from './product-list/product-list.component';
+import { productListResolver } from './product-list.resolver';
+import { productResolver } from './product.resolver';
+
+export const routes: Routes = [
+  {
+    path: '',
+    component: ProductListComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Products',
+    },
+    resolve: {
+      list: productListResolver,
+      menuCategories: menuCategoryListResolver,
+    },
+  },
+  {
+    path: 'new',
+    component: ProductDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Products',
+    },
+    resolve: {
+      item: productResolver,
+      menuCategories: menuCategoryListResolver,
+      saleCategories: saleCategoryListResolver,
+    },
+  },
+  {
+    path: ':id',
+    component: ProductDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Products',
+    },
+    resolve: {
+      item: productResolver,
+      menuCategories: menuCategoryListResolver,
+      saleCategories: saleCategoryListResolver,
+    },
+  },
+];