tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Prettied, Linted and updated angular.json according to the latest schematic of Angular CLI.

Browse Source 
Now all that is needed is to make it ready for strict compiling.
Removed eslint-plugin-prettier as it is not recommended and causes errors for both eslint and prettier

Bumped to v8.0.0
This commit is contained in:
tanshu
2020-10-10 08:45:05 +05:30
parent 438a98334d
commit 5ea09df272
320 changed files with 2233 additions and 2268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlord/src/app/product-group/product-group-detail/product-group-detail.component.ts
+6 -6
View File
@@ -1,10 +1,10 @@
import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { ProductGroupService } from '../product-group.service';
import { ProductGroup } from '../../core/product-group';
import { ActivatedRoute, Router } from '@angular/router';
import { ToasterService } from '../../core/toaster.service';
import { FormBuilder, FormGroup } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { ProductGroup } from '../../core/product-group';
import { ToasterService } from '../../core/toaster.service';
import { ProductGroupService } from '../product-group.service';
@Component({
selector: 'app-product-group-detail',
@@ -53,7 +53,7 @@ export class ProductGroupDetailComponent implements OnInit, AfterViewInit {
save() {
this.ser.saveOrUpdate(this.getItem()).subscribe(
(result) => {
() => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/product-groups');
},
overlord/src/app/product-group/product-group-list-resolver.service.ts
+6 -4
View File
@@ -1,16 +1,18 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
import { ProductGroup } from '../core/product-group';
import { Resolve } from '@angular/router';
import { Observable } from 'rxjs/internal/Observable';
import { ProductGroup } from '../core/product-group';
import { ProductGroupService } from './product-group.service';
@Injectable({
providedIn: 'root',
})
export class ProductGroupListResolver implements Resolve<ProductGroup[]> {
constructor(private ser: ProductGroupService, private router: Router) {}
constructor(private ser: ProductGroupService) {}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<ProductGroup[]> {
resolve(): Observable<ProductGroup[]> {
return this.ser.list();
}
}
overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts
+8 -9
View File
@@ -1,10 +1,16 @@
import { DataSource } from '@angular/cdk/collections';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { map } from 'rxjs/operators';
import { merge, Observable, of as observableOf } from 'rxjs';
import { map } from 'rxjs/operators';
import { ProductGroup } from '../../core/product-group';
/** Simple sort comparator for example ID/Name columns (for client-side sorting). */
function compare(a, b, isAsc) {
return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
}
export class ProductGroupListDataSource extends DataSource<ProductGroup> {
constructor(private paginator: MatPaginator, private sort: MatSort, public data: ProductGroup[]) {
super();
@@ -17,9 +23,7 @@ export class ProductGroupListDataSource extends DataSource<ProductGroup> {
this.paginator.length = this.data.length;
return merge(...dataMutations).pipe(
map(() => {
return this.getPagedData(this.getSortedData([...this.data]));
}),
map(() => this.getPagedData(this.getSortedData([...this.data]))),
);
}
@@ -48,8 +52,3 @@ export class ProductGroupListDataSource extends DataSource<ProductGroup> {
});
}
}
/** Simple sort comparator for example ID/Name columns (for client-side sorting). */
function compare(a, b, isAsc) {
return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
}
overlord/src/app/product-group/product-group-list/product-group-list.component.ts
+4 -2
View File
@@ -1,10 +1,12 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { ProductGroupListDataSource } from './product-group-list-datasource';
import { ProductGroup } from '../../core/product-group';
import { ActivatedRoute } from '@angular/router';
import { ProductGroup } from '../../core/product-group';
import { ProductGroupListDataSource } from './product-group-list-datasource';
@Component({
selector: 'app-product-group-list',
templateUrl: './product-group-list.component.html',
overlord/src/app/product-group/product-group-resolver.service.ts
+7 -5
View File
@@ -1,16 +1,18 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
import { ProductGroupService } from './product-group.service';
import { ProductGroup } from '../core/product-group';
import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
import { Observable } from 'rxjs/internal/Observable';
import { ProductGroup } from '../core/product-group';
import { ProductGroupService } from './product-group.service';
@Injectable({
providedIn: 'root',
})
export class ProductGroupResolver implements Resolve<ProductGroup> {
constructor(private ser: ProductGroupService, private router: Router) {}
constructor(private ser: ProductGroupService) {}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<ProductGroup> {
resolve(route: ActivatedRouteSnapshot): Observable<ProductGroup> {
const id = route.paramMap.get('id');
return this.ser.get(id);
}
overlord/src/app/product-group/product-group-routing.module.ts
+7 -5
View File
@@ -1,12 +1,14 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { ProductGroupListResolver } from './product-group-list-resolver.service';
import { ProductGroupResolver } from './product-group-resolver.service';
import { ProductGroupListComponent } from './product-group-list/product-group-list.component';
import { ProductGroupDetailComponent } from './product-group-detail/product-group-detail.component';
import { AuthGuard } from '../auth/auth-guard.service';
import { ProductGroupDetailComponent } from './product-group-detail/product-group-detail.component';
import { ProductGroupListResolver } from './product-group-list-resolver.service';
import { ProductGroupListComponent } from './product-group-list/product-group-list.component';
import { ProductGroupResolver } from './product-group-resolver.service';
const productGroupRoutes: Routes = [
{
path: '',
overlord/src/app/product-group/product-group.module.ts
+8 -8
View File
@@ -1,9 +1,8 @@
import { NgModule } from '@angular/core';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { ProductGroupListComponent } from './product-group-list/product-group-list.component';
import { ProductGroupDetailComponent } from './product-group-detail/product-group-detail.component';
import { ProductGroupRoutingModule } from './product-group-routing.module';
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 { MatIconModule } from '@angular/material/icon';
@@ -12,9 +11,10 @@ import { MatPaginatorModule } from '@angular/material/paginator';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
import { CdkTableModule } from '@angular/cdk/table';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { ProductGroupDetailComponent } from './product-group-detail/product-group-detail.component';
import { ProductGroupListComponent } from './product-group-list/product-group-list.component';
import { ProductGroupRoutingModule } from './product-group-routing.module';
@NgModule({
imports: [
overlord/src/app/product-group/product-group.service.ts
+5 -5
View File
@@ -1,8 +1,9 @@
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { ErrorLoggerService } from '../core/error-logger.service';
import { catchError } from 'rxjs/operators';
import { Observable } from 'rxjs/internal/Observable';
import { catchError } from 'rxjs/operators';
import { ErrorLoggerService } from '../core/error-logger.service';
import { ProductGroup } from '../core/product-group';
const httpOptions = {
@@ -53,9 +54,8 @@ export class ProductGroupService {
saveOrUpdate(productGroup: ProductGroup): Observable<ProductGroup> {
if (!productGroup.id) {
return this.save(productGroup);
} else {
return this.update(productGroup);
}
return this.update(productGroup);
}
delete(id: string): Observable<ProductGroup> {