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

Commit 2b79881

Browse files
mmalcornmmalcorn
authored
Merge pull request #357 from openforge/fix-analytics
fix: force analytics on all pages
2 parents 794f125 + e39e385 commit 2b79881

File tree

15 files changed

+93
-25
lines changed

15 files changed

+93
-25
lines changed

‎src/components.d.ts‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,6 @@ export namespace Components {
259259
interface AppServiceLevelAgreement {}
260260
interface AppServiceLevelAgreementAttributes extends StencilHTMLAttributes {}
261261

262-
interface AppServices {}
263-
interface AppServicesAttributes extends StencilHTMLAttributes {}
264-
265262
interface AppTeamLanding {
266263
'history': RouterHistory;
267264
'match': MatchResults;
@@ -310,7 +307,6 @@ declare global {
310307
'AppOpportunities': Components.AppOpportunities;
311308
'AppResources': Components.AppResources;
312309
'AppServiceLevelAgreement': Components.AppServiceLevelAgreement;
313-
'AppServices': Components.AppServices;
314310
'AppTeamLanding': Components.AppTeamLanding;
315311
'AppToolbox': Components.AppToolbox;
316312
'AppTos': Components.AppTos;
@@ -345,7 +341,6 @@ declare global {
345341
'app-opportunities': Components.AppOpportunitiesAttributes;
346342
'app-resources': Components.AppResourcesAttributes;
347343
'app-service-level-agreement': Components.AppServiceLevelAgreementAttributes;
348-
'app-services': Components.AppServicesAttributes;
349344
'app-team-landing': Components.AppTeamLandingAttributes;
350345
'app-toolbox': Components.AppToolboxAttributes;
351346
'app-tos': Components.AppTosAttributes;
@@ -515,12 +510,6 @@ declare global {
515510
new (): HTMLAppServiceLevelAgreementElement;
516511
};
517512

518-
interface HTMLAppServicesElement extends Components.AppServices, HTMLStencilElement {}
519-
var HTMLAppServicesElement: {
520-
prototype: HTMLAppServicesElement;
521-
new (): HTMLAppServicesElement;
522-
};
523-
524513
interface HTMLAppTeamLandingElement extends Components.AppTeamLanding, HTMLStencilElement {}
525514
var HTMLAppTeamLandingElement: {
526515
prototype: HTMLAppTeamLandingElement;
@@ -573,7 +562,6 @@ declare global {
573562
'app-opportunities': HTMLAppOpportunitiesElement
574563
'app-resources': HTMLAppResourcesElement
575564
'app-service-level-agreement': HTMLAppServiceLevelAgreementElement
576-
'app-services': HTMLAppServicesElement
577565
'app-team-landing': HTMLAppTeamLandingElement
578566
'app-toolbox': HTMLAppToolboxElement
579567
'app-tos': HTMLAppTosElement
@@ -608,7 +596,6 @@ declare global {
608596
'app-opportunities': HTMLAppOpportunitiesElement;
609597
'app-resources': HTMLAppResourcesElement;
610598
'app-service-level-agreement': HTMLAppServiceLevelAgreementElement;
611-
'app-services': HTMLAppServicesElement;
612599
'app-team-landing': HTMLAppTeamLandingElement;
613600
'app-toolbox': HTMLAppToolboxElement;
614601
'app-tos': HTMLAppTosElement;

‎src/pages/app-about/app-about.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Component, Prop } from '@stencil/core';
22
import { translate } from '../../services/translation.service';
33

44
declare var fbq;
5+
declare var gtag;
56

67
@Component({
78
tag: 'app-about',
@@ -197,6 +198,10 @@ export class AppAbout {
197198
];
198199

199200
componentDidLoad() {
201+
gtag('config', 'UA-118169306-1', {
202+
page_title: document.title,
203+
page_path: window.location.pathname,
204+
});
200205
// isServer is false when running in the browser
201206
// and true when being prerendered
202207
if (!this.isServer) {

‎src/pages/app-blog-index/app-blog-index.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Component, Prop, State } from '@stencil/core';
22
import { BLOG_DATA } from '../app-blog-post/prerender-blog-data';
3+
declare var gtag;
34

45
@Component({
56
tag: 'app-blog-index',
@@ -11,6 +12,11 @@ export class AppBlogIndex {
1112
@Prop({ context: 'isServer' }) private isServer;
1213

1314
componentWillLoad() {
15+
gtag('config', 'UA-118169306-1', {
16+
page_title: document.title,
17+
page_path: window.location.pathname,
18+
});
19+
1420
if (this.isServer) {
1521
this.blogData = BLOG_DATA.data;
1622
} else {

‎src/pages/app-blog-post/app-blog-post.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Component, Prop, State, Watch } from '@stencil/core';
22
import { RouterHistory, MatchResults } from '@stencil/router';
33
import { BlogPost } from '../../model/blog-post.model';
44
import { BLOG_DATA } from './prerender-blog-data';
5+
declare var gtag;
56

67
@Component({
78
tag: 'app-blog-post',
@@ -32,6 +33,11 @@ export class AppBlogPost {
3233
}
3334

3435
componentWillLoad() {
36+
gtag('config', 'UA-118169306-1', {
37+
page_title: document.title,
38+
page_path: window.location.pathname,
39+
});
40+
3541
this.getPostContent();
3642

3743
// get a bunch of blog posts and pick 3 to display in read next

‎src/pages/app-blog/app-blog.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { BlogMeta } from '../../model/blog-meta.model';
44
import { BlogCategory } from '../../model/blog-category.model';
55

66
declare var fbq;
7+
declare var gtag;
78

89
@Component({
910
tag: 'app-blog',
@@ -67,6 +68,10 @@ export class AppBlog {
6768
}
6869

6970
componentDidLoad() {
71+
gtag('config', 'UA-118169306-1', {
72+
page_title: document.title,
73+
page_path: window.location.pathname,
74+
});
7075
// isServer is false when running in the browser
7176
// and true when being prerendered
7277
if (!this.isServer) {

‎src/pages/app-case-study/app-case-study.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Component } from '@stencil/core';
2+
declare var gtag;
23

34
@Component({
45
tag: 'app-case-study',
@@ -13,6 +14,11 @@ export class AppCaseStudy {
1314
}
1415

1516
componentDidLoad() {
17+
gtag('config', 'UA-118169306-1', {
18+
page_title: document.title,
19+
page_path: window.location.pathname,
20+
});
21+
1622
document.querySelector("meta[property='og:title']").setAttribute('content', 'JuntoScope - Scoping Software | OpenForge');
1723
document
1824
.querySelector("meta[property='og:description']")

‎src/pages/app-contact/app-contact.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Component, State, Listen, Prop } from '@stencil/core';
22
import { translate } from '../../services/translation.service';
33

44
declare var fbq;
5+
declare var gtag;
56

67
@Component({
78
tag: 'app-contact',
@@ -60,6 +61,10 @@ export class AppContact {
6061
}
6162

6263
componentDidLoad() {
64+
gtag('config', 'UA-118169306-1', {
65+
page_title: document.title,
66+
page_path: window.location.pathname,
67+
});
6368
// isServer is false when running in the browser
6469
// and true when being prerendered
6570
if (!this.isServer) {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { MatchResults, RouterHistory } from '@stencil/router';
44
// import { translate } from '../../services/translation.service';
55

66
declare var fbq;
7+
declare var gtag;
78

89
@Component({
910
tag: 'app-detailed-service',
@@ -67,6 +68,10 @@ export class AppDetailedService {
6768
}
6869

6970
componentDidLoad() {
71+
gtag('config', 'UA-118169306-1', {
72+
page_title: document.title,
73+
page_path: window.location.pathname,
74+
});
7075
// isServer is false when running in the browser
7176
// and true when being prerendered
7277
if (!this.isServer) {

‎src/pages/app-home/app-home.tsx‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import $ from 'jquery';
99

1010
declare var fbq;
1111
declare var bootstrap;
12+
declare var gtag;
1213

1314
@Component({
1415
tag: 'app-home',
@@ -27,6 +28,11 @@ export class AppHome {
2728
@State() featuredIsLoading: boolean = true;
2829

2930
componentWillLoad() {
31+
gtag('config', 'UA-118169306-1', {
32+
page_title: document.title,
33+
page_path: window.location.pathname,
34+
});
35+
3036
if (!this.isServer) {
3137
this.getFeaturedPost();
3238
}
@@ -87,18 +93,18 @@ export class AppHome {
8793
this.featuredIsLoading = true;
8894
const listOptions = { page: 1, page_size: 1, exclude_body: true, tag_slug: 'featured' };
8995
this.butter.post
90-
.list(listOptions)
91-
.then(resp => {
92-
if (resp.data.data.length > 0) {
93-
this.featuredPost = resp.data.data[0];
96+
.list(listOptions)
97+
.then(resp => {
98+
if (resp.data.data.length > 0) {
99+
this.featuredPost = resp.data.data[0];
100+
this.featuredIsLoading = false;
101+
}
102+
})
103+
.catch(resp => {
104+
console.log('resp - ', resp);
105+
this.featuredIsError = true;
94106
this.featuredIsLoading = false;
95-
}
96-
})
97-
.catch(resp => {
98-
console.log('resp - ', resp);
99-
this.featuredIsError = true;
100-
this.featuredIsLoading = false;
101-
});
107+
});
102108
}
103109

104110
renderFeaturedPost(featuredPost: BlogPost, isLoading: boolean, isError: boolean) {
@@ -132,7 +138,7 @@ export class AppHome {
132138
</h2>
133139
<object data="/assets/svg/home-graphic-header.svg" class="svg-header-desktop" aria-label="header" />
134140
<object data="/assets/svg/home-graphic-header-mobile.svg" class="svg-header-mobile" aria-label="header" />
135-
</div>
141+
</div>
136142
</div>
137143
</div>
138144
</header>

‎src/pages/app-opportunities/app-opportunities.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { translate } from '../../services/translation.service';
33
import { MatchResults, RouterHistory } from '@stencil/router';
44

55
declare var fbq;
6+
declare var gtag;
67

78
@Component({
89
tag: 'app-opportunities',
@@ -184,6 +185,10 @@ export class AppOpportunities {
184185
}
185186

186187
componentDidLoad() {
188+
gtag('config', 'UA-118169306-1', {
189+
page_title: document.title,
190+
page_path: window.location.pathname,
191+
});
187192
// isServer is false when running in the browser
188193
// and true when being prerendered
189194
if (!this.isServer) {

0 commit comments

Comments
 (0)