Skip to content
This repository was archived by the owner on Oct 1, 2018. It is now read-only.

Commit aa59604

Browse files
resolved lint issues
changed md to mat for icon-button re ran all tests and passed locally added extra line to spec for lint grabbed changes from #26 Update angular material prefix to mat and lock down package versions - Updated imports and component prefixes for angular material - Updated package.json to lock down versions - Added .npmrc config to save-exact Close #25
1 parent e3f1215 commit aa59604

14 files changed

+71
-57
lines changed

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
save-exact=true

package.json

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,46 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "^4.4.4",
17-
"@angular/cdk": "^2.0.0-beta.11",
18-
"@angular/common": "^4.2.4",
19-
"@angular/compiler": "^4.2.4",
20-
"@angular/core": "^4.2.4",
21-
"@angular/forms": "^4.2.4",
22-
"@angular/http": "^4.2.4",
23-
"@angular/material": "^2.0.0-beta.11",
24-
"@angular/platform-browser": "^4.2.4",
25-
"@angular/platform-browser-dynamic": "^4.2.4",
26-
"@angular/router": "^4.2.4",
27-
"@types/hammerjs": "^2.0.35",
28-
"core-js": "^2.4.1",
29-
"hammerjs": "^2.0.8",
30-
"rxjs": "^5.4.2",
31-
"zone.js": "^0.8.14"
16+
"@angular/animations": "4.4.4",
17+
"@angular/cdk": "2.0.0-beta.12",
18+
"@angular/common": "4.4.4",
19+
"@angular/compiler": "4.4.4",
20+
"@angular/core": "4.4.4",
21+
"@angular/forms": "4.4.4",
22+
"@angular/http": "4.4.4",
23+
"@angular/material": "2.0.0-beta.12",
24+
"@angular/platform-browser": "4.4.4",
25+
"@angular/platform-browser-dynamic": "4.4.4",
26+
"@angular/router": "4.4.4",
27+
"@types/hammerjs": "2.0.35",
28+
"core-js": "2.4.1",
29+
"hammerjs": "2.0.8",
30+
"rxjs": "5.4.2",
31+
"zone.js": "0.8.14"
3232
},
3333
"devDependencies": {
34-
"@angular/cli": "1.4.3",
35-
"@angular/compiler-cli": "^4.2.4",
36-
"@angular/language-service": "^4.2.4",
37-
"@angular/service-worker": "^1.0.0-beta.16",
38-
"@types/jasmine": "~2.5.53",
39-
"@types/jasminewd2": "~2.0.2",
40-
"@types/node": "~6.0.60",
41-
"angular2-template-loader": "^0.6.2",
42-
"codelyzer": "~3.1.1",
43-
"electron": "^1.6.11",
44-
"jasmine-core": "~2.6.2",
45-
"jasmine-spec-reporter": "~4.1.0",
46-
"karma": "~1.7.0",
47-
"karma-chrome-launcher": "~2.1.1",
48-
"karma-cli": "~1.0.1",
49-
"karma-coverage-istanbul-reporter": "^1.2.1",
50-
"karma-jasmine": "~1.1.0",
51-
"karma-jasmine-html-reporter": "^0.2.2",
52-
"protractor": "~5.1.2",
53-
"ts-node": "~3.2.0",
54-
"tslint": "~5.3.2",
55-
"typescript": "~2.3.3",
34+
"@angular/cli": "1.4.5",
35+
"@angular/compiler-cli": "4.4.4",
36+
"@angular/language-service": "4.4.4",
37+
"@angular/service-worker": "1.0.0-beta.16",
38+
"@types/jasmine": "2.5.53",
39+
"@types/jasminewd2": "2.0.2",
40+
"@types/node": "6.0.60",
41+
"angular2-template-loader": "0.6.2",
42+
"codelyzer": "3.1.1",
43+
"electron": "1.6.11",
44+
"jasmine-core": "2.6.2",
45+
"jasmine-spec-reporter": "4.1.0",
46+
"karma": "1.7.0",
47+
"karma-chrome-launcher": "2.1.1",
48+
"karma-cli": "1.0.1",
49+
"karma-coverage-istanbul-reporter": "1.2.1",
50+
"karma-jasmine": "1.1.0",
51+
"karma-jasmine-html-reporter": "0.2.2",
52+
"protractor": "5.1.2",
53+
"ts-node": "3.2.0",
54+
"tslint": "5.3.2",
55+
"typescript": "2.3.3",
5656
"wallaby-webpack": "*"
5757
}
5858
}

