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

Commit 177bb76

Browse files
sumitarorasumitarora
authored
Merge branch 'master' into feature/89-operator-debounceTime
2 parents 423b35a + c73d8a2 commit 177bb76

File tree

19 files changed

+272
-120
lines changed

19 files changed

+272
-120
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The build and test structure is fairly primitive at the moment. There are variou
3636
## Committing
3737
It is strongly recommended that when creating a commit, you follow this procedure to start the commit wizard. It will aid you on creating valid commit messages.
3838

39-
```shell
40-
git add .
41-
npm run commit
42-
```
39+
```shell
40+
git add .
41+
npm run commit
42+
```

‎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-extras/operator-extras.component.scss‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1+
.extra-tip {
2+
display: flex;
3+
}
4+
15
h3 {
2-
display: inline-block;
3-
vertical-align: middle;
4-
padding-left: 10px;
6+
display: inline-block;
7+
vertical-align: middle;
8+
padding-left: 10px;
59
}
610

711
.tip-warning {
8-
color: rgb(244, 67, 54);
12+
color: rgb(244, 67, 54);
913
}
1014

1115
.tip-info {
12-
color: rgb(33, 150, 243);
16+
color: rgb(33, 150, 243);
1317
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,18 @@ <h3 class="short-description" [innerHTML]="shortDescription"></h3>
2121
[operatorExamples]="examples" class="margin-bottom-16">
2222
</app-operator-examples>
2323
<app-operator-parameters
24-
[operatorParameters]="parameters">
24+
[operatorParameters]="parameters"
25+
*ngIf="parameters?.length">
2526
</app-operator-parameters>
2627
<app-operator-walkthrough
2728
class="margin-bottom-16"
2829
[operatorWalkthrough]="walkthrough" >
2930
</app-operator-walkthrough>
31+
<app-operator-extras
32+
class="margin-bottom-16"
33+
*ngIf="walkthroughExtras"
34+
[operatorExtras]="walkthroughExtras">
35+
</app-operator-extras>
3036
<app-related-operators
3137
[relatedOperators]="relatedOperators">
3238
</app-related-operators>

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { Component, Input, OnInit, ChangeDetectionStrategy } from '@angular/core';
1+
import {
2+
Component,
3+
Input,
4+
OnInit,
5+
ChangeDetectionStrategy
6+
} from '@angular/core';
27
import { OperatorDoc } from '../../../../operator-docs/operator.model';
38

49
@Component({
@@ -30,17 +35,26 @@ export class OperatorComponent {
3035
}
3136

3237
get shortDescription() {
33-
return this.operator.shortDescription && this.operator.shortDescription.description;
38+
return (
39+
this.operator.shortDescription &&
40+
this.operator.shortDescription.description
41+
);
3442
}
3543

3644
get shortDescriptionExtras() {
37-
return this.operator.shortDescription && this.operator.shortDescription.extras;
45+
return (
46+
this.operator.shortDescription && this.operator.shortDescription.extras
47+
);
3848
}
3949

4050
get walkthrough() {
4151
return this.operator.walkthrough && this.operator.walkthrough.description;
4252
}
4353

54+
get walkthroughExtras() {
55+
return this.operator.walkthrough && this.operator.walkthrough.extras;
56+
}
57+
4458
get parameters() {
4559
return this.operator.parameters || [];
4660
}

‎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: [

0 commit comments

Comments
 (0)