Skip to content

Commit b50e8b3

Browse files
authored
Merge branch 'master' into add-ci-support
2 parents fb71b93 + e49006d commit b50e8b3

File tree

15 files changed

+72
-23
lines changed

15 files changed

+72
-23
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "^4.0.0",
15+
"@angular/animations": "^4.4.6",
1616
"@angular/cdk": "^2.0.0-beta.12",
1717
"@angular/common": "^4.0.0",
1818
"@angular/compiler": "^4.0.0",

src/app/app.component.html

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
<!--The whole content below can be removed with the new code.-->
22
<div style="text-align:center">
33
<h1>
4-
Welcome to {{title}}!!
4+
{{title}}!!
55
</h1>
6-
<p>{{description}}</p>
76
<app-login></app-login>
8-
<img width="300" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyNTAgMjUwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyNTAgMjUwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPg0KCS5zdDB7ZmlsbDojREQwMDMxO30NCgkuc3Qxe2ZpbGw6I0MzMDAyRjt9DQoJLnN0MntmaWxsOiNGRkZGRkY7fQ0KPC9zdHlsZT4NCjxnPg0KCTxwb2x5Z29uIGNsYXNzPSJzdDAiIHBvaW50cz0iMTI1LDMwIDEyNSwzMCAxMjUsMzAgMzEuOSw2My4yIDQ2LjEsMTg2LjMgMTI1LDIzMCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAJIi8+DQoJPHBvbHlnb24gY2xhc3M9InN0MSIgcG9pbnRzPSIxMjUsMzAgMTI1LDUyLjIgMTI1LDUyLjEgMTI1LDE1My40IDEyNSwxNTMuNCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAxMjUsMzAgCSIvPg0KCTxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik0xMjUsNTIuMUw2Ni44LDE4Mi42aDBoMjEuN2gwbDExLjctMjkuMmg0OS40bDExLjcsMjkuMmgwaDIxLjdoMEwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMQ0KCQlMMTI1LDUyLjF6IE0xNDIsMTM1LjRIMTA4bDE3LTQwLjlMMTQyLDEzNS40eiIvPg0KPC9nPg0KPC9zdmc+DQo=" />
97
</div>
10-
<h2>Here are some links to help you start: </h2>
11-
<ul>
12-
<li>
13-
<h2><a target="_blank" href="https://angular.io/docs/ts/latest/tutorial/">Tour of Heroes</a></h2>
14-
</li>
15-
<li>
16-
<h2><a target="_blank" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
17-
</li>
18-
<li>
19-
<h2><a target="_blank" href="http://angularjs.blogspot.ca/">Angular blog</a></h2>
20-
</li>
21-
</ul>
228

src/app/app.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ import { Component } from '@angular/core';
77
})
88
export class AppComponent {
99
title = 'Lit';
10-
description = 'Awesomeness';
1110
}

src/app/app.module.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
import { BrowserModule } from '@angular/platform-browser';
22
import { NgModule } from '@angular/core';
3+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
34

4-
import { FeCommonModule } from './common/common.module'
5-
5+
import { FeCommonModule } from './common/common.module';
66
import { AppComponent } from './app.component';
77

8+
import { MatButtonModule, MatCheckboxModule} from '@angular/material';
9+
810
@NgModule({
911
declarations: [
1012
AppComponent
1113
],
1214
imports: [
1315
BrowserModule,
16+
BrowserAnimationsModule,
1417
FeCommonModule
1518
],
1619
providers: [],

src/app/common/common.module.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { TextBoxComponent } from './components/presentation/text-box/text-box.component';
44
import { LoginComponent } from './components/smart/login/login.component';
5+
import { CheckBoxComponent } from './components/presentation/check-box/check-box.component';
56

67
@NgModule({
78
imports: [
89
CommonModule
910
],
10-
declarations: [TextBoxComponent, LoginComponent]
11+
declarations: [TextBoxComponent, LoginComponent, CheckBoxComponent],
12+
exports: [
13+
LoginComponent, TextBoxComponent, CheckBoxComponent]
1114
})
1215
export class FeCommonModule { }
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<p>
2+
DRIVER-CHECKBOX
3+
</p>

src/app/common/components/presentation/check-box/check-box.component.scss

Whitespace-only changes.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2+
3+
import { CheckBoxComponent } from './check-box.component';
4+
5+
describe('CheckBoxComponent', () => {
6+
let component: CheckBoxComponent;
7+
let fixture: ComponentFixture<CheckBoxComponent>;
8+
9+
beforeEach(async(() => {
10+
TestBed.configureTestingModule({
11+
declarations: [ CheckBoxComponent ]
12+
})
13+
.compileComponents();
14+
}));
15+
16+
beforeEach(() => {
17+
fixture = TestBed.createComponent(CheckBoxComponent);
18+
component = fixture.componentInstance;
19+
fixture.detectChanges();
20+
});
21+
22+
it('should be created', () => {
23+
expect(component).toBeTruthy();
24+
});
25+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { Component, OnInit } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-check-box',
5+
templateUrl: './check-box.component.html',
6+
styleUrls: ['./check-box.component.scss']
7+
})
8+
export class CheckBoxComponent implements OnInit {
9+
10+
constructor() { }
11+
12+
ngOnInit() {
13+
}
14+
15+
}

src/app/common/components/presentation/text-box/text-box.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export class TextBoxComponent implements OnInit {
1212
constructor() { }
1313

1414
ngOnInit() {
15+
this.value = 'hello'
1516
}
1617

1718
}

0 commit comments

Comments
 (0)