Merge branch 'release/1.0.2'

Author: exequiel09

Diff for: .nvmrc

@@ -1 +1 @@
-7.7.3
+7.7.4

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-lecture",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "MIT",
   "author": "Exequiel Ceasar Navarrete <[email protected]>",
   "scripts": {
@@ -14,24 +14,24 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": ">=4.0.0-beta <5.0.0",
-    "@angular/compiler": ">=4.0.0-beta <5.0.0",
-    "@angular/core": ">=4.0.0-beta <5.0.0",
-    "@angular/forms": ">=4.0.0-beta <5.0.0",
-    "@angular/http": ">=4.0.0-beta <5.0.0",
+    "@angular/common": "^4.0.0",
+    "@angular/compiler": "^4.0.0",
+    "@angular/core": "^4.0.0",
+    "@angular/forms": "^4.0.0",
+    "@angular/http": "^4.0.0",
     "@angular/material": "^2.0.0-beta.2",
-    "@angular/platform-browser": ">=4.0.0-beta <5.0.0",
-    "@angular/platform-browser-dynamic": ">=4.0.0-beta <5.0.0",
-    "@angular/router": ">=4.0.0-beta <5.0.0",
+    "@angular/platform-browser": "^4.0.0",
+    "@angular/platform-browser-dynamic": "^4.0.0",
+    "@angular/router": "^4.0.0",
     "core-js": "^2.4.1",
     "hammerjs": "^2.0.8",
-    "normalize.css": "^5.0.0",
+    "normalize.css": "^6.0.0",
     "rxjs": "^5.1.0",
-    "zone.js": "^0.7.6"
+    "zone.js": "^0.8.5"
   },
   "devDependencies": {
-    "@angular/cli": "1.0.0-rc.2",
-    "@angular/compiler-cli": ">=4.0.0-beta <5.0.0",
+    "@angular/cli": "^1.0.0",
+    "@angular/compiler-cli": "^4.0.0",
     "@types/jasmine": "2.5.38",
     "@types/node": "~6.0.60",
     "codelyzer": "~2.0.0",
@@ -46,6 +46,6 @@
     "protractor": "~5.1.0",
     "ts-node": "~2.0.0",
     "tslint": "~4.5.0",
-    "typescript": "~2.1.0"
+    "typescript": "^2.2.2"
   }
 }

Diff for: src/app/app-routing.module.ts

@@ -34,6 +34,15 @@ const routes: Routes = [
   }, {
     path: 'two-way-data-binding',
     loadChildren: './lecture/two-way-data-binding/two-way-data-binding.module.ts#TwoWayDataBindingModule'
+  }, {
+    path: 'pipes',
+    loadChildren: './lecture/pipes/pipes.module.ts#PipesModule'
+  }, {
+    path: 'custom-pipes',
+    loadChildren: './lecture/custom-pipes/custom-pipes.module.ts#CustomPipesModule'
+  }, {
+    path: 'async-pipe',
+    loadChildren: './lecture/async-pipe/async-pipe.module.ts#AsyncPipeModule'
   }
 ];
 

Diff for: src/app/app.component.html

@@ -20,6 +20,11 @@
       <a [routerLink]="['/inputs']" md-list-item>7. Inputs</a>
       <a [routerLink]="['/outputs']" md-list-item>8. Outputs</a>
       <a [routerLink]="['/two-way-data-binding']" md-list-item>9. Two-way Data Binding</a>
+      <a [routerLink]="['/pipes']" md-list-item>10.1 Pipes</a>
+      <a [routerLink]="['/custom-pipes']" md-list-item>10.2 Custom Pipes</a>
+      <a [routerLink]="['/async-pipe/promises']" md-list-item>10.3.1 Promises</a>
+      <a [routerLink]="['/async-pipe/observables']" md-list-item>10.3.2 Observables</a>
+      <a [routerLink]="['/async-pipe']" md-list-item>10.3.3 Async Pipe</a>
     </md-nav-list>
   </md-sidenav>
 

Diff for: src/app/lecture/async-pipe/async-pipe-routing.module.ts

@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IndexComponent } from './index/index.component';
+import { PromisesComponent } from './promises/promises.component';
+import { ObservablesComponent } from './observables/observables.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: IndexComponent
+  }, {
+    path: 'promises',
+    component: PromisesComponent
+  }, {
+    path: 'observables',
+    component: ObservablesComponent
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AsyncPipeRoutingModule { }

Diff for: src/app/lecture/async-pipe/async-pipe.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { AsyncPipeRoutingModule } from './async-pipe-routing.module';
+import { IndexComponent } from './index/index.component';
+import { PromisesComponent } from './promises/promises.component';
+import { ObservablesComponent } from './observables/observables.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    AsyncPipeRoutingModule
+  ],
+  declarations: [
+    IndexComponent,
+    PromisesComponent,
+    ObservablesComponent
+  ]
+})
+export class AsyncPipeModule { }

