Chore: Upgrade to Angular v18

Chore: Upgrade to Python 3.12
Chore: Upgrade to psycopg3

bookie/src/app/users/user-detail/user-detail.component.html

@@ -22,13 +22,11 @@
       </div>
       <mat-divider></mat-divider>
       <div formArrayName="roles">
-        <div
-          *ngFor="let r of item.roles; index as i"
-          [formGroupName]="i"
-          class="flex flex-row justify-around content-start items-start"
-        >
-          <mat-checkbox formControlName="role" class="flex-auto">{{ r.name }}</mat-checkbox>
-        </div>
+        @for (r of item.roles; track r; let i = $index) {
+          <div [formGroupName]="i" class="flex flex-row justify-around content-start items-start">
+            <mat-checkbox formControlName="role" class="flex-auto">{{ r.name }}</mat-checkbox>
+          </div>
+        }
       </div>
     </form>
   </mat-card-content>

bookie/src/app/users/user-detail/user-detail.component.spec.ts

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

bookie/src/app/users/user-detail/user-detail.component.ts

@@ -1,6 +1,13 @@
 import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { FormArray, FormControl, FormGroup } from '@angular/forms';
+import { FormArray, 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 { MatDialog } from '@angular/material/dialog';
+import { MatDivider } from '@angular/material/divider';
+import { MatFormField, MatLabel, MatSuffix } from '@angular/material/form-field';
+import { MatIcon } from '@angular/material/icon';
+import { MatInput } from '@angular/material/input';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { ToasterService } from '../../core/toaster.service';
@@ -12,6 +19,23 @@ import { UserService } from '../user.service';
   selector: 'app-user-detail',
   templateUrl: './user-detail.component.html',
   styleUrls: ['./user-detail.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitle,
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatLabel,
+    MatInput,
+    MatIcon,
+    MatSuffix,
+    MatCheckbox,
+    MatDivider,
+    MatCardActions,
+    MatButton,
+  ],
 })
 export class UserDetailComponent implements OnInit, AfterViewInit {
   @ViewChild('nameElement', { static: true }) nameElement?: ElementRef;
@@ -77,8 +101,8 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
   }
 
   save() {
-    this.ser.saveOrUpdate(this.getItem()).subscribe(
-      () => {
+    this.ser.saveOrUpdate(this.getItem()).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         console.log(this.item.id);
         if ((this.item.id as string) === 'me') {
@@ -87,22 +111,22 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
           this.router.navigateByUrl('/users');
         }
       },
-      (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('/users');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   confirmDelete(): void {

bookie/src/app/users/user-list-resolver.service.ts

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

bookie/src/app/users/user-list.resolver.ts

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

bookie/src/app/users/user-list/user-list.component.html

@@ -29,7 +29,9 @@
         <mat-header-cell *matHeaderCellDef>Roles</mat-header-cell>
         <mat-cell *matCellDef="let row">
           <ul>
-            <li *ngFor="let role of row.roles">{{ role }}</li>
+            @for (role of row.roles; track role) {
+              <li>{{ role }}</li>
+            }
           </ul>
         </mat-cell>
       </ng-container>
@@ -38,7 +40,7 @@
       <ng-container matColumnDef="last">
         <mat-header-cell *matHeaderCellDef>Last Login</mat-header-cell>
         <mat-cell *matCellDef="let row"
-          >{{ row.lastDevice }} @ {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }}</mat-cell
+          >{{ row.lastDevice }} &#64; {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }}</mat-cell
         >
       </ng-container>
 

bookie/src/app/users/user-list/user-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 { User } from '../../core/user';
+import { LocalTimePipe } from '../../shared/local-time.pipe';
 
 import { UserListDataSource } from './user-list-datasource';
 
@@ -9,6 +25,28 @@ import { UserListDataSource } from './user-list-datasource';
   selector: 'app-user-list',
   templateUrl: './user-list.component.html',
   styleUrls: ['./user-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 UserListComponent implements OnInit {
   dataSource: UserListDataSource = new UserListDataSource([]);

bookie/src/app/users/user-resolver.service.ts

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

bookie/src/app/users/user.resolver.ts

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

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

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

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

@@ -1,50 +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 { UserDetailComponent } from './user-detail/user-detail.component';
-import { UserListComponent } from './user-list/user-list.component';
-import { UserListResolver } from './user-list-resolver.service';
-import { UserResolver } from './user-resolver.service';
-
-const usersRoutes: Routes = [
-  {
-    path: '',
-    component: UserListComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Users',
-    },
-    resolve: {
-      list: UserListResolver,
-    },
-  },
-  {
-    path: 'new',
-    component: UserDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Users',
-    },
-    resolve: {
-      item: UserResolver,
-    },
-  },
-  {
-    path: ':id',
-    component: UserDetailComponent,
-    canActivate: [AuthGuard],
-    resolve: {
-      item: UserResolver,
-    },
-  },
-];
-
-@NgModule({
-  imports: [CommonModule, RouterModule.forChild(usersRoutes)],
-  exports: [RouterModule],
-  providers: [UserListResolver, UserResolver],
-})
-export class UsersRoutingModule {}

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

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

bookie/src/app/users/users.module.ts

@@ -1,38 +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 { MatDividerModule } from '@angular/material/divider';
-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 { SharedModule } from '../shared/shared.module';
-
-import { UserDetailComponent } from './user-detail/user-detail.component';
-import { UserListComponent } from './user-list/user-list.component';
-import { UsersRoutingModule } from './users-routing.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    CdkTableModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatDividerModule,
-    MatIconModule,
-    MatInputModule,
-    MatProgressSpinnerModule,
-    MatTableModule,
-    ReactiveFormsModule,
-    SharedModule,
-    UsersRoutingModule,
-  ],
-  declarations: [UserListComponent, UserDetailComponent],
-})
-export class UsersModule {}

bookie/src/app/users/users.routes.ts

@@ -0,0 +1,41 @@
+import { Routes } from '@angular/router';
+
+import { authGuard } from '../auth/auth-guard.service';
+
+import { UserDetailComponent } from './user-detail/user-detail.component';
+import { UserListComponent } from './user-list/user-list.component';
+import { userListResolver } from './user-list.resolver';
+import { userResolver } from './user.resolver';
+
+export const routes: Routes = [
+  {
+    path: '',
+    component: UserListComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Users',
+    },
+    resolve: {
+      list: userListResolver,
+    },
+  },
+  {
+    path: 'new',
+    component: UserDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Users',
+    },
+    resolve: {
+      item: userResolver,
+    },
+  },
+  {
+    path: ':id',
+    component: UserDetailComponent,
+    canActivate: [authGuard],
+    resolve: {
+      item: userResolver,
+    },
+  },
+];