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

Chore: Removed Mat Card from everywhere.

Browse Source 
Chore: Removed the Toaster Service.
Chore: Updated to Material Theme 3
This commit is contained in:
tanshu
2025-07-11 11:30:35 +00:00
parent 5c1c474e93
commit 88a1572747
117 changed files with 2895 additions and 3236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bookie/src/app/users/user-detail/user-detail.component.html
+31 -36
View File
@@ -1,37 +1,32 @@
<mat-card class="flex-auto lg:max-w-[50%]">
<mat-card-header>
<mat-card-title>User</mat-card-title>
</mat-card-header>
<mat-card-content>
<form [formGroup]="form" class="flex flex-col">
<div class="row-container">
<mat-form-field class="flex-auto">
<mat-label>Name</mat-label>
<input matInput #nameElement formControlName="name" />
</mat-form-field>
<h2>User</h2>
<form [formGroup]="form" class="flex flex-col">
<div class="row-container">
<mat-form-field class="flex-auto">
<mat-label>Name</mat-label>
<input matInput #nameElement formControlName="name" />
</mat-form-field>
</div>
<div class="row-container">
<mat-form-field class="flex-auto">
<mat-label>Password</mat-label>
<input matInput formControlName="password" [type]="hide ? 'password' : 'text'" />
<mat-icon matSuffix (click)="hide = !hide">{{ hide ? 'visibility' : 'visibility_off' }}</mat-icon>
</mat-form-field>
</div>
<div class="row-container">
<mat-checkbox formControlName="lockedOut">Is Locked Out?</mat-checkbox>
</div>
<mat-divider></mat-divider>
<div formArrayName="roles">
@for (r of item.roles; track r; let i = $index) {
<div [formGroupName]="i" class="row-container">
<mat-checkbox formControlName="role" class="flex-auto">{{ r.name }}</mat-checkbox>
</div>
<div class="row-container">
<mat-form-field class="flex-auto">
<mat-label>Password</mat-label>
<input matInput formControlName="password" [type]="hide ? 'password' : 'text'" />
<mat-icon matSuffix (click)="hide = !hide">{{ hide ? 'visibility' : 'visibility_off' }}</mat-icon>
</mat-form-field>
</div>
<div class="row-container">
<mat-checkbox formControlName="lockedOut">Is Locked Out?</mat-checkbox>
</div>
<mat-divider></mat-divider>
<div formArrayName="roles">
@for (r of item.roles; track r; let i = $index) {
<div [formGroupName]="i" class="row-container">
<mat-checkbox formControlName="role" class="flex-auto">{{ r.name }}</mat-checkbox>
</div>
}
</div>
</form>
</mat-card-content>
<mat-card-actions class="row-container">
<button mat-raised-button color="primary" class="" (click)="save()">Save</button>
<button mat-raised-button color="warn" (click)="confirmDelete()">Delete</button>
</mat-card-actions>
</mat-card>
}
</div>
</form>
<div class="row-container">
<button mat-raised-button color="primary" class="" (click)="save()">Save</button>
<button mat-raised-button color="warn" (click)="confirmDelete()">Delete</button>
</div>
bookie/src/app/users/user-detail/user-detail.component.ts
+7 -8
View File
@@ -1,16 +1,15 @@
import { AfterViewInit, Component, ElementRef, OnInit, ViewChild, inject } from '@angular/core';
import { FormArray, FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatDialog } from '@angular/material/dialog';
import { MatDividerModule } from '@angular/material/divider';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatSnackBar } from '@angular/material/snack-bar';
import { ActivatedRoute, Router } from '@angular/router';
import { ToasterService } from '../../core/toaster.service';
import { User } from '../../core/user';
import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
import { UserService } from '../user.service';
@@ -21,7 +20,7 @@ import { UserService } from '../user.service';
styleUrls: ['./user-detail.component.css'],
imports: [
MatButtonModule,
MatCardModule,
MatCheckboxModule,
MatDividerModule,
MatFormFieldModule,
@@ -33,7 +32,7 @@ import { UserService } from '../user.service';
export class UserDetailComponent implements OnInit, AfterViewInit {
private route = inject(ActivatedRoute);
private router = inject(Router);
private toaster = inject(ToasterService);
private snackBar = inject(MatSnackBar);
private dialog = inject(MatDialog);
private ser = inject(UserService);
@@ -96,7 +95,7 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
save() {
this.ser.saveOrUpdate(this.getItem()).subscribe({
next: () => {
this.toaster.show('Success', '');
this.snackBar.open('', 'Success');
if ((this.item.id as string) === 'me') {
this.router.navigateByUrl('/');
} else {
@@ -104,7 +103,7 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
}
},
error: (error) => {
this.toaster.show('Error', error);
this.snackBar.open(error, 'Error');
},
});
}
@@ -112,11 +111,11 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
delete() {
this.ser.delete(this.item.id as string).subscribe({
next: () => {
this.toaster.show('Success', '');
this.snackBar.open('', 'Success');
this.router.navigateByUrl('/users');
},
error: (error) => {
this.toaster.show('Error', error);
this.snackBar.open(error, 'Error');
},
});
}
bookie/src/app/users/user-list/user-list.component.html
+41 -47
View File
@@ -1,51 +1,45 @@
<mat-card>
<mat-card-header>
<mat-card-title-group>
<mat-card-title>Users</mat-card-title>
<a mat-button [routerLink]="['/users', 'new']">
<mat-icon>add_box</mat-icon>
Add
</a>
</mat-card-title-group>
</mat-card-header>
<mat-card-content>
<mat-table #table [dataSource]="dataSource" aria-label="Elements">
<!-- Name Column -->
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
<mat-cell *matCellDef="let row"
><a [routerLink]="['/users', row.id]">{{ row.name }}</a></mat-cell
>
</ng-container>
<h2 class="row-container space-between">
<span>Users</span>
<a mat-button [routerLink]="['/users', 'new']">
<mat-icon>add_box</mat-icon>
Add
</a>
</h2>
<mat-table #table [dataSource]="dataSource" aria-label="Elements">
<!-- Name Column -->
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
<mat-cell *matCellDef="let row"
><a [routerLink]="['/users', row.id]">{{ row.name }}</a></mat-cell
>
</ng-container>
<!-- Locked Out Column -->
<ng-container matColumnDef="lockedOut">
<mat-header-cell *matHeaderCellDef>Is Locked Out?</mat-header-cell>
<mat-cell *matCellDef="let row">{{ row.lockedOut }}</mat-cell>
</ng-container>
<!-- Locked Out Column -->
<ng-container matColumnDef="lockedOut">
<mat-header-cell *matHeaderCellDef>Is Locked Out?</mat-header-cell>
<mat-cell *matCellDef="let row">{{ row.lockedOut }}</mat-cell>
</ng-container>
<!-- Groups Column -->
<ng-container matColumnDef="roles">
<mat-header-cell *matHeaderCellDef>Roles</mat-header-cell>
<mat-cell *matCellDef="let row">
<ul>
@for (role of row.roles; track role) {
<li>{{ role }}</li>
}
</ul>
</mat-cell>
</ng-container>
<!-- Groups Column -->
<ng-container matColumnDef="roles">
<mat-header-cell *matHeaderCellDef>Roles</mat-header-cell>
<mat-cell *matCellDef="let row">
<ul>
@for (role of row.roles; track role) {
<li>{{ role }}</li>
}
</ul>
</mat-cell>
</ng-container>
<!-- Last Login Column -->
<ng-container matColumnDef="last">
<mat-header-cell *matHeaderCellDef>Last Login</mat-header-cell>
<mat-cell *matCellDef="let row"
>{{ row.lastDevice }} &#64; {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }}</mat-cell
>
</ng-container>
<!-- Last Login Column -->
<ng-container matColumnDef="last">
<mat-header-cell *matHeaderCellDef>Last Login</mat-header-cell>
<mat-cell *matCellDef="let row"
>{{ row.lastDevice }} &#64; {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }}</mat-cell
>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
</mat-table>
</mat-card-content>
</mat-card>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
</mat-table>
bookie/src/app/users/user-list/user-list.component.ts
+1 -2
View File
@@ -1,6 +1,5 @@
import { Component, OnInit, inject } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatIconModule } from '@angular/material/icon';
import { MatTableModule } from '@angular/material/table';
import { ActivatedRoute, RouterLink } from '@angular/router';
@@ -13,7 +12,7 @@ import { UserListDataSource } from './user-list-datasource';
selector: 'app-user-list',
templateUrl: './user-list.component.html',
styleUrls: ['./user-list.component.css'],
imports: [LocalTimePipe, MatButtonModule, MatCardModule, MatIconModule, MatTableModule, RouterLink],
imports: [LocalTimePipe, MatButtonModule, MatIconModule, MatTableModule, RouterLink],
})
export class UserListComponent implements OnInit {
private route = inject(ActivatedRoute);