Chore: Upgrade to Angular v18

Chore: Upgrade to Python 3.12
Chore: Upgrade to psycopg3

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

@@ -38,17 +38,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>

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

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

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

@@ -1,8 +1,16 @@
 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 { MatDatepickerInput, MatDatepickerToggle, MatDatepicker } from '@angular/material/datepicker';
 import { MatDialog } from '@angular/material/dialog';
+import { MatFormField, MatLabel, MatSuffix } from '@angular/material/form-field';
+import { MatInput } from '@angular/material/input';
+import { MatSelect } from '@angular/material/select';
 import { ActivatedRoute, Router } from '@angular/router';
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { MenuCategory } from '../../core/menu-category';
 import { Product } from '../../core/product';
@@ -15,6 +23,26 @@ import { TemporalProductService } from '../temporal-product.service';
   selector: 'app-product-detail',
   templateUrl: './temporal-product-detail.component.html',
   styleUrls: ['./temporal-product-detail.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitle,
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatLabel,
+    MatInput,
+    MatCheckbox,
+    MatSelect,
+    MatOption,
+    MatDatepickerInput,
+    MatDatepickerToggle,
+    MatSuffix,
+    MatDatepicker,
+    MatCardActions,
+    MatButton,
+  ],
 })
 export class TemporalProductDetailComponent implements OnInit, AfterViewInit {
   @ViewChild('name', { static: true }) nameElement?: ElementRef;
@@ -98,27 +126,27 @@ export class TemporalProductDetailComponent implements OnInit, AfterViewInit {
   }
 
   update() {
-    this.ser.update(this.getItem()).subscribe(
-      () => {
+    this.ser.update(this.getItem()).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/temporal-products');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   delete() {
-    this.ser.delete(this.item.versionId as string).subscribe(
-      () => {
+    this.ser.delete(this.item.versionId as string).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/temporal-products');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   confirmDelete(): void {

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

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

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

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

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

@@ -13,18 +13,22 @@
           <mat-label>Menu Category</mat-label>
           <mat-select formControlName="menuCategory" (selectionChange)="filterMcOn($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>
         <mat-form-field class="flex-auto basis-3/10">
           <mat-label>Sale Category</mat-label>
           <mat-select formControlName="saleCategory" (selectionChange)="filterScOn($event.value)">
             <mat-option>-- All Products --</mat-option>
-            <mat-option *ngFor="let mc of saleCategories" [value]="mc.id">
-              {{ mc.name }}
-            </mat-option>
+            @for (mc of saleCategories; track mc) {
+              <mat-option [value]="mc.id">
+                {{ mc.name }}
+              </mat-option>
+            }
           </mat-select>
         </mat-form-field>
       </div>

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

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

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

@@ -1,6 +1,25 @@
+import { 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 { MatCard, MatCardHeader, 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';
@@ -15,6 +34,33 @@ import { TemporalProductListDatasource } from './temporal-product-list-datasourc
   selector: 'app-product-list',
   templateUrl: './temporal-product-list.component.html',
   styleUrls: ['./temporal-product-list.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitle,
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatLabel,
+    MatInput,
+    MatSelect,
+    MatOption,
+    MatTable,
+    MatColumnDef,
+    MatHeaderCellDef,
+    MatHeaderCell,
+    MatCellDef,
+    MatCell,
+    RouterLink,
+    MatIcon,
+    MatHeaderRowDef,
+    MatHeaderRow,
+    MatRowDef,
+    MatRow,
+    DecimalPipe,
+    CurrencyPipe,
+  ],
 })
 export class TemporalProductListComponent implements OnInit {
   searchFilter: Observable<string> = new Observable();

bookie/src/app/temporal-product/temporal-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 { TemporalProductService } from './temporal-product.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class TemporalProductResolverService {
-  constructor(private ser: TemporalProductService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Product> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id as string);
-  }
-}

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

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

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

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

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

@@ -1,61 +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 { TemporalProductDetailComponent } from './temporal-product-detail/temporal-product-detail.component';
-import { TemporalProductListComponent } from './temporal-product-list/temporal-product-list.component';
-import { TemporalProductListResolverService } from './temporal-product-list-resolver.service';
-import { TemporalProductResolverService } from './temporal-product-resolver.service';
-
-const temporalProductsRoutes: Routes = [
-  {
-    path: '',
-    component: TemporalProductListComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Temporal Products',
-    },
-    resolve: {
-      list: TemporalProductListResolverService,
-      menuCategories: MenuCategoryListResolver,
-      saleCategories: SaleCategoryListResolver,
-    },
-  },
-  {
-    path: 'new',
-    component: TemporalProductDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Temporal Products',
-    },
-    resolve: {
-      item: TemporalProductResolverService,
-      menuCategories: MenuCategoryListResolver,
-      saleCategories: SaleCategoryListResolver,
-    },
-  },
-  {
-    path: ':id',
-    component: TemporalProductDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Temporal Products',
-    },
-    resolve: {
-      item: TemporalProductResolverService,
-      menuCategories: MenuCategoryListResolver,
-      saleCategories: SaleCategoryListResolver,
-    },
-  },
-];
-
-@NgModule({
-  imports: [CommonModule, RouterModule.forChild(temporalProductsRoutes)],
-  exports: [RouterModule],
-  providers: [TemporalProductListResolverService, TemporalProductResolverService],
-})
-export class TemporalProductsRoutingModule {}

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

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

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

@@ -1,55 +0,0 @@
-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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core';
-import { MatOptionModule } from '@angular/material/core';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-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 { MomentDateAdapter } from '@angular/material-moment-adapter';
-
-import { TemporalProductDetailComponent } from './temporal-product-detail/temporal-product-detail.component';
-import { TemporalProductListComponent } from './temporal-product-list/temporal-product-list.component';
-import { TemporalProductsRoutingModule } from './temporal-products-routing.module';
-
-export const MY_FORMATS = {
-  parse: {
-    dateInput: 'DD-MMM-YYYY',
-  },
-  display: {
-    dateInput: 'DD-MMM-YYYY',
-    monthYearLabel: 'MMM YYYY',
-    dateA11yLabel: 'DD-MMM-YYYY',
-    monthYearA11yLabel: 'MMM YYYY',
-  },
-};
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MatTableModule,
-    MatCardModule,
-    MatProgressSpinnerModule,
-    MatInputModule,
-    MatButtonModule,
-    MatIconModule,
-    MatOptionModule,
-    MatSelectModule,
-    MatCheckboxModule,
-    ReactiveFormsModule,
-    TemporalProductsRoutingModule,
-    MatDatepickerModule,
-  ],
-  declarations: [TemporalProductListComponent, TemporalProductDetailComponent],
-  providers: [
-    { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
-    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
-  ],
-})
-export class TemporalProductsModule {}

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

@@ -0,0 +1,52 @@
+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 { TemporalProductDetailComponent } from './temporal-product-detail/temporal-product-detail.component';
+import { TemporalProductListComponent } from './temporal-product-list/temporal-product-list.component';
+import { temporalProductListResolver } from './temporal-product-list.resolver';
+import { temporalProductResolver } from './temporal-product.resolver';
+
+export const routes: Routes = [
+  {
+    path: '',
+    component: TemporalProductListComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Temporal Products',
+    },
+    resolve: {
+      list: temporalProductListResolver,
+      menuCategories: menuCategoryListResolver,
+      saleCategories: saleCategoryListResolver,
+    },
+  },
+  {
+    path: 'new',
+    component: TemporalProductDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Temporal Products',
+    },
+    resolve: {
+      item: temporalProductResolver,
+      menuCategories: menuCategoryListResolver,
+      saleCategories: saleCategoryListResolver,
+    },
+  },
+  {
+    path: ':id',
+    component: TemporalProductDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Temporal Products',
+    },
+    resolve: {
+      item: temporalProductResolver,
+      menuCategories: menuCategoryListResolver,
+      saleCategories: saleCategoryListResolver,
+    },
+  },
+];