Merge branch 'master' into iss-121

hardikpthv · hardikpthv · commit 4aea48cddbf1 · 2018-01-11T22:37:40.000+05:30
diff --git a/src/app/team/member.component.html b/src/app/team/member.component.html
@@ -6,16 +6,13 @@
       <mat-card-subtitle>{{member.role}}</mat-card-subtitle>
     </mat-card-title-group>
   </mat-card-header>
-  <mat-card-content>
-    <p>
-      {{member.bio}}
-    </p>
-  </mat-card-content>
   <mat-card-actions>
     <app-social-sharing
       [githubUrl]="member.githubUrl"
       [twitterUrl]="member.twitterUrl"
-      [linkedinUrl]="member.linkedinUrl">
+      [webpageUrl]="member.webpageUrl"
+      class="app-social-sharing"
+      >
     </app-social-sharing>
   </mat-card-actions>
 </mat-card>
diff --git a/src/app/team/member.component.scss b/src/app/team/member.component.scss
@@ -5,11 +5,15 @@
 
 .header-image {
   background-size: cover;
+  border-radius: 50%;
 }
 
-.mat-card-actions {
-  text-align: center;
-  margin-bottom: 1px;
+.mat-card-actions .app-social-sharing {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  margin-bottom: 5px;
 }
 
 .mat-card-title {
diff --git a/src/app/team/member.component.spec.ts b/src/app/team/member.component.spec.ts
@@ -27,8 +27,7 @@ describe('MemberComponent', () => {
       githubUrl: '',
       avatar: '',
       twitterUrl: '',
-      linkedinUrl: '',
-      bio: ''
+      webpageUrl: ''
     };
     fixture.detectChanges();
   });
diff --git a/src/app/team/social-sharing/social-sharing.component.html b/src/app/team/social-sharing/social-sharing.component.html
@@ -1,9 +1,9 @@
-<a *ngIf="!!githubUrl" mat-button [href]="githubUrl">
+<a *ngIf="!!githubUrl" [href]="githubUrl">
   <mat-icon class="icon-github"></mat-icon>
 </a>
-<a *ngIf="!!twitterUrl" mat-button [href]="twitterUrl">
+<a *ngIf="!!twitterUrl" [href]="twitterUrl">
   <mat-icon class="icon-twitter"></mat-icon>
 </a>
-<a *ngIf="!!linkedinUrl" mat-button [href]="linkedinUrl">
-  <mat-icon class="icon-linkedin"></mat-icon>
+<a *ngIf="!!webpageUrl" [href]="webpageUrl">
+  <mat-icon class="icon-link"></mat-icon>
 </a>
diff --git a/src/app/team/social-sharing/social-sharing.component.scss b/src/app/team/social-sharing/social-sharing.component.scss
@@ -1,6 +1,14 @@
 @import "../../../styles/colors";
 
-a.mat-button {
+.app-social-sharing {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+
+
+.app-social-sharing a {
   font-size: 25px;
 }
 
@@ -13,6 +21,6 @@ a.mat-button {
 
 }
 
-.icon-linkedin {
-  color: $icon-color-linkedin;
+.icon-link {
+  color: $icon-color-link;
 }
diff --git a/src/app/team/social-sharing/social-sharing.component.ts b/src/app/team/social-sharing/social-sharing.component.ts
@@ -8,5 +8,5 @@ import { Component, Input } from '@angular/core';
 export class SocialSharingComponent {
   @Input() githubUrl: string;
   @Input() twitterUrl: string;
-  @Input() linkedinUrl: string;
+  @Input() webpageUrl: string;
 }
diff --git a/src/app/team/team.component.html b/src/app/team/team.component.html
@@ -1,12 +1,12 @@
-<div style="background-color: white;" class="team-section">
+<div class="team-section">
     <h2>Core team</h2>
     <section class="wrapper">
       <app-member *ngFor="let member of (team$ | async).coreTeam" [member]="member">
       </app-member>
     </section>
 </div>
 
-<div style="background-color: #efefef" class="team-section">
+<div class="team-section">
     <h2>Learning team</h2>
     <section class="wrapper">
       <app-member *ngFor="let member of (team$ | async).learningTeam" [member]="member">
diff --git a/src/app/team/team.component.scss b/src/app/team/team.component.scss
@@ -1,6 +1,5 @@
 :host {
   display: block;
-  max-width: 1000px;
   margin: 0 auto;
 }
 
@@ -19,4 +18,5 @@ section.wrapper {
 div.team-section {
   box-shadow: -1px 3px 5px 0px #d6d6d6;
   margin-bottom: 3px;
+  background-color: #efefef;
 }
diff --git a/src/app/team/team.models.ts b/src/app/team/team.models.ts
@@ -9,6 +9,5 @@ export interface IMember {
   githubUrl: string;
   avatar: string;
   twitterUrl: string;
-  linkedinUrl: string;
-  bio: string;
+  webpageUrl: string;
 }
diff --git a/src/app/team/team.service.ts b/src/app/team/team.service.ts
@@ -7,97 +7,109 @@ import { ITeam, IMember } from './team.models';
 @Injectable()
 export class TeamService {
   getTeam(): Observable<ITeam> {
-    return Observable.from([{
-      coreTeam: [{
-        'name': 'Ben Lesh',
-        'role': 'Developer',
-        'githubUrl': 'https://github.com/benlesh',
-        'avatar': 'https://github.com/benlesh.png',
-        'twitterUrl': 'https://twitter.com/BenLesh',
-        'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
-        'bio':
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
-          'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
-          'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
-      }, {
-        'name': 'Ben Lesh',
-        'role': 'Developer',
-        'githubUrl': 'https://github.com/benlesh',
-        'avatar': 'https://github.com/benlesh.png',
-        'twitterUrl': 'https://twitter.com/BenLesh',
-        'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
-        'bio':
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
-          'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
-          'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
-      }, {
-        'name': 'Ben Lesh',
-        'role': 'Developer',
-        'githubUrl': 'https://github.com/benlesh',
-        'avatar': 'https://github.com/benlesh.png',
-        'twitterUrl': 'https://twitter.com/BenLesh',
-        'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
-        'bio':
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
-          'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
-          'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
-      }, {
-        'name': 'Ben Lesh',
-        'role': 'Developer',
-        'githubUrl': 'https://github.com/benlesh',
-        'avatar': 'https://github.com/benlesh.png',
-        'twitterUrl': 'https://twitter.com/BenLesh',
-        'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
-        'bio':
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
-          'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
-          'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
-      }],
-      learningTeam: [{
-        'name': 'Ben Lesh',
-        'role': 'Developer',
-        'githubUrl': 'https://github.com/benlesh',
-        'avatar': 'https://github.com/benlesh.png',
-        'twitterUrl': 'https://twitter.com/BenLesh',
-        'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
-        'bio':
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
-          'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
-          'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
-      }, {
-        'name': 'Ben Lesh',
-        'role': 'Developer',
-        'githubUrl': 'https://github.com/benlesh',
-        'avatar': 'https://github.com/benlesh.png',
-        'twitterUrl': 'https://twitter.com/BenLesh',
-        'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
-        'bio':
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
-          'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
-          'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
-      }, {
-        'name': 'Ben Lesh',
-        'role': 'Developer',
-        'githubUrl': 'https://github.com/benlesh',
-        'avatar': 'https://github.com/benlesh.png',
-        'twitterUrl': 'https://twitter.com/BenLesh',
-        'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
-        'bio':
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
-          'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
-          'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
-      }, {
-        'name': 'Ben Lesh',
-        'role': 'Developer',
-        'githubUrl': 'https://github.com/benlesh',
-        'avatar': 'https://github.com/benlesh.png',
-        'twitterUrl': 'https://twitter.com/BenLesh',
-        'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
-        'bio':
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
-          'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
-          'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
-      }]
-    }]);
+    return Observable.from([
+      {
+        coreTeam: [
+          {
+            name: 'Ben Lesh',
+            role: 'Developer',
+            githubUrl: 'https://github.com/benlesh',
+            avatar: 'https://avatars2.githubusercontent.com/u/1540597',
+            twitterUrl: 'https://twitter.com/BenLesh',
+            webpageUrl: 'http://www.benlesh.com'
+          },
+          {
+            name: 'Paul Taylor',
+            role: 'Developer',
+            githubUrl: 'https://github.com/trxcllnt',
+            avatar: 'https://avatars2.githubusercontent.com/u/178183',
+            twitterUrl: 'https://twitter.com/trxcllnt',
+            webpageUrl: 'http://graphistry.com'
+          },
+          {
+            name: 'Matthew Podwysocki',
+            role: 'Developer',
+            githubUrl: 'https://github.com/mattpodwysocki',
+            avatar: 'https://avatars0.githubusercontent.com/u/49051',
+            twitterUrl: 'https://twitter.com/mattpodwysocki',
+            webpageUrl: ''
+          },
+          {
+            name: 'OJ Kwon',
+            role: 'Developer',
+            githubUrl: 'https://github.com/kwonoj',
+            avatar: 'https://avatars1.githubusercontent.com/u/1210596',
+            twitterUrl: 'https://twitter.com/_ojkwon',
+            webpageUrl: ''
+          },
+          {
+            name: 'André Staltz',
+            role: 'Developer',
+            githubUrl: 'https://github.com/staltz',
+            avatar: 'https://avatars0.githubusercontent.com/u/90512',
+            twitterUrl: 'https://twitter.com/andrestaltz',
+            webpageUrl: 'http://staltz.com'
+          },
+          {
+            name: 'David Driscoll',
+            role: 'Developer',
+            githubUrl: 'https://github.com/david-driscoll',
+            avatar: 'https://avatars0.githubusercontent.com/u/1269157',
+            twitterUrl: 'https://twitter.com/david_dotnet',
+            webpageUrl: 'http://david-driscoll.github.io'
+          },
+          {
+            name: 'Tracy Lee',
+            role: 'Developer',
+            githubUrl: 'https://github.com/ladyleet',
+            avatar: 'https://avatars0.githubusercontent.com/u/8270563',
+            twitterUrl: 'https://twitter.com/ladyleet',
+            webpageUrl: 'http://thisdot.co'
+          }
+        ],
+        learningTeam: [
+          {
+            name: 'Tracy Lee',
+            role: 'Developer',
+            githubUrl: 'https://github.com/ladyleet',
+            avatar: 'https://avatars0.githubusercontent.com/u/8270563',
+            twitterUrl: 'https://twitter.com/ladyleet',
+            webpageUrl: 'http://thisdot.co'
+          },
+          {
+            name: 'Ashwin Sureshkumar',
+            role: 'Developer',
+            githubUrl: 'https://github.com/ashwin-sureshkumar',
+            avatar: 'https://avatars0.githubusercontent.com/u/4744080',
+            twitterUrl: 'https://twitter.com/Sureshkumar_Ash',
+            webpageUrl: 'https://t.co/XduklnxpK3'
+          },
+          {
+            name: 'Brian Troncone',
+            role: 'Developer',
+            githubUrl: 'https://github.com/btroncone',
+            avatar: 'https://avatars3.githubusercontent.com/u/5085101',
+            twitterUrl: 'http://twitter.com/btroncone',
+            webpageUrl: ''
+          },
+          {
+            name: 'Sumit Arora',
+            role: 'Developer',
+            githubUrl: 'https://github.com/sumitarora',
+            avatar: 'https://avatars3.githubusercontent.com/u/198247',
+            twitterUrl: 'https://twitter.com/arorasumit',
+            webpageUrl: 'http://www.arorasumit.com/'
+          },
+          {
+            name: 'Jen Luker',
+            role: 'Developer, A11y',
+            githubUrl: 'https://github.com/knittingcodemonkey',
+            avatar: 'https://avatars0.githubusercontent.com/u/1584489',
+            twitterUrl: 'https://twitter.com/knitcodemonkey',
+            webpageUrl: 'http://jenluker.com'
+          }
+        ]
+      }
+    ]);
   }
 }
diff --git a/src/assets/fonts/icomoon.woff b/src/assets/fonts/icomoon.woff
diff --git a/src/operator-docs/combination/pairwise.ts b/src/operator-docs/combination/pairwise.ts
@@ -1,6 +1,51 @@
 import { OperatorDoc } from '../operator.model';
 
 export const pairwise: OperatorDoc = {
-  'name': 'pairwise',
-  'operatorType': 'combination'
+  name: 'pairwise',
+  operatorType: 'combination',
+  marbleUrl: 'http://reactivex.io/rxjs/img/pairwise.png',
+  signature: 'public pairwise(): Observable<Array<T>>',
+  shortDescription: {
+    description:
+      'Groups pairs of consecutive emissions together and emits them as an array of two values.',
+    extras: [
+      {
+        type: 'Tip',
+        text:
+          'Puts the current value and previous value together as an array, and emits that.'
+      }
+    ]
+  },
+  walkthrough: {
+    description: `
+      <p>The Nth emission from the source Observable will cause the output Observable
+      to emit an array [(N-1)th, Nth] of the previous and the current value, as a
+      pair. For this reason, <code>pairwise</code> emits on the second and subsequent
+      emissions from the source Observable, but not on the first emission, because
+      there is no previous value in that case.</p>
+    `
+  },
+  examples: [
+    {
+      name:
+        'On every click (starting from the second), emit the relative distance to the previous click',
+      code: `
+      const clicks = Rx.Observable.fromEvent(document, 'click');
+      const pairs = clicks.pairwise();
+      const distance = pairs.map(pair => {
+        const x0 = pair[0].clientX;
+        const y0 = pair[0].clientY;
+        const x1 = pair[1].clientX;
+        const y1 = pair[1].clientY;
+        return Math.sqrt(Math.pow(x0 - x1, 2) + Math.pow(y0 - y1, 2));
+      });
+      distance.subscribe(x => console.log(x));
+    `,
+      externalLink: {
+        platform: 'JSBin',
+        url: 'http://jsbin.com/wenazagegu/embed?js,console,output'
+      }
+    }
+  ],
+  relatedOperators: ['buffer', 'bufferCount']
 };
diff --git a/src/styles/_colors.scss b/src/styles/_colors.scss
@@ -1,3 +1,3 @@
 $icon-color-github: #6f066f;
 $icon-color-twitter: #4073d4;
-$icon-color-linkedin: #3D7CA4;
+$icon-color-link: #d81b60;
diff --git a/src/styles/_icons.scss b/src/styles/_icons.scss

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ import { Component, Input } from '@angular/core';`
`8`	`8`	`export class SocialSharingComponent {`
`9`	`9`	`@Input() githubUrl: string;`
`10`	`10`	`@Input() twitterUrl: string;`
`11`		`- @Input() linkedinUrl: string;`
	`11`	`+ @Input() webpageUrl: string;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`:host {`
`2`	`2`	`display: block;`
`3`		`- max-width: 1000px;`
`4`	`3`	`margin: 0 auto;`
`5`	`4`	`}`
`6`	`5`
`@@ -19,4 +18,5 @@ section.wrapper {`
`19`	`18`	`div.team-section {`
`20`	`19`	`box-shadow: -1px 3px 5px 0px #d6d6d6;`
`21`	`20`	`margin-bottom: 3px;`
	`21`	`+ background-color: #efefef;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,5 @@ export interface IMember {`
`9`	`9`	`githubUrl: string;`
`10`	`10`	`avatar: string;`
`11`	`11`	`twitterUrl: string;`
`12`		`- linkedinUrl: string;`
`13`		`- bio: string;`
	`12`	`+ webpageUrl: string;`
`14`	`13`	`}`