Diff for: src/app/lecture/async-pipe/index/index.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { IndexComponent } from './index.component';
+
+describe('IndexComponent', () => {
+  let component: IndexComponent;
+  let fixture: ComponentFixture<IndexComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ IndexComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IndexComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

Diff for: src/app/lecture/async-pipe/index/index.component.ts

@@ -0,0 +1,39 @@
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/operator/delayWhen';
+import 'rxjs/add/observable/interval';
+import 'rxjs/add/observable/of';
+import 'rxjs/add/observable/timer';
+
+@Component({
+  selector: 'app-index',
+  template: `
+    <p>{{ asyncVar1 | async }}</p>
+    <p>{{ asyncVar2 | async }}</p>
+    <p>{{ asyncVar3 | async }}</p>
+  `
+})
+export class IndexComponent implements OnInit {
+  public asyncVar1: Promise<string>;
+  public asyncVar2: Observable<string>;
+  public asyncVar3: Observable<number>;
+
+  constructor() { }
+
+  ngOnInit() {
+    this.asyncVar1 = new Promise((resolve, reject) => {
+      setTimeout(() => {
+        resolve('I a am a resolved value of promise!');
+      }, 3000);
+    });
+
+    this.asyncVar2 = Observable
+      .of('I am a value from observable')
+      .delayWhen(() => Observable.timer(5000))
+      ;
+
+    // emit values 0-n every n seconds
+    this.asyncVar3 = Observable.interval(1000);
+  }
+
+}

Diff for: src/app/lecture/async-pipe/observables/observables.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ObservablesComponent } from './observables.component';
+
+describe('ObservablesComponent', () => {
+  let component: ObservablesComponent;
+  let fixture: ComponentFixture<ObservablesComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ObservablesComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ObservablesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

Diff for: src/app/lecture/async-pipe/observables/observables.component.ts

@@ -0,0 +1,33 @@
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+
+@Component({
+  selector: 'app-observables',
+  template: `View the console to see the output`
+})
+export class ObservablesComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+    const obsInstance: Observable<string> = Observable.create((observer) => {
+      setTimeout(() => {
+        observer.next('My first message');
+      }, 2000);
+
+      setTimeout(() => {
+        observer.next('My second message');
+      }, 3000);
+
+      setTimeout(() => {
+        observer.complete();
+      }, 5000);
+    });
+
+    obsInstance.subscribe({
+      next: (message) => console.log(message),
+      complete: () => console.log('Observable completed')
+    });
+  }
+
+}

Diff for: src/app/lecture/async-pipe/promises/promises.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PromisesComponent } from './promises.component';
+
+describe('PromisesComponent', () => {
+  let component: PromisesComponent;
+  let fixture: ComponentFixture<PromisesComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PromisesComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PromisesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

Diff for: src/app/lecture/async-pipe/promises/promises.component.ts

@@ -0,0 +1,23 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-promises',
+  template: `View the console to see the output`
+})
+export class PromisesComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+    const timeoutPromise = new Promise((resolve, reject) => {
+      setTimeout(() => {
+        resolve('setTimeout() executed');
+      }, 5000);
+    });
+
+    timeoutPromise.then((message) => console.log(message));
+
+    console.log('This will execute before the timeout has been completed.');
+  }
+
+}

Diff for: src/app/lecture/custom-pipes/custom-pipes-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IndexComponent } from './index/index.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: IndexComponent,
+    children: []
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class CustomPipesRoutingModule { }

Diff for: src/app/lecture/custom-pipes/custom-pipes.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { CustomPipesRoutingModule } from './custom-pipes-routing.module';
+import { ReversePipe } from './reverse.pipe';
+import { IndexComponent } from './index/index.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    CustomPipesRoutingModule
+  ],
+  declarations: [
+    IndexComponent,
+    ReversePipe
+  ]
+})
+export class CustomPipesModule { }

Diff for: src/app/lecture/custom-pipes/index/index.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { IndexComponent } from './index.component';
+
+describe('IndexComponent', () => {
+  let component: IndexComponent;
+  let fixture: ComponentFixture<IndexComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ IndexComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IndexComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

Diff for: src/app/lecture/custom-pipes/index/index.component.ts

@@ -0,0 +1,18 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-index',
+  template: `
+    <p>{{ text }}</p>
+    <p>{{ text | reverse }}</p>
+  `
+})
+export class IndexComponent implements OnInit {
+  public text = 'I am a text';
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

Diff for: src/app/lecture/custom-pipes/reverse.pipe.spec.ts

@@ -0,0 +1,8 @@
+import { ReversePipe } from './reverse.pipe';
+
+describe('ReversePipe', () => {
+  it('create an instance', () => {
+    const pipe = new ReversePipe();
+    expect(pipe).toBeTruthy();
+  });
+});