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

Blacked and isorted the python files

Browse Source 
Prettied and eslinted the typescript/html files
This commit is contained in:
Amritanshu Agrawal
2020-10-11 10:56:29 +05:30
parent b31db593c2
commit d677cfb1ea
505 changed files with 7560 additions and 5650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
bookie/src/app/users/user-detail/user-detail.component.html
View File

@ -5,31 +5,60 @@
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<mat-label>Name</mat-label>
<input matInput #nameElement placeholder="Name" formControlName="name">
<input matInput #nameElement placeholder="Name" formControlName="name" />
</mat-form-field>
</div>
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<mat-label>Password</mat-label>
<input matInput placeholder="Password" formControlName="password" [type]="hide ? 'password' : 'text'">
<mat-icon matSuffix (click)="hide = !hide">{{hide ? 'visibility' : 'visibility_off'}}</mat-icon>
</mat-form-field>
<input
matInput
placeholder="Password"
formControlName="password"
[type]="hide ? 'password' : 'text'"
/>
<mat-icon matSuffix (click)="hide = !hide">{{
hide ? 'visibility' : 'visibility_off'
}}</mat-icon>
</mat-form-field>
</div>
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-checkbox formControlName="lockedOut">Is Locked Out?</mat-checkbox>
</div>
<mat-divider></mat-divider>
<div formArrayName="roles">
<div fxLayout="row" *ngFor="let r of item.roles; index as i" [formGroupName]="i" fxLayout="row"
fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<mat-checkbox formControlName="role" fxFlex>{{r.name}}</mat-checkbox>
<div
fxLayout="row"
*ngFor="let r of item.roles; index as i"
[formGroupName]="i"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-checkbox formControlName="role" fxFlex>{{ r.name }}</mat-checkbox>
</div>
</div>
</form>

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

