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

Commit f85e304

Browse files
luiskcs89luiskcs89
committed
refactor: merge develop and fix conflicts
2 parents da6d64f + a81d409 commit f85e304

File tree

16 files changed

+195
-39
lines changed

16 files changed

+195
-39
lines changed

‎src/assets/i18n/en.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,11 @@ export const translations = {
448448
},
449449
},
450450

451+
notFound: {
452+
text: 'We looked everywhere, but we couldn’t find what you were searching for!',
453+
buttonText: 'Go Back',
454+
},
455+
451456
nav: {
452457
header: {
453458
img: {
@@ -463,5 +468,9 @@ export const translations = {
463468
github: 'Openforge Github account',
464469
},
465470
},
471+
472+
common: {
473+
back: 'Back',
474+
},
466475
},
467476
};

‎src/assets/svg/not-found-robot-arms.svg‎

Lines changed: 17 additions & 0 deletions
Loading

‎src/assets/svg/not-found-robot-body.svg‎

Lines changed: 29 additions & 0 deletions
Loading

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class AppBlogCard {
1010
@Prop() blogPost: BlogPost;
1111

1212
componentDidLoad() {
13-
document.querySelectorAll('meta[property="og:image"]')[0].setAttribute('content', this.blogPost.featured_image); //set opengraph metadata to match Butter CMS featured image
13+
document.querySelectorAll('meta[property="og:image"]')[0].setAttribute('content', this.blogPost.featured_image); // set opengraph metadata to match Butter CMS featured image
1414
}
1515

1616
render() {
@@ -22,7 +22,7 @@ export class AppBlogCard {
2222
<div class="col-md-12">
2323
<div class="blog-card-image">
2424
<stencil-route-link url={`/blog/${this.blogPost.slug}`}>
25-
<img src={this.blogPost.featured_image} />
25+
<img src={this.blogPost.featured_image} alt={this.blogPost.title} />
2626
</stencil-route-link>
2727
</div>
2828
<div class="blog-title">
@@ -31,7 +31,7 @@ export class AppBlogCard {
3131
</stencil-route-link>
3232
</div>
3333
<div class="author">
34-
<img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} />
34+
<img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
3535
<div>
3636
By &nbsp;
3737
{this.blogPost.author.slug === 'jedidiah-weller' ? (

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class AppBlogContent {
7979
<div>
8080
<div class="header--date">{formatDate(publishDate)}</div>
8181
<div class="header--author">
82-
<img src={this.blogPost.author.profile_image} />
82+
<img src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
8383
<div>
8484
By &nbsp;
8585
{this.blogPost.author.slug === 'jedidiah-weller' ? (
@@ -93,7 +93,7 @@ export class AppBlogContent {
9393
<div class="contact-icons-top" id="contact-icons-top">
9494
{contactIconsTop}
9595
</div>
96-
<img class="header--main-image" src={this.blogPost.featured_image} />
96+
<img class="header--main-image" src={this.blogPost.featured_image} alt={this.blogPost.title} />
9797
</div>
9898
<div class="content">
9999
<div class="row">
@@ -111,7 +111,7 @@ export class AppBlogContent {
111111
<div class="row">
112112
<div class="col-md-2 offset-md-2 blog-content-author-image">
113113
<h5>About the Author</h5>
114-
<img src={this.blogPost.author.profile_image} />
114+
<img src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
115115
</div>
116116
<div class="col-md-6 blog-content-author-text">
117117
<h5>About the Author</h5>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class AppBlogFeatured {
2828
</div>
2929
<div class="featured-image">
3030
<stencil-route-link url={`/blog/${this.blogPost.slug}`}>
31-
<img src={this.blogPost.featured_image} />
31+
<img src={this.blogPost.featured_image} alt={this.blogPost.title} />
3232
</stencil-route-link>
3333
</div>
3434
<div class="featured-post-title">
@@ -37,7 +37,7 @@ export class AppBlogFeatured {
3737
</stencil-route-link>
3838
</div>
3939
<div class="author">
40-
<img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} />
40+
<img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
4141
<div>
4242
By &nbsp;
4343
{this.blogPost.author.slug === 'jedidiah-weller' ? (

‎src/components/app-cta/app-cta.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
}
5555

5656
button {
57-
background-color: #c75300;
57+
background-color: $orange-dark;
5858
border: 0.75px solid #ffffff;
5959
border-radius: 16px;
6060
box-shadow: 0 2px 4px 0 rgba(128, 128, 128, 0.5);

‎src/components/app-cta/app-cta.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class AppCta {
2020
</p>
2121

2222
<stencil-route-link url="/contact">
23-
<button class="button">
23+
<button class="btn btn-primary">
2424
<app-translate keyword="cta.link" />
2525
</button>
2626
</stencil-route-link>

‎src/components/content-graphic/content-graphic.tsx‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export class ContentGraphic {
88
@Prop() imgUrl: string;
99
@Prop() reverse: boolean = false;
1010
@Prop() preLoadImg: boolean = false;
11+
@Prop() alt: string;
1112

1213
render() {
1314
return (
@@ -29,12 +30,7 @@ export class ContentGraphic {
2930
'text-md-right': !this.reverse,
3031
}}
3132
>
32-
<app-img
33-
class="img-fluid d-none d-md-inline"
34-
src={this.imgUrl}
35-
preLoad={this.preLoadImg}
36-
alt=""
37-
/>
33+
<app-img class="img-fluid d-none d-md-inline" src={this.imgUrl} preLoad={this.preLoadImg} alt={this.alt} />
3834
</div>
3935
<div
4036
class={{
@@ -45,12 +41,7 @@ export class ContentGraphic {
4541
}}
4642
>
4743
<slot name="header" />
48-
<app-img
49-
class="img-fluid d-xs-inline d-md-none"
50-
src={this.imgUrl}
51-
alt=""
52-
preLoad={this.preLoadImg}
53-
/>
44+
<app-img class="img-fluid d-xs-inline d-md-none" src={this.imgUrl} alt={this.alt} preLoad={this.preLoadImg} />
5445
<slot name="body" />
5546
</div>
5647
</div>

‎src/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<script type="module" src="/build/app.esm.js"></script>
3131
<script nomodule src="/build/app.js"></script>
3232

33-
<link href='/assets/fonts/Roboto.css' rel='stylesheet'>
34-
<link href="/assets/fonts/Muli.css" rel="stylesheet">
33+
<link href='/assets/fonts/Roboto.css' rel='stylesheet' rel="preload">
34+
<link href="/assets/fonts/Muli.css" rel="stylesheet" rel="preload">
3535
<!-- <link rel='stylesheet' href="/build/app.css"> Should have this; but it breaks smooth scroll -->
3636

3737
<!-- In case JavaScript is not available -->
@@ -109,13 +109,13 @@
109109
<open-forge-app></open-forge-app>
110110

111111
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
112-
crossorigin="anonymous"></script>
112+
crossorigin="anonymous" rel="preload"></script>
113113
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
114-
crossorigin="anonymous"></script>
115-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
114+
crossorigin="anonymous" rel="preload"></script>
115+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous" rel="preload"></script>
116116
<!-- Fontawesome -->
117117
<script defer src="https://use.fontawesome.com/releases/v5.0.13/js/all.js" integrity="sha384-xymdQtn1n3lH2wcu0qhcdaOpQwyoarkgLVxC/wZ5q7h9gHtxICrpcaSUfygqZGOe"
118-
crossorigin="anonymous"></script>
118+
crossorigin="anonymous" rel="preload"></script>
119119
</body>
120120

121121
</html>

0 commit comments

Comments
 (0)