Chore: Upgrade to Angular v18

Chore: Upgrade to Python 3.12
Chore: Upgrade to psycopg3

bookie/src/app/devices/device-detail/device-detail.component.html

@@ -14,9 +14,11 @@
         <mat-form-field class="flex-auto">
           <mat-label>Section</mat-label>
           <mat-select formControlName="section">
-            <mat-option *ngFor="let s of sections" [value]="s.id">
-              {{ s.name }}
-            </mat-option>
+            @for (s of sections; track s) {
+              <mat-option [value]="s.id">
+                {{ s.name }}
+              </mat-option>
+            }
           </mat-select>
         </mat-form-field>
       </div>
@@ -27,7 +29,9 @@
   </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-subtitle>
     Created on <strong>{{ item.creationDate | localTime }}</strong>

bookie/src/app/devices/device-detail/device-detail.component.spec.ts

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

bookie/src/app/devices/device-detail/device-detail.component.ts

@@ -1,18 +1,51 @@
 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,
+  MatCardSubtitle,
+} 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 { Device } from '../../core/device';
 import { Section } from '../../core/section';
 import { ToasterService } from '../../core/toaster.service';
 import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
+import { LocalTimePipe } from '../../shared/local-time.pipe';
 import { DeviceService } from '../device.service';
 
 @Component({
   selector: 'app-device-detail',
   templateUrl: './device-detail.component.html',
   styleUrls: ['./device-detail.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitle,
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatLabel,
+    MatInput,
+    MatSelect,
+    MatOption,
+    MatCheckbox,
+    MatCardActions,
+    MatButton,
+    MatCardSubtitle,
+    LocalTimePipe,
+  ],
 })
 export class DeviceDetailComponent implements OnInit, AfterViewInit {
   @ViewChild('nameElement', { static: true }) nameElement?: ElementRef;
@@ -66,27 +99,27 @@ export class DeviceDetailComponent implements OnInit, AfterViewInit {
   }
 
   save() {
-    this.ser.saveOrUpdate(this.getItem()).subscribe(
-      () => {
+    this.ser.saveOrUpdate(this.getItem()).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/devices');
       },
-      (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('/devices');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   confirmDelete(): void {

bookie/src/app/devices/device-list-resolver.service.ts

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

bookie/src/app/devices/device-list.resolver.ts

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

bookie/src/app/devices/device-list/device-list.component.html

@@ -40,7 +40,7 @@
       <ng-container matColumnDef="last">
         <mat-header-cell *matHeaderCellDef>Last Login</mat-header-cell>
         <mat-cell *matCellDef="let row"
-          >{{ row.lastUser }} @ {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }}</mat-cell
+          >{{ row.lastUser }} &#64; {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }}</mat-cell
         >
       </ng-container>
 

bookie/src/app/devices/device-list/device-list.component.spec.ts

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

bookie/src/app/devices/device-list/device-list.component.ts

@@ -1,7 +1,23 @@
 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 { Device } from '../../core/device';
+import { LocalTimePipe } from '../../shared/local-time.pipe';
 
 import { DeviceListDataSource } from './device-list-datasource';
 
@@ -9,6 +25,28 @@ import { DeviceListDataSource } from './device-list-datasource';
   selector: 'app-device-list',
   templateUrl: './device-list.component.html',
   styleUrls: ['./device-list.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitleGroup,
+    MatCardTitle,
+    MatAnchor,
+    RouterLink,
+    MatIcon,
+    MatCardContent,
+    MatTable,
+    MatColumnDef,
+    MatHeaderCellDef,
+    MatHeaderCell,
+    MatCellDef,
+    MatCell,
+    MatHeaderRowDef,
+    MatHeaderRow,
+    MatRowDef,
+    MatRow,
+    LocalTimePipe,
+  ],
 })
 export class DeviceListComponent implements OnInit {
   list: Device[] = [];

bookie/src/app/devices/device-resolver.service.ts

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

bookie/src/app/devices/device.resolver.ts

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

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

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

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

@@ -1,56 +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 { SectionListResolver } from '../sections/section-list-resolver.service';
-
-import { DeviceDetailComponent } from './device-detail/device-detail.component';
-import { DeviceListComponent } from './device-list/device-list.component';
-import { DeviceListResolver } from './device-list-resolver.service';
-import { DeviceResolver } from './device-resolver.service';
-
-const devicesRoutes: Routes = [
-  {
-    path: '',
-    component: DeviceListComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Devices',
-    },
-    resolve: {
-      list: DeviceListResolver,
-    },
-  },
-  {
-    path: 'new',
-    component: DeviceDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Devices',
-    },
-    resolve: {
-      item: DeviceResolver,
-      sections: SectionListResolver,
-    },
-  },
-  {
-    path: ':id',
-    component: DeviceDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Devices',
-    },
-    resolve: {
-      item: DeviceResolver,
-      sections: SectionListResolver,
-    },
-  },
-];
-
-@NgModule({
-  imports: [CommonModule, RouterModule.forChild(devicesRoutes)],
-  exports: [RouterModule],
-  providers: [DeviceListResolver, DeviceResolver],
-})
-export class DevicesRoutingModule {}

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

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

bookie/src/app/devices/devices.module.ts

@@ -1,40 +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 { 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 { SharedModule } from '../shared/shared.module';
-
-import { DeviceDetailComponent } from './device-detail/device-detail.component';
-import { DeviceListComponent } from './device-list/device-list.component';
-import { DevicesRoutingModule } from './devices-routing.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    CdkTableModule,
-    MatButtonModule,
-    MatCardModule,
-    MatIconModule,
-    MatInputModule,
-    MatOptionModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatTableModule,
-    ReactiveFormsModule,
-    DevicesRoutingModule,
-    MatCheckboxModule,
-    SharedModule,
-  ],
-  declarations: [DeviceListComponent, DeviceDetailComponent],
-})
-export class DevicesModule {}

bookie/src/app/devices/devices.routes.ts

@@ -0,0 +1,47 @@
+import { Routes } from '@angular/router';
+
+import { authGuard } from '../auth/auth-guard.service';
+import { sectionListResolver } from '../sections/section-list.resolver';
+
+import { DeviceDetailComponent } from './device-detail/device-detail.component';
+import { DeviceListComponent } from './device-list/device-list.component';
+import { deviceListResolver } from './device-list.resolver';
+import { deviceResolver } from './device.resolver';
+
+export const routes: Routes = [
+  {
+    path: '',
+    component: DeviceListComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Devices',
+    },
+    resolve: {
+      list: deviceListResolver,
+    },
+  },
+  {
+    path: 'new',
+    component: DeviceDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Devices',
+    },
+    resolve: {
+      item: deviceResolver,
+      sections: sectionListResolver,
+    },
+  },
+  {
+    path: ':id',
+    component: DeviceDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Devices',
+    },
+    resolve: {
+      item: deviceResolver,
+      sections: sectionListResolver,
+    },
+  },
+];