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

Chore: Upgraded to Angular, Angular Material and Angular Flex layout 8.0

Browse Source
This commit is contained in:
Amritanshu
2019-06-12 17:25:10 +05:30
parent 40eaa25c76
commit fea48e1a3e
114 changed files with 749 additions and 822 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
+1 -1
View File
@@ -12,7 +12,7 @@ import {FormBuilder, FormGroup} from '@angular/forms';
styleUrls: ['./product-group-detail.component.css']
})
export class ProductGroupDetailComponent implements OnInit, AfterViewInit {
@ViewChild('nameElement') nameElement: ElementRef;
@ViewChild('nameElement', { static: true }) nameElement: ElementRef;
form: FormGroup;
item: ProductGroup;
overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts
+2 -1
View File
@@ -1,5 +1,6 @@
import {DataSource} from '@angular/cdk/collections';
import {MatPaginator, MatSort} from '@angular/material';
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 {ProductGroup} from '../product-group';
overlord/src/app/product-group/product-group-list/product-group-list.component.ts
+4 -3
View File
@@ -1,5 +1,6 @@
import {Component, OnInit, ViewChild} from '@angular/core';
import {MatPaginator, MatSort} from '@angular/material';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import {ProductGroupListDataSource} from './product-group-list-datasource';
import {ProductGroup} from '../product-group';
import {ActivatedRoute} from '@angular/router';
@@ -10,8 +11,8 @@ import {ActivatedRoute} from '@angular/router';
styleUrls: ['./product-group-list.component.css']
})
export class ProductGroupListComponent implements OnInit {
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@ViewChild(MatSort, { static: true }) sort: MatSort;
dataSource: ProductGroupListDataSource;
list: ProductGroup[];
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
overlord/src/app/product-group/product-group.module.ts
+8 -10
View File
@@ -4,16 +4,14 @@ 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 {
MatButtonModule,
MatCardModule,
MatIconModule,
MatInputModule,
MatPaginatorModule,
MatProgressSpinnerModule,
MatSortModule,
MatTableModule
} from '@angular/material';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
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';