merge upstream

btroncone · btroncone · commit 363f68fbce98 · 2017-10-10T12:49:12.000-04:00
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+save-exact=true
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,19 @@
+sudo: required
+dist: trusty
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+language: node_js
+node_js:
+ - "7"
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+script:
+ - ng lint
+ - ng test --single-run
+ - ng build -prod
+ - ng e2e
diff --git a/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts
@@ -7,8 +7,8 @@ describe('rxjs-docs App', () => {
     page = new AppPage();
   });
 
-  it('should display welcome message', () => {
+  it('should display title', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to app!');
+    expect(page.getPageTitle()).toEqual('RxJS Docs');
   });
 });
diff --git a/e2e/app.po.ts b/e2e/app.po.ts
@@ -5,7 +5,7 @@ export class AppPage {
     return browser.get('/');
   }
 
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+  getPageTitle() {
+    return element(by.css('span.title')).getText();
   }
 }
diff --git a/package.json b/package.json
@@ -13,46 +13,46 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.4.4",
-    "@angular/cdk": "^2.0.0-beta.12",
-    "@angular/common": "^4.2.4",
-    "@angular/compiler": "^4.2.4",
-    "@angular/core": "^4.2.4",
-    "@angular/forms": "^4.2.4",
-    "@angular/http": "^4.2.4",
-    "@angular/material": "^2.0.0-beta.12",
-    "@angular/platform-browser": "^4.2.4",
-    "@angular/platform-browser-dynamic": "^4.2.4",
-    "@angular/router": "^4.2.4",
-    "@types/hammerjs": "^2.0.35",
-    "core-js": "^2.4.1",
-    "hammerjs": "^2.0.8",
-    "rxjs": "^5.4.2",
-    "zone.js": "^0.8.14"
+    "@angular/animations": "4.4.4",
+    "@angular/cdk": "2.0.0-beta.12",
+    "@angular/common": "4.4.4",
+    "@angular/compiler": "4.4.4",
+    "@angular/core": "4.4.4",
+    "@angular/forms": "4.4.4",
+    "@angular/http": "4.4.4",
+    "@angular/material": "2.0.0-beta.12",
+    "@angular/platform-browser": "4.4.4",
+    "@angular/platform-browser-dynamic": "4.4.4",
+    "@angular/router": "4.4.4",
+    "@types/hammerjs": "2.0.35",
+    "core-js": "2.4.1",
+    "hammerjs": "2.0.8",
+    "rxjs": "5.4.2",
+    "zone.js": "0.8.14"
   },
   "devDependencies": {
-    "@angular/cli": "1.4.3",
-    "@angular/compiler-cli": "^4.2.4",
-    "@angular/language-service": "^4.2.4",
-    "@angular/service-worker": "^1.0.0-beta.16",
-    "@types/jasmine": "~2.5.53",
-    "@types/jasminewd2": "~2.0.2",
-    "@types/node": "~6.0.60",
-    "angular2-template-loader": "^0.6.2",
-    "codelyzer": "~3.1.1",
-    "electron": "^1.6.11",
-    "jasmine-core": "~2.6.2",
-    "jasmine-spec-reporter": "~4.1.0",
-    "karma": "~1.7.0",
-    "karma-chrome-launcher": "~2.1.1",
-    "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.2.1",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.1.2",
-    "ts-node": "~3.2.0",
-    "tslint": "~5.3.2",
-    "typescript": "~2.3.3",
+    "@angular/cli": "1.4.5",
+    "@angular/compiler-cli": "4.4.4",
+    "@angular/language-service": "4.4.4",
+    "@angular/service-worker": "1.0.0-beta.16",
+    "@types/jasmine": "2.5.53",
+    "@types/jasminewd2": "2.0.2",
+    "@types/node": "6.0.60",
+    "angular2-template-loader": "0.6.2",
+    "codelyzer": "3.1.1",
+    "electron": "1.6.11",
+    "jasmine-core": "2.6.2",
+    "jasmine-spec-reporter": "4.1.0",
+    "karma": "1.7.0",
+    "karma-chrome-launcher": "2.1.1",
+    "karma-cli": "1.0.1",
+    "karma-coverage-istanbul-reporter": "1.2.1",
+    "karma-jasmine": "1.1.0",
+    "karma-jasmine-html-reporter": "0.2.2",
+    "protractor": "5.1.2",
+    "ts-node": "3.2.0",
+    "tslint": "5.3.2",
+    "typescript": "2.3.3",
     "wallaby-webpack": "*"
   }
 }
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -0,0 +1,36 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { MatToolbarModule, MatSidenavModule, MatIconModule, MatButtonModule, MatListModule } from '@angular/material';
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  let component: AppComponent;
+  let fixture: ComponentFixture<AppComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        RouterTestingModule,
+        BrowserAnimationsModule,
+        MatToolbarModule,
+        MatSidenavModule,
+        MatIconModule,
+        MatButtonModule,
+        MatListModule
+      ],
+      declarations: [AppComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AppComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-class Menu {
+interface Menu {
   title: string;
   link: string;
   options: { exact: boolean };
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,22 +1,15 @@
 import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { NgModule } from '@angular/core';
 import { MatToolbarModule, MatSidenavModule, MatIconModule, MatButtonModule, MatListModule } from '@angular/material';
 import { RouterModule, PreloadAllModules } from '@angular/router';
 
-import { RXJS_DOC_ROUTES } from './app.routing';
-
 import { AppComponent } from './app.component';
-import { CompaniesComponent } from './companies/companies.component';
-import { TeamComponent } from './team/team.component';
-import { RxjsComponent } from './rxjs/rxjs.component';
+import { RXJS_DOC_ROUTES } from './app.routing';
 
 @NgModule({
   declarations: [
     AppComponent,
-    CompaniesComponent,
-    TeamComponent,
-    RxjsComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
@@ -7,9 +7,9 @@ import { RxjsComponent } from './rxjs/rxjs.component';
 import { TeamComponent } from './team/team.component';
 
 export const RXJS_DOC_ROUTES: Routes = [
-  { path: '', component: RxjsComponent },
+  { path: '', loadChildren: './rxjs/rxjs.module#RxjsModule' },
   { path: 'operators', loadChildren: './operators/operators.module#OperatorsModule' },
-  { path: 'team', component: TeamComponent },
-  { path: 'companies', component: CompaniesComponent },
+  { path: 'team', loadChildren: './team/team.module#TeamModule' },
+  { path: 'companies', loadChildren: './companies/companies.module#CompaniesModule' },
   { path: '**', redirectTo: '' }
 ];
diff --git a/src/app/companies/companies.component.ts b/src/app/companies/companies.component.ts
@@ -11,5 +11,5 @@ export class CompaniesComponent implements OnInit {
 
   ngOnInit() {
   }
-
 }
+
diff --git a/src/app/companies/companies.module.ts b/src/app/companies/companies.module.ts
@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+
+import { CompaniesComponent } from './companies.component';
+import { routing } from './companies.routing';
+
+@NgModule({
+    imports: [routing],
+    declarations: [CompaniesComponent]
+})
+export class CompaniesModule { }
diff --git a/src/app/companies/companies.routing.ts b/src/app/companies/companies.routing.ts
@@ -0,0 +1,10 @@
+import { ModuleWithProviders } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { CompaniesComponent } from './companies.component';
+
+const routes: Routes = [
+    { path: '', component: CompaniesComponent }
+];
+
+export const routing: ModuleWithProviders = RouterModule.forChild(routes);
diff --git a/src/app/operators/operators.routing.ts b/src/app/operators/operators.routing.ts
@@ -0,0 +1,10 @@
+import { ModuleWithProviders } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { OperatorsComponent } from './operators.component';
+
+const routes: Routes = [
+    { path: '', component: OperatorsComponent }
+];
+
+export const routing: ModuleWithProviders = RouterModule.forChild(routes);
diff --git a/src/app/rxjs/rxjs.module.ts b/src/app/rxjs/rxjs.module.ts
@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+
+import { RxjsComponent } from './rxjs.component';
+import { routing } from './rxjs.routing';
+
+@NgModule({
+    imports: [routing],
+    declarations: [RxjsComponent]
+})
+export class RxjsModule { }
diff --git a/src/app/rxjs/rxjs.routing.ts b/src/app/rxjs/rxjs.routing.ts
@@ -0,0 +1,10 @@
+import { ModuleWithProviders } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { RxjsComponent } from './rxjs.component';
+
+const routes: Routes = [
+    { path: '', component: RxjsComponent }
+];
+
+export const routing: ModuleWithProviders = RouterModule.forChild(routes);
diff --git a/src/app/team/team.module.ts b/src/app/team/team.module.ts
@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+
+import { TeamComponent } from './team.component';
+import { routing } from './team.routing';
+
+@NgModule({
+    imports: [routing],
+    declarations: [TeamComponent]
+})
+export class TeamModule { }
diff --git a/src/app/team/team.routing.ts b/src/app/team/team.routing.ts
@@ -0,0 +1,10 @@
+import { ModuleWithProviders } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { TeamComponent } from './team.component';
+
+const routes: Routes = [
+    { path: '', component: TeamComponent }
+];
+
+export const routing: ModuleWithProviders = RouterModule.forChild(routes);
diff --git a/src/styles.scss b/src/styles.scss
@@ -3,10 +3,9 @@
 @import './styles/code-helpers';
 
 @include mat-core();
-
 // Define the theme.
 $primary: mat-palette($mat-indigo);
-$accent:  mat-palette($mat-pink);
+$accent : mat-palette($mat-pink);
 $theme: mat-light-theme($primary, $accent);
 
 @include angular-material-theme($theme);
@@ -16,7 +15,8 @@ body {
   font-family: Roboto, sans-serif;
 }
 
-html, body {
+html,
+body {
   margin: 0;
   width: 100%;
   height: 100%;

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export class AppPage {`
`5`	`5`	`return browser.get('/');`
`6`	`6`	`}`
`7`	`7`
`8`		`- getParagraphText() {`
`9`		`- return element(by.css('app-root h1')).getText();`
	`8`	`+ getPageTitle() {`
	`9`	`+ return element(by.css('span.title')).getText();`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ export class CompaniesComponent implements OnInit {`
`11`	`11`
`12`	`12`	`ngOnInit() {`
`13`	`13`	`}`
`14`		`-`
`15`	`14`	`}`
	`15`	`+`