Feature: Adding recipe templates to print recipes.

Feautre: Recipe export to xlsx
Chore: Python 11 style type annotations
Chore: Moved to sqlalchemy 2.0
Chore: Minimum python is 3.11
Fix: Fix nullability of a lot of fields in the database.

overlord/src/app/account/account-list-resolver.service.ts

@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { Resolve } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
 
 import { Account } from '../core/account';
@@ -8,7 +7,7 @@ import { AccountService } from '../core/account.service';
 @Injectable({
   providedIn: 'root',
 })
-export class AccountListResolver implements Resolve<Account[]> {
+export class AccountListResolver {
   constructor(private ser: AccountService) {}
 
   resolve(): Observable<Account[]> {

overlord/src/app/account/account-list/account-list-datasource.ts

@@ -28,12 +28,7 @@ export class AccountListDataSource extends DataSource<Account> {
   }
 
   connect(): Observable<Account[]> {
-    const dataMutations: (
-      | Observable<Account[]>
-      | Observable<string>
-      | EventEmitter<PageEvent>
-      | EventEmitter<Sort>
-    )[] = [observableOf(this.data), this.filter];
+    const dataMutations: (EventEmitter<PageEvent> | EventEmitter<Sort>)[] = [];
     if (this.paginator) {
       dataMutations.push((this.paginator as MatPaginator).page);
     }
@@ -41,7 +36,7 @@ export class AccountListDataSource extends DataSource<Account> {
       dataMutations.push((this.sort as MatSort).sortChange);
     }
 
-    return merge(...dataMutations)
+    return merge(observableOf(this.data), this.filter, ...dataMutations)
       .pipe(
         map(() => this.getFilteredData([...this.data])),
         tap((x: Account[]) => {

overlord/src/app/account/account-resolver.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
 
 import { Account } from '../core/account';
@@ -8,7 +8,7 @@ import { AccountService } from '../core/account.service';
 @Injectable({
   providedIn: 'root',
 })
-export class AccountResolver implements Resolve<Account> {
+export class AccountResolver {
   constructor(private ser: AccountService) {}
 
   resolve(route: ActivatedRouteSnapshot): Observable<Account> {

overlord/src/app/account/account-routing.module.ts

@@ -1,13 +1,13 @@
 import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { NgModule, inject } from '@angular/core';
+import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
 import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
 
 import { AccountDetailComponent } from './account-detail/account-detail.component';
-import { AccountListResolver } from './account-list-resolver.service';
 import { AccountListComponent } from './account-list/account-list.component';
+import { AccountListResolver } from './account-list-resolver.service';
 import { AccountResolver } from './account-resolver.service';
 import { AccountTypeResolver } from './account-type-resolver.service';
 
@@ -15,39 +15,48 @@ const accountRoutes: Routes = [
   {
     path: '',
     component: AccountListComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Accounts',
     },
     resolve: {
-      list: AccountListResolver,
-      accountTypes: AccountTypeResolver,
+      list: () => inject(AccountListResolver).resolve(),
+      accountTypes: () => inject(AccountTypeResolver).resolve(),
     },
   },
   {
     path: 'new',
     component: AccountDetailComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Accounts',
     },
     resolve: {
-      item: AccountResolver,
-      accountTypes: AccountTypeResolver,
-      costCentres: CostCentreListResolver,
+      item: (route: ActivatedRouteSnapshot) => inject(AccountResolver).resolve(route),
+      accountTypes: () => inject(AccountTypeResolver).resolve(),
+      costCentres: () => inject(CostCentreListResolver).resolve(),
     },
   },
   {
     path: ':id',
     component: AccountDetailComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Accounts',
     },
     resolve: {
-      item: AccountResolver,
-      accountTypes: AccountTypeResolver,
-      costCentres: CostCentreListResolver,
+      item: (route: ActivatedRouteSnapshot) => inject(AccountResolver).resolve(route),
+      accountTypes: () => inject(AccountTypeResolver).resolve(),
+      costCentres: () => inject(CostCentreListResolver).resolve(),
     },
   },
 ];

overlord/src/app/account/account-type-resolver.service.ts

@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { Resolve } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
 
 import { AccountType } from '../core/account-type';
@@ -9,7 +8,7 @@ import { AccountTypeService } from './account-type.service';
 @Injectable({
   providedIn: 'root',
 })
-export class AccountTypeResolver implements Resolve<AccountType[]> {
+export class AccountTypeResolver {
   constructor(private ser: AccountTypeService) {}
 
   resolve(): Observable<AccountType[]> {