@ -1,6 +1,6 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {UserDetailComponent} from './user-detail.component';
import { UserDetailComponent } from './user-detail.component';
describe('UserDetailComponent', () => {
let component: UserDetailComponent;
@ -8,9 +8,8 @@ describe('UserDetailComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [UserDetailComponent]
})
.compileComponents();
declarations: [UserDetailComponent],
}).compileComponents();
}));
beforeEach(() => {

87
bookie/src/app/users/user-detail/user-detail.component.ts
View File

@ -1,17 +1,17 @@
import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import {UserService} from '../user.service';
import {User} from '../../core/user';
import {ToasterService} from '../../core/toaster.service';
import {ConfirmDialogComponent} from '../../shared/confirm-dialog/confirm-dialog.component';
import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
import {FormArray, FormBuilder, FormGroup} from '@angular/forms';
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';
@Component({
selector: 'app-user-detail',
templateUrl: './user-detail.component.html',
styleUrls: ['./user-detail.component.css']
styleUrls: ['./user-detail.component.css'],
})
export class UserDetailComponent implements OnInit, AfterViewInit {
@ViewChild('nameElement', { static: true }) nameElement: ElementRef;
@ -25,7 +25,7 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
private fb: FormBuilder,
private toaster: ToasterService,
private dialog: MatDialog,
private ser: UserService
private ser: UserService,
) {
this.hide = true;
this.createForm();
@ -36,15 +36,14 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
name: '',
password: '',
lockedOut: '',
roles: this.fb.array([])
roles: this.fb.array([]),
});
}
ngOnInit() {
this.route.data
.subscribe((data: { item: User }) => {
this.showItem(data.item);
});
this.route.data.subscribe((data: { item: User }) => {
this.showItem(data.item);
});
}
showItem(item: User) {
@ -52,16 +51,18 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
this.form.get('name').setValue(item.name);
this.form.get('password').setValue('');
this.form.get('lockedOut').setValue(item.lockedOut);
this.form.setControl('roles', this.fb.array(
item.roles.map(
x => this.fb.group({
role: x.enabled
})
)
));
this.form.setControl(
'roles',
this.fb.array(
item.roles.map((x) =>
this.fb.group({
role: x.enabled,
}),
),
),
);
}
ngAfterViewInit() {
setTimeout(() => {
this.nameElement.nativeElement.focus();
@ -69,35 +70,33 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
}
save() {
this.ser.saveOrUpdate(this.getItem())
.subscribe(
(result) => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/users');
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
this.ser.saveOrUpdate(this.getItem()).subscribe(
() => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/users');
},
(error) => {
this.toaster.show('Danger', error.error);
},
);
}
delete() {
this.ser.delete(this.item.id)
.subscribe(
(result) => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/users');
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
this.ser.delete(this.item.id).subscribe(
() => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/users');
},
(error) => {
this.toaster.show('Danger', error.error);
},
);
}
confirmDelete(): void {
const dialogRef = this.dialog.open(ConfirmDialogComponent, {
width: '250px',
data: {title: 'Delete User?', content: 'Are you sure? This cannot be undone.'}
data: { title: 'Delete User?', content: 'Are you sure? This cannot be undone.' },
});
dialogRef.afterClosed().subscribe((result: boolean) => {

6
bookie/src/app/users/user-list-resolver.service.spec.ts
View File

@ -1,11 +1,11 @@
import {inject, TestBed} from '@angular/core/testing';
import { inject, TestBed } from '@angular/core/testing';
import {UserListResolver} from './user-list-resolver.service';
import { UserListResolver } from './user-list-resolver.service';
describe('UserListResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [UserListResolver]
providers: [UserListResolver],
});
});

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

@ -1,18 +1,18 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot} from '@angular/router';
import {User} from '../core/user';
import {Observable} from 'rxjs/internal/Observable';
import {UserService} from './user.service';
import { Injectable } from '@angular/core';
import { Resolve } from '@angular/router';
import { Observable } from 'rxjs/internal/Observable';
import { User } from '../core/user';
import { UserService } from './user.service';
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class UserListResolver implements Resolve<User[]> {
constructor(private ser: UserService) {}
constructor(private ser: UserService, private router: Router) {
}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<User[]> {
resolve(): Observable<User[]> {
return this.ser.list();
}
}

5
bookie/src/app/users/user-list/user-list-datasource.ts
View File

@ -1,9 +1,9 @@
import { DataSource } from '@angular/cdk/collections';
import { Observable, of as observableOf } from 'rxjs';
import { User } from '../../core/user';
export class UserListDataSource extends DataSource<User> {
constructor(public data: User[]) {
super();
}
@ -12,6 +12,5 @@ export class UserListDataSource extends DataSource<User> {
return observableOf(this.data);
}
disconnect() {
}
disconnect() {}
}

11
bookie/src/app/users/user-list/user-list.component.html
View File

@ -8,17 +8,18 @@
</mat-card-title-group>
<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>
<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>
<mat-cell *matCellDef="let row">{{ row.lockedOut }}</mat-cell>
</ng-container>
<!-- Groups Column -->
@ -26,13 +27,13 @@
<mat-header-cell *matHeaderCellDef>Roles</mat-header-cell>
<mat-cell *matCellDef="let row">
<ul>
<li *ngFor="let role of row.roles">{{role}}</li>
<li *ngFor="let role of row.roles">{{ role }}</li>
</ul>
</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
<mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
</mat-table>
</mat-card-content>
</mat-card>

18
bookie/src/app/users/user-list/user-list.component.ts
View File

@ -1,12 +1,14 @@
import { Component, OnInit } from '@angular/core';
import { UserListDataSource } from './user-list-datasource';
import { User } from '../../core/user';
import { ActivatedRoute } from '@angular/router';
import { User } from '../../core/user';
import { UserListDataSource } from './user-list-datasource';
@Component({
selector: 'app-user-list',
templateUrl: './user-list.component.html',
styleUrls: ['./user-list.component.css']
styleUrls: ['./user-list.component.css'],
})
export class UserListComponent implements OnInit {
dataSource: UserListDataSource;
@ -14,14 +16,12 @@ export class UserListComponent implements OnInit {
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns = ['name', 'lockedOut', 'roles'];
constructor(private route: ActivatedRoute) {
}
constructor(private route: ActivatedRoute) {}
ngOnInit() {
this.route.data
.subscribe((data: { list: User[] }) => {
this.list = data.list;
});
this.route.data.subscribe((data: { list: User[] }) => {
this.list = data.list;
});
this.dataSource = new UserListDataSource(this.list);
}
}

6
bookie/src/app/users/user-resolver.service.spec.ts
View File

@ -1,11 +1,11 @@
import {inject, TestBed} from '@angular/core/testing';
import { inject, TestBed } from '@angular/core/testing';
import {UserResolver} from './user-resolver.service';
import { UserResolver } from './user-resolver.service';
describe('UserResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [UserResolver]
providers: [UserResolver],
});
});

20
bookie/src/app/users/user-resolver.service.ts
View File

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

6
bookie/src/app/users/user.service.spec.ts
View File

