Skip to content
This repository has been archived by the owner on Sep 6, 2022. It is now read-only.

Commit

Permalink
Add Shared Material module, so we only have to import things one time
Browse files Browse the repository at this point in the history
  • Loading branch information
nakhbari committed Apr 18, 2018
1 parent a61f15f commit 7ec58f0
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
12 changes: 2 additions & 10 deletions web/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import {HttpClientModule} from '@angular/common/http';
import {NgModule} from '@angular/core';
import {MatCardModule} from '@angular/material/card';
import {MatIconModule} from '@angular/material/icon';
import {MatTableModule} from '@angular/material/table';
import {MatToolbarModule} from '@angular/material/toolbar';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
import {BrowserModule} from '@angular/platform-browser';
import {MomentModule} from 'ngx-moment';

Expand All @@ -13,6 +8,7 @@ import {AppComponent} from './app.component';
import {DashboardComponent} from './dashboard/dashboard.component';
import {ProjectComponent} from './project/project.component';
import {DataService} from './services/data.service';
import {SharedMaterialModule} from './shared_material.module';

@NgModule({
declarations: [AppComponent, DashboardComponent, ProjectComponent],
Expand All @@ -21,11 +17,7 @@ import {DataService} from './services/data.service';
HttpClientModule,
AppRoutingModule,
/** Angular Material Imports */
MatCardModule,
MatTableModule,
MatIconModule,
MatToolbarModule,
MatProgressSpinnerModule,
SharedMaterialModule,
/** Third-Party Module Imports */
MomentModule,
],
Expand Down
10 changes: 2 additions & 8 deletions web/app/dashboard/dashboard.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import 'rxjs/add/observable/of';

import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
import {MatCardModule} from '@angular/material/card';
import {MatIconModule} from '@angular/material/icon';
import {MatTableModule} from '@angular/material/table';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
import {RouterModule} from '@angular/router';
import {MomentModule} from 'ngx-moment';
import {Observable} from 'rxjs/Observable';
Expand All @@ -13,6 +9,7 @@ import {Subject} from 'rxjs/Subject';
import {BuildStatus} from '../common/constants';
import {ProjectSummary} from '../models/project_summary';
import {DataService} from '../services/data.service';
import {SharedMaterialModule} from '../shared_material.module';

import {DashboardComponent} from './dashboard.component';
import {mockProjectSummaryList} from './test_helpers/mock_project_summary';
Expand All @@ -27,10 +24,7 @@ describe('DashboardComponent', () => {

TestBed
.configureTestingModule({
imports: [
MatIconModule, MatCardModule, MatTableModule, MatProgressSpinnerModule, RouterModule,
MomentModule
],
imports: [SharedMaterialModule, MomentModule, RouterModule],
declarations: [
DashboardComponent,
],
Expand Down
11 changes: 3 additions & 8 deletions web/app/project/project.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import 'rxjs/add/operator/switchMap';

import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {MatCardModule} from '@angular/material/card';
import {MatIconModule} from '@angular/material/icon';
import {MatTableModule} from '@angular/material/table';
import {MatToolbarModule} from '@angular/material/toolbar';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
import {MomentModule} from 'ngx-moment';
import {ActivatedRoute, convertToParamMap} from '@angular/router';
import {MomentModule} from 'ngx-moment';
import {Observable} from 'rxjs/Observable';
import {Subject} from 'rxjs/Subject';

import {Project} from '../models/project';
import {DataService} from '../services/data.service';
import {SharedMaterialModule} from '../shared_material.module';

import {ProjectComponent} from './project.component';
import {mockProject} from './test_helpers/mock_project_response';
Expand All @@ -27,8 +23,7 @@ describe('ProjectComponent', () => {

TestBed
.configureTestingModule({
imports:
[MatIconModule, MatCardModule, MatTableModule, MatToolbarModule, MatProgressSpinnerModule, MomentModule],
imports: [SharedMaterialModule, MomentModule],
declarations: [
ProjectComponent,
],
Expand Down
19 changes: 19 additions & 0 deletions web/app/shared_material.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import {NgModule} from '@angular/core';
import {MatCardModule} from '@angular/material/card';
import {MatIconModule} from '@angular/material/icon';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
import {MatTableModule} from '@angular/material/table';
import {MatToolbarModule} from '@angular/material/toolbar';

@NgModule({
exports: [
MatCardModule,
MatTableModule,
MatIconModule,
MatToolbarModule,
MatProgressSpinnerModule,
]
})

export class SharedMaterialModule {
}

0 comments on commit 7ec58f0

Please sign in to comment.