Merge pull request #5398 from negarn/negar/add_gtm_to_grid

negarn · web-flow · commit 4dfbaa5dbfb5 · 2019-04-30T15:20:30.000+08:00
negar/add_gtm_to_grid
diff --git a/scripts/config/pages.js b/scripts/config/pages.js
@@ -128,6 +128,6 @@ module.exports = [
     ['graduates',                               'landing_pages/graduate_program',                 null,        'Binary.com Graduate Program',        'NOT-en'],
     // ['hackathon',                               'landing_pages/hackathon',                     null,        'Hackathon Competition',              'NOT-en'],
     ['introducing-usb',                            'landing_pages/usb',                           null,        'Introducing USB',                    'NOT-en'],
-    ['binarygrid',                                 'landing_pages/grid_landing',                  null,        'Our New Mobile Trading App',         'NOT-en'],
+    ['binarygrid',                                 'landing_pages/binary_grid',                   null,        'Our New Mobile Trading App',         'NOT-en'],
     ['landing/signup-frame',                       'landing_pages/signup_frame',                  null,        'Sign up'],
 ];
diff --git a/src/javascript/landing_pages/binary_grid.js b/src/javascript/landing_pages/binary_grid.js
@@ -0,0 +1,3 @@
+window.onload = function () {
+    commonOnload();
+};
diff --git a/src/javascript/landing_pages/common.js b/src/javascript/landing_pages/common.js
@@ -173,6 +173,7 @@ function setupCrowdin() {
 
 function commonOnload() {
     setupCrowdin();
+    dataLayer.push({ event: 'page_load' });
 }
 
 // displays notification on outdated browsers
diff --git a/src/javascript/landing_pages/signup_frame.js b/src/javascript/landing_pages/signup_frame.js
@@ -1,8 +1,6 @@
 const error_class = 'error-field';
 
 window.onload = function () {
-    dataLayer.push({ event: 'page_load' });
-
     const el_email   = document.getElementById('email');
     const el_signup  = document.getElementById('signup');
     const el_success = document.getElementById('success');
@@ -58,6 +56,8 @@ window.onload = function () {
     if (gclid) {
         localStorage.setItem('gclid', gclid);
     }
+
+    commonOnload();
 };
 
 function validateEmail(email) {
diff --git a/src/javascript/landing_pages/usb_page.js b/src/javascript/landing_pages/usb_page.js
@@ -9,3 +9,7 @@ function collapseNavbar() {
 
 $(window).scroll(collapseNavbar);
 $(document).ready(collapseNavbar);
+
+window.onload = function () {
+    commonOnload();
+};
diff --git a/src/templates/landing_pages/_common/layout.jsx b/src/templates/landing_pages/_common/layout.jsx
@@ -1,9 +1,10 @@
-import React from 'react';
+import React                  from 'react';
 import OutdatedBrowserMessage from './outdated_browser_message.jsx';
-import Title from '../../_common/components/title.jsx';
-import AntiClickjack from '../../_common/includes/anti_clickjack.jsx';
-import Favicons from '../../_common/includes/favicons.jsx';
-import GoogleOptimizer from '../../_common/includes/google_optimizer.jsx';
+import Title                  from '../../_common/components/title.jsx';
+import AntiClickjack          from '../../_common/includes/anti_clickjack.jsx';
+import Favicons               from '../../_common/includes/favicons.jsx';
+import GoogleOptimizer        from '../../_common/includes/google_optimizer.jsx';
+import Gtm                    from '../../_common/includes/gtm.jsx';
 
 const Layout = ({
     meta_description,
@@ -38,6 +39,8 @@ const Layout = ({
         </head>
 
         <body>
+            <Gtm />
+
             {children}
 
             <OutdatedBrowserMessage />
diff --git a/src/templates/landing_pages/binary_grid.jsx b/src/templates/landing_pages/binary_grid.jsx
@@ -1,5 +1,5 @@
 /* eslint-disable react/jsx-no-target-blank */
-import React from 'react';
+import React  from 'react';
 import Layout from './_common/layout.jsx';
 
 const gridLP = () => (
@@ -13,6 +13,7 @@ const gridLP = () => (
             'https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js',
             'https://style.binary.com/binary.more.js',
             it.url_for('js/landing_pages/common.js'),
+            it.url_for('js/landing_pages/binary_grid.js'),
         ]}
     >
 
diff --git a/src/templates/landing_pages/signup_frame.jsx b/src/templates/landing_pages/signup_frame.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import GTM from '../_common/includes/gtm.jsx';
 import FormVerifyEmail from '../_common/includes/form_verify_email.jsx';
 
 const style = () =>
@@ -36,7 +35,6 @@ const SignUpFrame = () => (
     <html>
         <Head />
         <body>
-            <GTM />
             <div className='home-content'>
                 <FormVerifyEmail text='Create free account' className='secondary-bg-color' dark_button='1'>
                     <FormVerifyEmailChildren />

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+window.onload = function () {`
	`2`	`+ commonOnload();`
	`3`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ function setupCrowdin() {`
`173`	`173`
`174`	`174`	`function commonOnload() {`
`175`	`175`	`setupCrowdin();`
	`176`	`+ dataLayer.push({ event: 'page_load' });`
`176`	`177`	`}`
`177`	`178`
`178`	`179`	`// displays notification on outdated browsers`