src/app/app.component.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="app-fullpage">
22
<mat-toolbar color="accent" class="mat-elevation-z6">
3-
<button md-icon-button (click)="sidenav.toggle()">
3+
<button mat-icon-button (click)="sidenav.toggle()">
44
<mat-icon>
55
menu
66
</mat-icon>
@@ -10,8 +10,14 @@
1010
<mat-sidenav-container>
1111
<mat-sidenav #sidenav>
1212
<mat-nav-list (click)="sidenav.toggle()">
13+
<<<<<<< HEAD
1314
<a *ngFor="let menu of menus" mat-list-item routerLinkActive="active" [routerLinkActiveOptions]="menu.options" [routerLink]="menu.link">
14-
{{menu.title}}
15+
=======
16+
<a *ngFor="let menu of menus" mat-list-item routerLinkActive="active"
17+
[routerLinkActiveOptions]="menu.options"
18+
[routerLink]="menu.link">
19+
>>>>>>> dc33074... Update angular material prefix to mat and lock down package versions
20+
{{menu.title}}
1521
</a>
1622
</mat-nav-list>
1723
</mat-sidenav>

src/app/app.component.spec.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@ describe('AppComponent', () => {
1010

1111
beforeEach(async(() => {
1212
TestBed.configureTestingModule({
13-
imports: [RouterTestingModule, BrowserAnimationsModule, MatToolbarModule, MatSidenavModule, MatIconModule, MatButtonModule, MatListModule],
13+
imports: [
14+
RouterTestingModule,
15+
BrowserAnimationsModule,
16+
MatToolbarModule,
17+
MatSidenavModule,
18+
MatIconModule,
19+
MatButtonModule,
20+
MatListModule
21+
],
1422
declarations: [AppComponent]
1523
})
1624
.compileComponents();

src/app/companies/companies.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ export class CompaniesComponent implements OnInit {
1111

1212
ngOnInit() {
1313
}
14-
1514
}
15+

src/app/companies/companies.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ import { routing } from './companies.routing';
77
imports: [routing],
88
declarations: [CompaniesComponent]
99
})
10-
export class CompaniesModule { }
10+
export class CompaniesModule { }

src/app/companies/companies.routing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ const routes: Routes = [
77
{ path: '', component: CompaniesComponent }
88
];
99

10-
export const routing: ModuleWithProviders = RouterModule.forChild(routes);
10+
export const routing: ModuleWithProviders = RouterModule.forChild(routes);

src/app/operators/operators.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ import { routing } from './operators.routing';
77
imports: [routing],
88
declarations: [OperatorsComponent]
99
})
10-
export class OperatorsModule { }
10+
export class OperatorsModule { }

src/app/operators/operators.routing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ const routes: Routes = [
77
{ path: '', component: OperatorsComponent }
88
];
99

10-
export const routing: ModuleWithProviders = RouterModule.forChild(routes);
10+
export const routing: ModuleWithProviders = RouterModule.forChild(routes);

src/app/rxjs/rxjs.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ import { routing } from './rxjs.routing';
77
imports: [routing],
88
declarations: [RxjsComponent]
99
})
10-
export class RxjsModule { }
10+
export class RxjsModule { }

0 commit comments

Comments
 (0)