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

Commit 9ff5dc4

Browse files
sumitarorasumitarora
authored
Merge branch 'master' into master
2 parents b91bdbc + b01ac15 commit 9ff5dc4

File tree

16 files changed

+217
-140
lines changed

16 files changed

+217
-140
lines changed

‎src/app/app.component.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2-
import { RouterTestingModule } from '@angular/router/testing';
3-
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
4-
import { AppComponent } from './app.component';
5-
import { ToolbarModule } from './toolbar/toolbar.module';
6-
import { MatSidenavModule } from '@angular/material';
1+
import { async, ComponentFixture, TestBed } from "@angular/core/testing";
2+
import { RouterTestingModule } from "@angular/router/testing";
3+
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
4+
import { AppComponent } from "./app.component";
5+
import { ToolbarModule } from "./toolbar/toolbar.module";
6+
import { MatSidenavModule } from "@angular/material";
77

8-
describe('AppComponent', () => {
8+
describe("AppComponent", () => {
99
let component: AppComponent;
1010
let fixture: ComponentFixture<AppComponent>;
1111

@@ -29,7 +29,7 @@ describe('AppComponent', () => {
2929
fixture.detectChanges();
3030
});
3131

32-
it('should create', () => {
32+
it("should create", () => {
3333
expect(component).toBeTruthy();
3434
});
3535
});

‎src/app/app.component.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component } from '@angular/core';
1+
import { Component } from "@angular/core";
22

33
interface Menu {
44
title: string;
@@ -7,30 +7,30 @@ interface Menu {
77
}
88

99
@Component({
10-
selector: 'app-root',
11-
templateUrl: './app.component.html',
12-
styleUrls: ['./app.component.scss']
10+
selector: "app-root",
11+
templateUrl: "./app.component.html",
12+
styleUrls: ["./app.component.scss"]
1313
})
1414
export class AppComponent {
1515
menus: Menu[] = [
1616
{
17-
title: 'Home',
18-
link: '/',
17+
title: "Home",
18+
link: "/",
1919
options: { exact: true }
2020
},
2121
{
22-
title: 'Operators',
23-
link: '/operators',
22+
title: "Operators",
23+
link: "/operators",
2424
options: { exact: false }
2525
},
2626
{
27-
title: 'Companies',
28-
link: '/companies',
27+
title: "Companies",
28+
link: "/companies",
2929
options: { exact: false }
3030
},
3131
{
32-
title: 'Team',
33-
link: '/team',
32+
title: "Team",
33+
link: "/team",
3434
options: { exact: false }
3535
}
3636
];

‎src/app/app.module.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { BrowserModule } from '@angular/platform-browser';
2-
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
3-
import { NgModule } from '@angular/core';
4-
import { RouterModule, PreloadAllModules } from '@angular/router';
1+
import { BrowserModule } from "@angular/platform-browser";
2+
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
3+
import { NgModule } from "@angular/core";
4+
import { RouterModule, PreloadAllModules } from "@angular/router";
55

6-
import { AppComponent } from './app.component';
7-
import { RXJS_DOC_ROUTES } from './app.routing';
8-
import { ToolbarModule } from './toolbar/toolbar.module';
9-
import { MatSidenavModule, MatListModule } from '@angular/material';
6+
import { AppComponent } from "./app.component";
7+
import { RXJS_DOC_ROUTES } from "./app.routing";
8+
import { ToolbarModule } from "./toolbar/toolbar.module";
9+
import { MatSidenavModule, MatListModule } from "@angular/material";
1010

1111
@NgModule({
1212
declarations: [AppComponent],

‎src/app/companies/companies.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Component, OnInit } from '@angular/core';
1+
import { Component, OnInit } from "@angular/core";
22

33
@Component({
4-
selector: 'app-companies',
5-
templateUrl: './companies.component.html',
6-
styleUrls: ['./companies.component.scss']
4+
selector: "app-companies",
5+
templateUrl: "./companies.component.html",
6+
styleUrls: ["./companies.component.scss"]
77
})
88
export class CompaniesComponent implements OnInit {
99
constructor() {}

‎src/app/companies/companies.module.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { NgModule } from '@angular/core';
1+
import { NgModule } from "@angular/core";
22

3-
import { CompaniesComponent } from './companies.component';
4-
import { routing } from './companies.routing';
5-
import { SharedModule } from '../shared.module';
6-
import { environment } from '../../environments/environment';
3+
import { CompaniesComponent } from "./companies.component";
4+
import { routing } from "./companies.routing";
5+
import { SharedModule } from "../shared.module";
6+
import { environment } from "../../environments/environment";
77

88
@NgModule({
99
imports: [routing, SharedModule],

‎src/app/operators/components/operator/operator.component.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@ import {
33
Input,
44
OnInit,
55
ChangeDetectionStrategy
6-
} from '@angular/core';
7-
import { OperatorDoc } from '../../../../operator-docs/operator.model';
6+
} from "@angular/core";
7+
import { OperatorDoc } from "../../../../operator-docs/operator.model";
88

99
@Component({
10-
selector: 'app-operator',
11-
templateUrl: './operator.component.html',
12-
styleUrls: ['./operator.component.scss'],
10+
selector: "app-operator",
11+
templateUrl: "./operator.component.html",
12+
styleUrls: ["./operator.component.scss"],
1313
changeDetection: ChangeDetectionStrategy.OnPush
1414
})
1515
export class OperatorComponent {
1616
@Input() operator: OperatorDoc;
1717

18-
private readonly baseSourceUrl = 'https://github.com/ReactiveX/rxjs/blob/master/src/operators/';
19-
private readonly baseSpecUrl = 'http://reactivex.io/rxjs/test-file/spec-js/operators';
18+
private readonly baseSourceUrl = "https://github.com/ReactiveX/rxjs/blob/master/src/operators/";
19+
private readonly baseSpecUrl = "http://reactivex.io/rxjs/test-file/spec-js/operators";
2020

2121
get operatorName() {
2222
return this.operator.name;
2323
}
2424

2525
get signature() {
26-
return this.operator.signature || 'Signature Placeholder';
26+
return this.operator.signature || "Signature Placeholder";
2727
}
2828

2929
get marbleUrl() {

‎src/app/operators/operators.module.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ import {
22
NgModule,
33
InjectionToken,
44
CUSTOM_ELEMENTS_SCHEMA
5-
} from '@angular/core';
6-
import { LayoutModule } from '@angular/cdk/layout';
7-
import { ClipboardModule } from 'ngx-clipboard';
5+
} from "@angular/core";
6+
import { LayoutModule } from "@angular/cdk/layout";
7+
import { ClipboardModule } from "ngx-clipboard";
88

9-
import { ALL_OPERATORS, OperatorDoc } from '../../operator-docs';
10-
import { OperatorsRoutingModule } from './operators.routing';
11-
import { OperatorsComponent, OPERATORS_TOKEN } from './operators.component';
12-
import { OperatorComponent } from './components/operator/operator.component';
13-
import { OperatorHeaderComponent } from './components/operator-header/operator-header.component';
14-
import { OperatorParametersComponent } from './components/operator-parameters/operator-parameters.component';
15-
import { OperatorExamplesComponent } from './components/operator-examples/operator-examples.component';
16-
import { RelatedOperatorsComponent } from './components/related-operators/related-operators.component';
17-
import { OperatorExtrasComponent } from './components/operator-extras/operator-extras.component';
18-
import { AdditionalResourcesComponent } from './components/additional-resources/additional-resources.component';
19-
import { MarbleDiagramComponent } from './components/marble-diagram/marble-diagram.component';
20-
import { WalkthroughComponent } from './components/walkthrough/walkthrough.component';
21-
import { HighlightJsDirective } from './directives/highlight-js.directive';
22-
import { SafeUrlPipe } from './pipes/safe-url.pipe';
23-
import { SharedModule } from '../shared.module';
9+
import { ALL_OPERATORS, OperatorDoc } from "../../operator-docs";
10+
import { OperatorsRoutingModule } from "./operators.routing";
11+
import { OperatorsComponent, OPERATORS_TOKEN } from "./operators.component";
12+
import { OperatorComponent } from "./components/operator/operator.component";
13+
import { OperatorHeaderComponent } from "./components/operator-header/operator-header.component";
14+
import { OperatorParametersComponent } from "./components/operator-parameters/operator-parameters.component";
15+
import { OperatorExamplesComponent } from "./components/operator-examples/operator-examples.component";
16+
import { RelatedOperatorsComponent } from "./components/related-operators/related-operators.component";
17+
import { OperatorExtrasComponent } from "./components/operator-extras/operator-extras.component";
18+
import { AdditionalResourcesComponent } from "./components/additional-resources/additional-resources.component";
19+
import { MarbleDiagramComponent } from "./components/marble-diagram/marble-diagram.component";
20+
import { WalkthroughComponent } from "./components/walkthrough/walkthrough.component";
21+
import { HighlightJsDirective } from "./directives/highlight-js.directive";
22+
import { SafeUrlPipe } from "./pipes/safe-url.pipe";
23+
import { SharedModule } from "../shared.module";
2424

2525
@NgModule({
2626
declarations: [

‎src/app/rxjs/rxjs.module.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { NgModule } from '@angular/core';
1+
import { NgModule } from "@angular/core";
22

3-
import { RxjsComponent } from './rxjs.component';
4-
import { routing } from './rxjs.routing';
5-
import { SharedModule } from '../shared.module';
3+
import { RxjsComponent } from "./rxjs.component";
4+
import { routing } from "./rxjs.routing";
5+
import { SharedModule } from "../shared.module";
66

77
@NgModule({
88
imports: [routing, SharedModule],

‎src/app/shared.module.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { NgModule } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
3-
import { FlexLayoutModule } from '@angular/flex-layout';
1+
import { NgModule } from "@angular/core";
2+
import { CommonModule } from "@angular/common";
3+
import { FlexLayoutModule } from "@angular/flex-layout";
44
import {
55
MatToolbarModule,
66
MatIconModule,
@@ -12,7 +12,7 @@ import {
1212
MatInputModule,
1313
MatMenuModule,
1414
MatTooltipModule
15-
} from '@angular/material';
15+
} from "@angular/material";
1616

1717
@NgModule({
1818
declarations: [],

‎src/app/team/team.module.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { NgModule } from '@angular/core';
1+
import { NgModule } from "@angular/core";
22

3-
import { TeamComponent } from './team.component';
4-
import { routing } from './team.routing';
5-
import { SharedModule } from '../shared.module';
3+
import { TeamComponent } from "./team.component";
4+
import { routing } from "./team.routing";
5+
import { SharedModule } from "../shared.module";
66

77
@NgModule({
88
imports: [routing, SharedModule],

0 commit comments

Comments
 (0)