@ -1,11 +1,11 @@
import {inject, TestBed} from '@angular/core/testing';
import { inject, TestBed } from '@angular/core/testing';
import {UserService} from './user.service';
import { UserService } from './user.service';
describe('UserService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [UserService]
providers: [UserService],
});
});

73
bookie/src/app/users/user.service.ts
View File

@ -1,71 +1,76 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { ErrorLoggerService } from '../core/error-logger.service';
import { catchError } from 'rxjs/operators';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/internal/Observable';
import { catchError } from 'rxjs/operators';
import { ErrorLoggerService } from '../core/error-logger.service';
import { User } from '../core/user';
const httpOptions = {
headers: new HttpHeaders({'Content-Type': 'application/json'})
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
};
const url = '/api/users';
const serviceName = 'UserService';
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class UserService {
constructor(private http: HttpClient, private log: ErrorLoggerService) {
}
constructor(private http: HttpClient, private log: ErrorLoggerService) {}
get(id: string): Observable<User> {
const getUrl: string = (id === null) ? `${url}` : `${url}/${id}`;
return <Observable<User>>this.http.get<User>(getUrl)
.pipe(
catchError(this.log.handleError(serviceName, `get id=${id}`))
);
const getUrl: string = id === null ? `${url}` : `${url}/${id}`;
return <Observable<User>>(
this.http
.get<User>(getUrl)
.pipe(catchError(this.log.handleError(serviceName, `get id=${id}`)))
);
}
list(): Observable<User[]> {
return <Observable<User[]>>this.http.get<User[]>(`${url}/list`)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);
return <Observable<User[]>>(
this.http
.get<User[]>(`${url}/list`)
.pipe(catchError(this.log.handleError(serviceName, 'list')))
);
}
listOfNames(): Observable<string[]> {
return <Observable<string[]>>this.http.get<string[]>(`${url}/active`)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);
return <Observable<string[]>>(
this.http
.get<string[]>(`${url}/active`)
.pipe(catchError(this.log.handleError(serviceName, 'list')))
);
}
save(user: User): Observable<User> {
return <Observable<User>>this.http.post<User>(`${url}`, user, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'save'))
);
return <Observable<User>>(
this.http
.post<User>(`${url}`, user, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'save')))
);
}
update(user: User): Observable<User> {
return <Observable<User>>this.http.put<User>(`${url}/${user.id}`, user, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'update'))
);
return <Observable<User>>(
this.http
.put<User>(`${url}/${user.id}`, user, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'update')))
);
}
saveOrUpdate(user: User): Observable<User> {
if (!user.id) {
return this.save(user);
} else {
return this.update(user);
}
return this.update(user);
}
delete(id: string): Observable<User> {
return <Observable<User>>this.http.delete<User>(`${url}/${id}`, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'delete'))
);
return <Observable<User>>(
this.http
.delete<User>(`${url}/${id}`, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'delete')))
);
}
}

2
bookie/src/app/users/users-routing.module.spec.ts
View File

@ -1,4 +1,4 @@
import {UsersRoutingModule} from './users-routing.module';
import { UsersRoutingModule } from './users-routing.module';
describe('UsersRoutingModule', () => {
let userRoutingModule: UsersRoutingModule;

52
bookie/src/app/users/users-routing.module.ts
View File

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

2
bookie/src/app/users/users.module.spec.ts
View File

@ -1,4 +1,4 @@
import {UsersModule} from './users.module';
import { UsersModule } from './users.module';
describe('UsersModule', () => {
let userModule: UsersModule;

31
bookie/src/app/users/users.module.ts
View File

@ -1,9 +1,8 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {UserListComponent} from './user-list/user-list.component';
import {UserDetailComponent} from './user-detail/user-detail.component';
import {UsersRoutingModule} from './users-routing.module';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
@ -12,10 +11,12 @@ 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 {CdkTableModule} from '@angular/cdk/table';
import {ReactiveFormsModule} from '@angular/forms';
import {SharedModule} from '../shared/shared.module';
import {FlexLayoutModule} from '@angular/flex-layout';
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: [
@ -32,12 +33,8 @@ import {FlexLayoutModule} from '@angular/flex-layout';
MatTableModule,
ReactiveFormsModule,
SharedModule,
UsersRoutingModule
UsersRoutingModule,
],
declarations: [
UserListComponent,
UserDetailComponent
]
declarations: [UserListComponent, UserDetailComponent],
})
export class UsersModule {
}
export class UsersModule {}