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

Commit 8583eeb

Browse files
WholloranWholloran
authored
Merge pull request #387 from openforge/2.3.2-to-master
Push 2.3.2 to master
2 parents afc7c5a + 348861d commit 8583eeb

File tree

12 files changed

+83
-22
lines changed

12 files changed

+83
-22
lines changed

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@openforge/main-website",
33
"private": true,
4-
"version": "2.3.1",
4+
"version": "2.3.2",
55
"description": "The official website for OpenForge",
66
"files": [
77
"dist/"

‎src/assets/i18n/en.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ export const translations = {
267267
juntoscope: {
268268
title: 'JuntoScope',
269269
description:
270-
'Juntoscope helps teams determine scopes for tasks in Teamwork.com:copyright: Projects with a seamless integration providing fast, efficient, and accurate scoping to keep projects within budget and on-time.',
270+
'Juntoscope helps teams determine scopes for tasks in Teamwork.com© Projects with a seamless integration providing fast, efficient, and accurate scoping to keep projects within budget and on-time.',
271271
},
272272
voyage: {
273273
title: 'The Voyage',

‎src/components/app-blog-card/app-blog-card.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ export class AppBlogCard {
3434
<img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} />
3535
<div>
3636
By &nbsp;
37-
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>
37+
{this.blogPost.author.slug === 'jedidiah-weller' ? (
38+
<a href="http://www.twitter.com/jedihacks" target="_blank" rel="noopener">{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</a>
39+
) : (
40+
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>
41+
)}
3842
&nbsp; on {formatDate(publishDate)}
3943
</div>
4044
</div>

‎src/components/app-blog-content/app-blog-content.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ export class AppBlogContent {
8282
<img src={this.blogPost.author.profile_image} />
8383
<div>
8484
By &nbsp;
85-
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>
85+
{this.blogPost.author.slug === 'jedidiah-weller' ? (
86+
<a href="http://www.twitter.com/jedihacks" target="_blank" rel="noopener">{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</a>
87+
) : (
88+
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>
89+
)}
8690
</div>
8791
</div>
8892
</div>

‎src/components/app-blog-featured/app-blog-featured.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ export class AppBlogFeatured {
4242
<img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} />
4343
<div>
4444
By &nbsp;
45-
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>
45+
{this.blogPost.author.slug === 'jedidiah-weller' ? (
46+
<a href="http://www.twitter.com/jedihacks" target="_blank" rel="noopener">{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</a>
47+
) : (
48+
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>
49+
)}
4650
&nbsp; on {formatDate(publishDate)}
4751
</div>
4852
</div>

‎src/pages/app-detailed-service/app-detailed-service.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@
109109
a {
110110
margin: 0 10px;
111111
}
112+
113+
.spacer {
114+
height: 35px;
115+
}
112116
}
113117

114118
.information {

‎src/pages/app-detailed-service/app-detailed-service.tsx‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,10 @@ export class AppDetailedService {
235235
<img src="/assets/apps/juntoscope/graphic-example-2.png" class="front-center" alt="juntoscope app screenshot" />
236236
</div>
237237
<div class="store-buttons">
238-
<a href="https://itunes.apple.com/us/app/the-voyage-by-new-ocean-health/id779637437?mt=8" target="_blank" rel="noopener">
238+
<a href="https://apps.apple.com/us/app/juntoscope/id1421846154?mt=8" target="_blank" rel="noopener">
239239
<img src="/assets/graphic-apple-appstore.png" alt="download on app store" />
240240
</a>
241-
<a href="https://play.google.com/store/apps/details?id=com.carecaminnovations.mobile" target="_blank" rel="noopener">
241+
<a href="https://play.google.com/store/apps/details?id=com.openforge.juntoscope" target="_blank" rel="noopener">
242242
<img src="/assets/graphic-google-googleplaystore.png" alt="download on play store" />
243243
</a>
244244
</div>
@@ -306,12 +306,7 @@ export class AppDetailedService {
306306
<img src="/assets/apps/startupwars/graphic-example-2.png" class="front-center" alt="startup wars app screenshot" />
307307
</div>
308308
<div class="store-buttons">
309-
<a>
310-
<img src="/assets/graphic-apple-appstore.png" alt="download on app store" />
311-
</a>
312-
<a>
313-
<img src="/assets/graphic-google-googleplaystore.png" alt="download on play store" />
314-
</a>
309+
<div class="spacer" />
315310
</div>
316311
<div class="information">
317312
<h3>
@@ -329,10 +324,10 @@ export class AppDetailedService {
329324
<img src="/assets/apps/digithermo/graphic-example-2.png" class="front-center" alt="digithermo wars app screenshot" />
330325
</div>
331326
<div class="store-buttons">
332-
<a>
327+
<a href="https://apps.apple.com/app/digi-thermo/id1307130445" target="_blank" rel="noopener">
333328
<img src="/assets/graphic-apple-appstore.png" alt="download on app store" />
334329
</a>
335-
<a>
330+
<a href="https://play.google.com/store/apps/details?id=com.webjuntollc.digithermoapp" target="_blank" rel="noopener">
336331
<img src="/assets/graphic-google-googleplaystore.png" alt="download on play store" />
337332
</a>
338333
</div>

‎src/pages/open-forge-app/open-forge-app.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export class OpenForgeApp {
7575
}
7676

7777
listenForNewServiceWorker = window.addEventListener('load', () => {
78-
navigator.serviceWorker.register('/sw.js').then(registration => {
78+
navigator.serviceWorker.register('./sw.js').then(registration => {
7979
// Track updates to the Service Worker
8080
if (!navigator.serviceWorker.controller) {
8181
// The window client isn't currently controlled so it's a new service worker that will activate immediately

‎sw.js‎ renamed to ‎src/sw.js‎

File renamed without changes.

0 commit comments

Comments
 (0)