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

Commit 89037d7

Browse files
hardikpthvhardikpthv
committed
Merge branch 'master' into iss-124
2 parents 43eee33 + 46fd777 commit 89037d7

17 files changed

+404
-129
lines changed

‎src/app/team/member.component.html

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@
66
<mat-card-subtitle>{{member.role}}</mat-card-subtitle>
77
</mat-card-title-group>
88
</mat-card-header>
9-
<mat-card-content>
10-
<p>
11-
{{member.bio}}
12-
</p>
13-
</mat-card-content>
149
<mat-card-actions>
1510
<app-social-sharing
1611
[githubUrl]="member.githubUrl"
1712
[twitterUrl]="member.twitterUrl"
18-
[linkedinUrl]="member.linkedinUrl">
13+
[webpageUrl]="member.webpageUrl"
14+
class="app-social-sharing"
15+
>
1916
</app-social-sharing>
2017
</mat-card-actions>
2118
</mat-card>

‎src/app/team/member.component.scss

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55

66
.header-image {
77
background-size: cover;
8+
border-radius: 50%;
89
}
910

10-
.mat-card-actions {
11-
text-align: center;
12-
margin-bottom: 1px;
11+
.mat-card-actions .app-social-sharing {
12+
width: 100%;
13+
display: flex;
14+
flex-direction: row;
15+
justify-content: space-around;
16+
margin-bottom: 5px;
1317
}
1418

1519
.mat-card-title {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ describe('MemberComponent', () => {
2727
githubUrl: '',
2828
avatar: '',
2929
twitterUrl: '',
30-
linkedinUrl: '',
31-
bio: ''
30+
webpageUrl: ''
3231
};
3332
fixture.detectChanges();
3433
});

‎src/app/team/social-sharing/social-sharing.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<a *ngIf="!!githubUrl" mat-button [href]="githubUrl">
1+
<a *ngIf="!!githubUrl" [href]="githubUrl">
22
<mat-icon class="icon-github"></mat-icon>
33
</a>
4-
<a *ngIf="!!twitterUrl" mat-button [href]="twitterUrl">
4+
<a *ngIf="!!twitterUrl" [href]="twitterUrl">
55
<mat-icon class="icon-twitter"></mat-icon>
66
</a>
7-
<a *ngIf="!!linkedinUrl" mat-button [href]="linkedinUrl">
8-
<mat-icon class="icon-linkedin"></mat-icon>
7+
<a *ngIf="!!webpageUrl" [href]="webpageUrl">
8+
<mat-icon class="icon-link"></mat-icon>
99
</a>

‎src/app/team/social-sharing/social-sharing.component.scss

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
@import "../../../styles/colors";
22

3-
a.mat-button {
3+
.app-social-sharing {
4+
width: 100%;
5+
display: flex;
6+
flex-direction: row;
7+
justify-content: space-between;
8+
}
9+
10+
11+
.app-social-sharing a {
412
font-size: 25px;
513
}
614

@@ -13,6 +21,6 @@ a.mat-button {
1321

1422
}
1523

16-
.icon-linkedin {
17-
color: $icon-color-linkedin;
24+
.icon-link {
25+
color: $icon-color-link;
1826
}

‎src/app/team/social-sharing/social-sharing.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ import { Component, Input } from '@angular/core';
88
export class SocialSharingComponent {
99
@Input() githubUrl: string;
1010
@Input() twitterUrl: string;
11-
@Input() linkedinUrl: string;
11+
@Input() webpageUrl: string;
1212
}

‎src/app/team/team.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<div style="background-color: white;" class="team-section">
1+
<div class="team-section">
22
<h2>Core team</h2>
33
<section class="wrapper">
44
<app-member *ngFor="let member of (team$ | async).coreTeam" [member]="member">
55
</app-member>
66
</section>
77
</div>
88

9-
<div style="background-color: #efefef" class="team-section">
9+
<div class="team-section">
1010
<h2>Learning team</h2>
1111
<section class="wrapper">
1212
<app-member *ngFor="let member of (team$ | async).learningTeam" [member]="member">

‎src/app/team/team.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
:host {
22
display: block;
3-
max-width: 1000px;
43
margin: 0 auto;
54
}
65

@@ -19,4 +18,5 @@ section.wrapper {
1918
div.team-section {
2019
box-shadow: -1px 3px 5px 0px #d6d6d6;
2120
margin-bottom: 3px;
21+
background-color: #efefef;
2222
}

‎src/app/team/team.models.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ export interface IMember {
99
githubUrl: string;
1010
avatar: string;
1111
twitterUrl: string;
12-
linkedinUrl: string;
13-
bio: string;
12+
webpageUrl: string;
1413
}

‎src/app/team/team.service.ts

Lines changed: 104 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -7,97 +7,109 @@ import { ITeam, IMember } from './team.models';
77
@Injectable()
88
export class TeamService {
99
getTeam(): Observable<ITeam> {
10-
return Observable.from([{
11-
coreTeam: [{
12-
'name': 'Ben Lesh',
13-
'role': 'Developer',
14-
'githubUrl': 'https://github.com/benlesh',
15-
'avatar': 'https://github.com/benlesh.png',
16-
'twitterUrl': 'https://twitter.com/BenLesh',
17-
'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
18-
'bio':
19-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
20-
'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
21-
'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
22-
}, {
23-
'name': 'Ben Lesh',
24-
'role': 'Developer',
25-
'githubUrl': 'https://github.com/benlesh',
26-
'avatar': 'https://github.com/benlesh.png',
27-
'twitterUrl': 'https://twitter.com/BenLesh',
28-
'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
29-
'bio':
30-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
31-
'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
32-
'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
33-
}, {
34-
'name': 'Ben Lesh',
35-
'role': 'Developer',
36-
'githubUrl': 'https://github.com/benlesh',
37-
'avatar': 'https://github.com/benlesh.png',
38-
'twitterUrl': 'https://twitter.com/BenLesh',
39-
'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
40-
'bio':
41-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
42-
'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
43-
'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
44-
}, {
45-
'name': 'Ben Lesh',
46-
'role': 'Developer',
47-
'githubUrl': 'https://github.com/benlesh',
48-
'avatar': 'https://github.com/benlesh.png',
49-
'twitterUrl': 'https://twitter.com/BenLesh',
50-
'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
51-
'bio':
52-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
53-
'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
54-
'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
55-
}],
56-
learningTeam: [{
57-
'name': 'Ben Lesh',
58-
'role': 'Developer',
59-
'githubUrl': 'https://github.com/benlesh',
60-
'avatar': 'https://github.com/benlesh.png',
61-
'twitterUrl': 'https://twitter.com/BenLesh',
62-
'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
63-
'bio':
64-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
65-
'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
66-
'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
67-
}, {
68-
'name': 'Ben Lesh',
69-
'role': 'Developer',
70-
'githubUrl': 'https://github.com/benlesh',
71-
'avatar': 'https://github.com/benlesh.png',
72-
'twitterUrl': 'https://twitter.com/BenLesh',
73-
'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
74-
'bio':
75-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
76-
'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
77-
'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
78-
}, {
79-
'name': 'Ben Lesh',
80-
'role': 'Developer',
81-
'githubUrl': 'https://github.com/benlesh',
82-
'avatar': 'https://github.com/benlesh.png',
83-
'twitterUrl': 'https://twitter.com/BenLesh',
84-
'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
85-
'bio':
86-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
87-
'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
88-
'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
89-
}, {
90-
'name': 'Ben Lesh',
91-
'role': 'Developer',
92-
'githubUrl': 'https://github.com/benlesh',
93-
'avatar': 'https://github.com/benlesh.png',
94-
'twitterUrl': 'https://twitter.com/BenLesh',
95-
'linkedinUrl': 'https://www.linkedin.com/in/blesh/',
96-
'bio':
97-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' +
98-
'Sed est odio, sodales et tellus a, semper pellentesque elit. ' +
99-
'Mauris purus dui, dignissim nec sodales ut, feugiat et purus.'
100-
}]
101-
}]);
10+
return Observable.from([
11+
{
12+
coreTeam: [
13+
{
14+
name: 'Ben Lesh',
15+
role: 'Developer',
16+
githubUrl: 'https://github.com/benlesh',
17+
avatar: 'https://avatars2.githubusercontent.com/u/1540597',
18+
twitterUrl: 'https://twitter.com/BenLesh',
19+
webpageUrl: 'http://www.benlesh.com'
20+
},
21+
{
22+
name: 'Paul Taylor',
23+
role: 'Developer',
24+
githubUrl: 'https://github.com/trxcllnt',
25+
avatar: 'https://avatars2.githubusercontent.com/u/178183',
26+
twitterUrl: 'https://twitter.com/trxcllnt',
27+
webpageUrl: 'http://graphistry.com'
28+
},
29+
{
30+
name: 'Matthew Podwysocki',
31+
role: 'Developer',
32+
githubUrl: 'https://github.com/mattpodwysocki',
33+
avatar: 'https://avatars0.githubusercontent.com/u/49051',
34+
twitterUrl: 'https://twitter.com/mattpodwysocki',
35+
webpageUrl: ''
36+
},
37+
{
38+
name: 'OJ Kwon',
39+
role: 'Developer',
40+
githubUrl: 'https://github.com/kwonoj',
41+
avatar: 'https://avatars1.githubusercontent.com/u/1210596',
42+
twitterUrl: 'https://twitter.com/_ojkwon',
43+
webpageUrl: ''
44+
},
45+
{
46+
name: 'André Staltz',
47+
role: 'Developer',
48+
githubUrl: 'https://github.com/staltz',
49+
avatar: 'https://avatars0.githubusercontent.com/u/90512',
50+
twitterUrl: 'https://twitter.com/andrestaltz',
51+
webpageUrl: 'http://staltz.com'
52+
},
53+
{
54+
name: 'David Driscoll',
55+
role: 'Developer',
56+
githubUrl: 'https://github.com/david-driscoll',
57+
avatar: 'https://avatars0.githubusercontent.com/u/1269157',
58+
twitterUrl: 'https://twitter.com/david_dotnet',
59+
webpageUrl: 'http://david-driscoll.github.io'
60+
},
61+
{
62+
name: 'Tracy Lee',
63+
role: 'Developer',
64+
githubUrl: 'https://github.com/ladyleet',
65+
avatar: 'https://avatars0.githubusercontent.com/u/8270563',
66+
twitterUrl: 'https://twitter.com/ladyleet',
67+
webpageUrl: 'http://thisdot.co'
68+
}
69+
],
70+
learningTeam: [
71+
{
72+
name: 'Tracy Lee',
73+
role: 'Developer',
74+
githubUrl: 'https://github.com/ladyleet',
75+
avatar: 'https://avatars0.githubusercontent.com/u/8270563',
76+
twitterUrl: 'https://twitter.com/ladyleet',
77+
webpageUrl: 'http://thisdot.co'
78+
},
79+
{
80+
name: 'Ashwin Sureshkumar',
81+
role: 'Developer',
82+
githubUrl: 'https://github.com/ashwin-sureshkumar',
83+
avatar: 'https://avatars0.githubusercontent.com/u/4744080',
84+
twitterUrl: 'https://twitter.com/Sureshkumar_Ash',
85+
webpageUrl: 'https://t.co/XduklnxpK3'
86+
},
87+
{
88+
name: 'Brian Troncone',
89+
role: 'Developer',
90+
githubUrl: 'https://github.com/btroncone',
91+
avatar: 'https://avatars3.githubusercontent.com/u/5085101',
92+
twitterUrl: 'http://twitter.com/btroncone',
93+
webpageUrl: ''
94+
},
95+
{
96+
name: 'Sumit Arora',
97+
role: 'Developer',
98+
githubUrl: 'https://github.com/sumitarora',
99+
avatar: 'https://avatars3.githubusercontent.com/u/198247',
100+
twitterUrl: 'https://twitter.com/arorasumit',
101+
webpageUrl: 'http://www.arorasumit.com/'
102+
},
103+
{
104+
name: 'Jen Luker',
105+
role: 'Developer, A11y',
106+
githubUrl: 'https://github.com/knittingcodemonkey',
107+
avatar: 'https://avatars0.githubusercontent.com/u/1584489',
108+
twitterUrl: 'https://twitter.com/knitcodemonkey',
109+
webpageUrl: 'http://jenluker.com'
110+
}
111+
]
112+
}
113+
]);
102114
}
103115
}

0 commit comments

Comments
 (0)