Skip to content
This repository was archived by the owner on Feb 5, 2022. It is now read-only.

Commit 25f5e54

Browse files
WholloranWholloran
authored
Merge pull request #488 from openforge/feat/matt-photo
Feat/matt photo
2 parents 8b0b74a + 54c7560 commit 25f5e54

File tree

2 files changed

+77
-59
lines changed

2 files changed

+77
-59
lines changed

‎src/components/app-members-section/app-members-section.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ export class AppMembersSection {
130130
github: '',
131131
url: '/about/harry-scheuerle',
132132
},
133-
// {
134-
// name: 'Matt Moran',
135-
// image: './../../assets/headshot-matt.png',
136-
// title: translate('about.team.member.title.developer'),
137-
// mail: 'matt@openforge.io',
138-
// twitter: '',
139-
// github: '',
140-
// // url: '/about/matt-moran',
141-
// },
133+
{
134+
name: 'Matt Moran',
135+
image: './../../assets/headshot-matt.png',
136+
title: translate('about.team.member.title.developer'),
137+
mail: 'matt@openforge.io',
138+
twitter: '',
139+
github: '',
140+
url: '/about/matt-moran',
141+
},
142142
{
143143
name: 'Carter Simonson',
144144
image: './../../assets/headshot-carter.png',

‎src/pages/app-team-landing/app-team-landing.tsx‎

Lines changed: 68 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,24 @@ export class AppTeamLanding {
386386
image: 'https://openforge.io/assets/headshot-carniel.png',
387387
},
388388
},
389+
'matt-moran': {
390+
firstname: 'Matt',
391+
surname: 'Moran',
392+
title: translate('about.team.member.title.developer'),
393+
headerText:
394+
"Matt joined OpenForge in 2019 as a member of the development team. A self-taught developer with experience working for large institutions, he has one foot in modern web development, and one in the growing Microsoft ecosystem. Matt is also a strong advocate for Computer Science education, having taught programming to over 1000 students and contributed to graduate-level CS curriculum at the University of Pennsylvania. Alongside his work with OpenForge, Matt continues to tutor programming while fostering dogs at his house in Georgia.",
395+
bodyText: 'In addition to developing applications, Matt has worked for OpenForge as a database expert, software architect, DevOps specialist, and project lead. With specialties in backend development, database design, and enterprise systems, he focuses on product security, stability, and integrity. He draws upon his continually expanding base of development practices to help customers find solutions for their needs.',
396+
skills: ['Angular', 'NGRX', 'Cordova', 'Node', 'SQL Server', ' C#', 'ASP.NET', 'Universal Windows Platform', 'Visual Studio', 'IIS', 'Azure', 'Serverless', 'DevOps', 'Git'],
397+
team: 'development',
398+
headshotPhoto: '/assets/headshot-matt.png',
399+
metatags: {
400+
title: 'Matt Moran - Software Engineer | OpenForge',
401+
description: 'In addition to developing applications, Matt has worked for OpenForge as a database expert, software architect, DevOps specialist, and project lead. With specialties in backend development, database design, and enterprise systems, he focuses on product security, stability, and integrity. He draws upon his continually expanding base of development practices to help customers find solutions for their needs.',
402+
keywords: 'Matt Moran',
403+
url: 'https://openforge.io/about/matt-moran/',
404+
image: 'https://openforge.io/assets/headshot-matt.png',
405+
},
406+
}
389407
};
390408

391409
@Watch('match')
@@ -446,11 +464,11 @@ export class AppTeamLanding {
446464
if (window.innerWidth > 767.98) {
447465
style = this.backgroundPhoto
448466
? {
449-
'background-image': `linear-gradient(90deg, #000000 20%, rgba(255, 255, 255, 0) 70%), url(${this.backgroundPhoto})`,
450-
}
467+
'background-image': `linear-gradient(90deg, #000000 20%, rgba(255, 255, 255, 0) 70%), url(${this.backgroundPhoto})`,
468+
}
451469
: {
452-
'background-color': '#292A2D',
453-
};
470+
'background-color': '#292A2D',
471+
};
454472
}
455473
window.addEventListener('resize', this.updateBackground);
456474

