Chore: Upgrade to Angular v18

Chore: Upgrade to Python 3.12
Chore: Upgrade to psycopg3

bookie/src/app/regimes/regime-detail/regime-detail.component.html

@@ -26,8 +26,8 @@
   </mat-card-content>
   <mat-card-actions>
     <button mat-raised-button [disabled]="item.isFixture" color="primary" class="mr-5" (click)="save()">Save</button>
-    <button mat-raised-button [disabled]="item.isFixture" color="warn" (click)="confirmDelete()" *ngIf="!!item.id">
-      Delete
-    </button>
+    @if (!!item.id) {
+      <button mat-raised-button [disabled]="item.isFixture" color="warn" (click)="confirmDelete()">Delete</button>
+    }
   </mat-card-actions>
 </mat-card>

bookie/src/app/regimes/regime-detail/regime-detail.component.spec.ts

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

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

@@ -1,6 +1,10 @@
 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 { MatDialog } from '@angular/material/dialog';
+import { MatFormField, MatLabel } from '@angular/material/form-field';
+import { MatInput } from '@angular/material/input';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { Regime } from '../../core/regime';
@@ -12,6 +16,19 @@ import { RegimeService } from '../regime.service';
   selector: 'app-regime-detail',
   templateUrl: './regime-detail.component.html',
   styleUrls: ['./regime-detail.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitle,
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatLabel,
+    MatInput,
+    MatCardActions,
+    MatButton,
+  ],
 })
 export class RegimeDetailComponent implements OnInit, AfterViewInit {
   @ViewChild('nameElement', { static: true }) nameElement?: ElementRef;
@@ -63,27 +80,27 @@ export class RegimeDetailComponent implements OnInit, AfterViewInit {
   }
 
   save() {
-    this.ser.saveOrUpdate(this.getItem()).subscribe(
-      () => {
+    this.ser.saveOrUpdate(this.getItem()).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/regimes');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   delete() {
-    this.ser.delete(this.item.id as number).subscribe(
-      () => {
+    this.ser.delete(this.item.id as number).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/regimes');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   confirmDelete(): void {

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

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

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

@@ -0,0 +1,10 @@
+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[]> = () => {
+  return inject(RegimeService).list();
+};

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

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

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

@@ -1,5 +1,20 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { MatAnchor } from '@angular/material/button';
+import { MatCard, MatCardHeader, MatCardTitleGroup, MatCardTitle, MatCardContent } from '@angular/material/card';
+import { MatIcon } from '@angular/material/icon';
+import {
+  MatTable,
+  MatColumnDef,
+  MatHeaderCellDef,
+  MatHeaderCell,
+  MatCellDef,
+  MatCell,
+  MatHeaderRowDef,
+  MatHeaderRow,
+  MatRowDef,
+  MatRow,
+} from '@angular/material/table';
+import { ActivatedRoute, RouterLink } from '@angular/router';
 
 import { Regime } from '../../core/regime';
 
@@ -9,6 +24,27 @@ import { RegimeListDataSource } from './regime-list-datasource';
   selector: 'app-regime-list',
   templateUrl: './regime-list.component.html',
   styleUrls: ['./regime-list.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitleGroup,
+    MatCardTitle,
+    MatAnchor,
+    RouterLink,
+    MatIcon,
+    MatCardContent,
+    MatTable,
+    MatColumnDef,
+    MatHeaderCellDef,
+    MatHeaderCell,
+    MatCellDef,
+    MatCell,
+    MatHeaderRowDef,
+    MatHeaderRow,
+    MatRowDef,
+    MatRow,
+  ],
 })
 export class RegimeListComponent implements OnInit {
   list: Regime[] = [];

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

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

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

@@ -0,0 +1,11 @@
+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) => {
+  const id = route.paramMap.get('id');
+  return inject(RegimeService).get(id ? +id : null);
+};

bookie/src/app/regimes/regimes-routing.module.spec.ts

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

bookie/src/app/regimes/regimes-routing.module.ts

@@ -1,53 +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 { RegimeDetailComponent } from './regime-detail/regime-detail.component';
-import { RegimeListComponent } from './regime-list/regime-list.component';
-import { RegimeListResolver } from './regime-list-resolver.service';
-import { RegimeResolver } from './regime-resolver.service';
-
-const regimesRoutes: Routes = [
-  {
-    path: '',
-    component: RegimeListComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Regimes',
-    },
-    resolve: {
-      list: RegimeListResolver,
-    },
-  },
-  {
-    path: 'new',
-    component: RegimeDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Regimes',
-    },
-    resolve: {
-      item: RegimeResolver,
-    },
-  },
-  {
-    path: ':id',
-    component: RegimeDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Regimes',
-    },
-    resolve: {
-      item: RegimeResolver,
-    },
-  },
-];
-
-@NgModule({
-  imports: [CommonModule, RouterModule.forChild(regimesRoutes)],
-  exports: [RouterModule],
-  providers: [RegimeListResolver, RegimeResolver],
-})
-export class RegimesRoutingModule {}

bookie/src/app/regimes/regimes.module.spec.ts

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

bookie/src/app/regimes/regimes.module.ts

@@ -1,31 +0,0 @@
-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 { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatTableModule } from '@angular/material/table';
-
-import { RegimeDetailComponent } from './regime-detail/regime-detail.component';
-import { RegimeListComponent } from './regime-list/regime-list.component';
-import { RegimesRoutingModule } from './regimes-routing.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    CdkTableModule,
-    MatButtonModule,
-    MatCardModule,
-    MatIconModule,
-    MatInputModule,
-    MatProgressSpinnerModule,
-    MatTableModule,
-    ReactiveFormsModule,
-    RegimesRoutingModule,
-  ],
-  declarations: [RegimeListComponent, RegimeDetailComponent],
-})
-export class RegimesModule {}

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

@@ -0,0 +1,44 @@
+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 { regimeResolver } from './regime.resolver';
+
+export const routes: Routes = [
+  {
+    path: '',
+    component: RegimeListComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Regimes',
+    },
+    resolve: {
+      list: regimeListResolver,
+    },
+  },
+  {
+    path: 'new',
+    component: RegimeDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Regimes',
+    },
+    resolve: {
+      item: regimeResolver,
+    },
+  },
+  {
+    path: ':id',
+    component: RegimeDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Regimes',
+    },
+    resolve: {
+      item: regimeResolver,
+    },
+  },
+];