tanshu/barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity

Chore: Upgrade to Angular v18

Browse Source 
Chore: Upgrade to Python 3.12
Chore: Upgrade to psycopg3
This commit is contained in:
Amritanshu Agrawal
2024-06-03 13:22:56 +05:30
parent 56c1be5e05
commit 010e9a84db
573 changed files with 5727 additions and 6528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bookie/src/app/modifiers/modifier-detail/modifier-detail.component.html
View File

@ -23,9 +23,11 @@
<mat-form-field class="flex-auto">
<mat-label>Category</mat-label>
<mat-select formControlName="modifierCategory">
<mat-option *ngFor="let mc of modifierCategories" [value]="mc.id">
{{ mc.name }}
</mat-option>
@for (mc of modifierCategories; track mc) {
<mat-option [value]="mc.id">
{{ mc.name }}
</mat-option>
}
</mat-select>
</mat-form-field>
</div>
@ -36,6 +38,8 @@
</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>

2
bookie/src/app/modifiers/modifier-detail/modifier-detail.component.spec.ts
View File

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

41
bookie/src/app/modifiers/modifier-detail/modifier-detail.component.ts
View File

@ -1,6 +1,13 @@
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 { 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 { Modifier } from '../../core/modifier';
@ -13,6 +20,22 @@ import { ModifierService } from '../modifier.service';
selector: 'app-modifier-detail',
templateUrl: './modifier-detail.component.html',
styleUrls: ['./modifier-detail.component.css'],
standalone: true,
imports: [
MatCard,
MatCardHeader,
MatCardTitle,
MatCardContent,
ReactiveFormsModule,
MatFormField,
MatLabel,
MatInput,
MatCheckbox,
MatSelect,
MatOption,
MatCardActions,
MatButton,
],
})
export class ModifierDetailComponent implements OnInit, AfterViewInit {
@ViewChild('name', { static: true }) nameElement?: ElementRef;
@ -72,27 +95,27 @@ export class ModifierDetailComponent implements OnInit, AfterViewInit {
}
save() {
this.ser.saveOrUpdate(this.getItem()).subscribe(
() => {
this.ser.saveOrUpdate(this.getItem()).subscribe({
next: () => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/modifiers');
},
(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('/modifiers');
},
(error) => {
error: (error) => {
this.toaster.show('Error', error);
},
);
});
}
confirmDelete(): void {

17
bookie/src/app/modifiers/modifier-list-resolver.service.ts
View File

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

0
bookie/src/app/modifiers/modifier-list-resolver.service.spec.ts → bookie/src/app/modifiers/modifier-list.resolver.spec.ts
View File

10
bookie/src/app/modifiers/modifier-list.resolver.ts Normal file
View File

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

8
bookie/src/app/modifiers/modifier-list/modifier-list.component.html
View File

@ -15,9 +15,11 @@
<mat-label>Modifier Category</mat-label>
<mat-select formControlName="modifierCategory" (selectionChange)="filterOn($event)">
<mat-option>-- All Categories --</mat-option>
<mat-option *ngFor="let mc of modifierCategories" [value]="mc.id">
{{ mc.name }}
</mat-option>
@for (mc of modifierCategories; track mc) {
<mat-option [value]="mc.id">
{{ mc.name }}
</mat-option>
}
</mat-select>
</mat-form-field>
</div>

2
bookie/src/app/modifiers/modifier-list/modifier-list.component.spec.ts
View File

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

52
bookie/src/app/modifiers/modifier-list/modifier-list.component.ts
View File

@ -1,8 +1,25 @@
import { CurrencyPipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { MatSelectChange } from '@angular/material/select';
import { MatTable } from '@angular/material/table';
import { ActivatedRoute, Router } from '@angular/router';
import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { MatAnchor } from '@angular/material/button';
import { MatCard, MatCardHeader, MatCardTitleGroup, 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 { MatSelectChange, MatSelect } from '@angular/material/select';
import {
MatTable,
MatColumnDef,
MatHeaderCellDef,
MatHeaderCell,
MatCellDef,
MatCell,
MatHeaderRowDef,
MatHeaderRow,
MatRowDef,
MatRow,
} from '@angular/material/table';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { BehaviorSubject } from 'rxjs';
import { Modifier } from '../../core/modifier';
@ -14,6 +31,33 @@ import { ModifierListDataSource } from './modifier-list-datasource';
selector: 'app-modifier-list',
templateUrl: './modifier-list.component.html',
styleUrls: ['./modifier-list.component.css'],
standalone: true,
imports: [
MatCard,
MatCardHeader,
MatCardTitleGroup,
MatCardTitle,
MatAnchor,
RouterLink,
MatIcon,
MatCardContent,
ReactiveFormsModule,
MatFormField,
MatLabel,
MatSelect,
MatOption,
MatTable,
MatColumnDef,
MatHeaderCellDef,
MatHeaderCell,
MatCellDef,
MatCell,
MatHeaderRowDef,
MatHeaderRow,
MatRowDef,
MatRow,
CurrencyPipe,
],
})
export class ModifierListComponent implements OnInit {
@ViewChild('table', { static: true }) table?: MatTable<Modifier>;

19
bookie/src/app/modifiers/modifier-resolver.service.ts
View File

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

0
bookie/src/app/modifiers/modifier-resolver.service.spec.ts → bookie/src/app/modifiers/modifier.resolver.spec.ts
View File

11
bookie/src/app/modifiers/modifier.resolver.ts Normal file
View File

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

13
bookie/src/app/modifiers/modifiers-routing.module.spec.ts
View File

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

57
bookie/src/app/modifiers/modifiers-routing.module.ts
View File

@ -1,57 +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 { ModifierCategoryListResolver } from '../modifier-categories/modifier-category-list-resolver.service';
import { ModifierDetailComponent } from './modifier-detail/modifier-detail.component';
import { ModifierListComponent } from './modifier-list/modifier-list.component';
import { ModifierListResolver } from './modifier-list-resolver.service';
import { ModifierResolver } from './modifier-resolver.service';
const modifiersRoutes: Routes = [
{
path: '',
component: ModifierListComponent,
canActivate: [AuthGuard],
data: {
permission: 'Modifiers',
},
resolve: {
list: ModifierListResolver,
modifierCategories: ModifierCategoryListResolver,
},
},
{
path: 'new',
component: ModifierDetailComponent,
canActivate: [AuthGuard],
data: {
permission: 'Modifiers',
},
resolve: {
item: ModifierResolver,
modifierCategories: ModifierCategoryListResolver,
},
},
{
path: ':id',
component: ModifierDetailComponent,
canActivate: [AuthGuard],
data: {
permission: 'Modifiers',
},
resolve: {
item: ModifierResolver,
modifierCategories: ModifierCategoryListResolver,
},
},
];
@NgModule({
imports: [CommonModule, RouterModule.forChild(modifiersRoutes)],
exports: [RouterModule],
providers: [ModifierListResolver, ModifierResolver],
})
export class ModifiersRoutingModule {}

13
bookie/src/app/modifiers/modifiers.module.spec.ts
View File

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

35
bookie/src/app/modifiers/modifiers.module.ts
View File

@ -1,35 +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 { 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 { ModifierDetailComponent } from './modifier-detail/modifier-detail.component';
import { ModifierListComponent } from './modifier-list/modifier-list.component';
import { ModifiersRoutingModule } from './modifiers-routing.module';
@NgModule({
imports: [
CommonModule,
MatTableModule,
MatCardModule,
MatProgressSpinnerModule,
MatInputModule,
MatButtonModule,
MatIconModule,
MatOptionModule,
MatSelectModule,
MatCheckboxModule,
ReactiveFormsModule,
ModifiersRoutingModule,
],
declarations: [ModifierListComponent, ModifierDetailComponent],
})
export class ModifiersModule {}

48
bookie/src/app/modifiers/modifiers.routes.ts Normal file
View File

@ -0,0 +1,48 @@
import { Routes } from '@angular/router';
import { authGuard } from '../auth/auth-guard.service';
import { modifierCategoryListResolver } from '../modifier-categories/modifier-category-list.resolver';
import { ModifierDetailComponent } from './modifier-detail/modifier-detail.component';
import { ModifierListComponent } from './modifier-list/modifier-list.component';
import { modifierListResolver } from './modifier-list.resolver';
import { modifierResolver } from './modifier.resolver';
export const routes: Routes = [
{
path: '',
component: ModifierListComponent,
canActivate: [authGuard],
data: {
permission: 'Modifiers',
},
resolve: {
list: modifierListResolver,
modifierCategories: modifierCategoryListResolver,
},
},
{
path: 'new',
component: ModifierDetailComponent,
canActivate: [authGuard],
data: {
permission: 'Modifiers',
},
resolve: {
item: modifierResolver,
modifierCategories: modifierCategoryListResolver,
},
},
{
path: ':id',
component: ModifierDetailComponent,
canActivate: [authGuard],
data: {
permission: 'Modifiers',
},
resolve: {
item: modifierResolver,
modifierCategories: modifierCategoryListResolver,
},
},
];