@@ -459,63 +477,63 @@ export class AppTeamLanding {
459477
{/* header - hero */}
460478
{this.data[this.match.params.member]
461479
? [
462-
<div class="container-fluid">
463-
<div class="row justify-content-center align-items-center hero" style={style}>
464-
<div class="col-10 col-sm-12 d-block d-md-none">
465-
<app-img class="headshot-mobile" src={this.headshotPhoto} />
466-
</div>
467-
<div class="col-11 col-sm-9 col-md-7 col-lg-6 align-self-start">
468-
<div class="header-text">
469-
<h1>{`${this.data[this.match.params.member].firstname} ${this.data[this.match.params.member].surname}`}</h1>
470-
<h3>{this.data[this.match.params.member].title}</h3>
471-
<app-img
472-
class="d-md-none badge"
473-
src={`/assets/team-landing-graphic-${this.data[this.match.params.member].team}-badge.png`}
474-
alt="Job Title Badge - Design, Development, Management"
475-
/>
476-
<p>{this.data[this.match.params.member].headerText}</p>
477-
</div>
478-
</div>
479-
<div class="col-md-4 d-none d-md-block">{!this.backgroundPhoto && <app-img class="headshot" src={this.headshotPhoto} />}</div>
480+
<div class="container-fluid">
481+
<div class="row justify-content-center align-items-center hero" style={style}>
482+
<div class="col-10 col-sm-12 d-block d-md-none">
483+
<app-img class="headshot-mobile" src={this.headshotPhoto} />
480484
</div>
481-
482-
<div class="row align-items-center justify-content-center bio">
483-
<div class="col-9 col-sm-9 col-md-5 col-lg-4">
485+
<div class="col-11 col-sm-9 col-md-7 col-lg-6 align-self-start">
486+
<div class="header-text">
487+
<h1>{`${this.data[this.match.params.member].firstname} ${this.data[this.match.params.member].surname}`}</h1>
488+
<h3>{this.data[this.match.params.member].title}</h3>
484489
<app-img
485-
class="d-none d-md-block badge"
490+
class="d-md-none badge"
486491
src={`/assets/team-landing-graphic-${this.data[this.match.params.member].team}-badge.png`}
487492
alt="Job Title Badge - Design, Development, Management"
488493
/>
494+
<p>{this.data[this.match.params.member].headerText}</p>
489495
</div>
490-
<div class="col-11 col-sm-9 col-md-7 col-lg-5">
491-
<h2>
492-
<app-translate keyword="about.landing.container.title1" />
493-
&nbsp;{this.data[this.match.params.member].firstname}&nbsp;
496+
</div>
497+
<div class="col-md-4 d-none d-md-block">{!this.backgroundPhoto && <app-img class="headshot" src={this.headshotPhoto} />}</div>
498+
</div>
499+
500+
<div class="row align-items-center justify-content-center bio">
501+
<div class="col-9 col-sm-9 col-md-5 col-lg-4">
502+
<app-img
503+
class="d-none d-md-block badge"
504+
src={`/assets/team-landing-graphic-${this.data[this.match.params.member].team}-badge.png`}
505+
alt="Job Title Badge - Design, Development, Management"
506+
/>
507+
</div>
508+
<div class="col-11 col-sm-9 col-md-7 col-lg-5">
509+
<h2>
510+
<app-translate keyword="about.landing.container.title1" />
511+
&nbsp;{this.data[this.match.params.member].firstname}&nbsp;
494512
<app-translate keyword="about.landing.container.title2" />
495-
</h2>
496-
<p>{this.data[this.match.params.member].bodyText}</p>
497-
<h4>
498-
<app-translate keyword="about.landing.container.skills" />
499-
</h4>
500-
<div class="chips-container">
501-
{this.data[this.match.params.member].skills.map(skill => {
502-
return <label class="skill-chip">{skill}</label>;
503-
})}
504-
</div>
513+
</h2>
514+
<p>{this.data[this.match.params.member].bodyText}</p>
515+
<h4>
516+
<app-translate keyword="about.landing.container.skills" />
517+
</h4>
518+
<div class="chips-container">
519+
{this.data[this.match.params.member].skills.map(skill => {
520+
return <label class="skill-chip">{skill}</label>;
521+
})}
505522
</div>
506523
</div>
524+
</div>
507525

508-
<div id="members" class="row justify-content-center members">
509-
<div class="col-10 col-lg-10">
510-
<h2>
511-
<app-translate keyword="about.landing.cta.title" />
512-
</h2>
513-
<app-members-section />
514-
</div>
526+
<div id="members" class="row justify-content-center members">
527+
<div class="col-10 col-lg-10">
528+
<h2>
529+
<app-translate keyword="about.landing.cta.title" />
530+
</h2>
531+
<app-members-section />
515532
</div>
516-
</div>,
517-
<app-footer />,
518-
]
533+
</div>
534+
</div>,
535+
<app-footer />,
536+
]
519537
: null}
520538
</section>
521539
);

0 commit comments

Comments
 (0)