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/user/user-list/user-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 {User} from '../user';
overlord/src/app/user/user-list/user-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 {UserListDataSource} from './user-list-datasource';
import {User} from '../user';
import {ActivatedRoute} from '@angular/router';
@@ -10,8 +11,8 @@ import {ActivatedRoute} from '@angular/router';
styleUrls: ['./user-list.component.css']
})
export class UserListComponent implements OnInit {
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@ViewChild(MatSort, { static: true }) sort: MatSort;
dataSource: UserListDataSource;
list: User[];
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */