pass in url and remove gtm

Author: negarn

src/javascript/app/base/binary_loader.js

@@ -15,7 +15,7 @@ const localize            = require('../../_common/localize').localize;
 const ScrollToAnchor      = require('../../_common/scroll_to_anchor');
 const isStorageSupported  = require('../../_common/storage').isStorageSupported;
 const ThirdPartyLinks     = require('../../_common/third_party_links');
-const urlFor              = require('../../_common/url').urlFor;
+const Url                 = require('../../_common/url');
 const createElement       = require('../../_common/utility').createElement;
 
 const BinaryLoader = (() => {
@@ -74,7 +74,8 @@ const BinaryLoader = (() => {
         ContentVisibility.init();
 
         BinarySocket.wait('authorize', 'website_status', 'landing_company').then(() => {
-            GTM.pushDataLayer({ event: 'page_load' }); // we need website_status.clients_country
+            const url_params = Url.paramsHash().referrer;
+            GTM.pushDataLayer({ event: 'page_load', ...(url_params && { referrer: url_params }) }); // we need website_status.clients_country
 
             // first time load.
             const last_image = $('#content img').last();
@@ -92,7 +93,7 @@ const BinaryLoader = (() => {
     };
 
     const error_messages = {
-        login            : () => localize('Please [_1]log in[_2] or [_3]sign up[_4] to view this page.', [`<a href="${'javascript:;'}">`, '</a>', `<a href="${urlFor('new-account')}">`, '</a>']),
+        login            : () => localize('Please [_1]log in[_2] or [_3]sign up[_4] to view this page.', [`<a href="${'javascript:;'}">`, '</a>', `<a href="${Url.urlFor('new-account')}">`, '</a>']),
         only_virtual     : () => localize('Sorry, this feature is available to virtual accounts only.'),
         only_real        : () => localize('This feature is not relevant to virtual-money accounts.'),
         not_authenticated: () => localize('This page is only available to logged out clients.'),

src/javascript/app_2/App/Components/Routes/route-with-sub-routes.jsx

@@ -4,6 +4,7 @@ import {
     Route }                from 'react-router-dom';
 import { redirectToLogin } from '_common/base/login';
 import BinarySocket        from '_common/base/socket_base';
+import Url                 from '_common/url';
 import routes              from 'Constants/routes';
 import GTM                 from 'Utils/gtm';
 import LoginPrompt         from '../Elements/login-prompt.jsx';
@@ -33,7 +34,8 @@ const RouteWithSubRoutes = route => {
         const title = route.title ? `${route.title} | ` : '';
         document.title = `${ title }${ default_title }`;
         BinarySocket.wait('website_status').then(() => {
-            GTM.pushDataLayer({ event: 'page_load' });
+            const url_params = Url.paramsHash().referrer;
+            GTM.pushDataLayer({ event: 'page_load', ...(url_params && { referrer: url_params }) });
         });
         return result;
     };

src/root_files/app/index.html

@@ -48,23 +48,8 @@
                 var loginid      = localStorage.getItem('active_loginid');
                 var client_info  = JSON.parse(localStorage.getItem('client.accounts') || '{}')[loginid];
                 var is_logged_in = client_info && client_info['token'];
-                window.location.href = (lang || 'en').toLowerCase() + '/' + (is_logged_in ? 'trading' : 'home') + '.html' + window.location.search;
-            }
-            function isGtmApplicable() {
-                return /(www|staging)\.binary\.(com|me)/i.test(window.location.hostname);
-            }
-            function pushEvent() {
-                if (isGtmApplicable()) {
-                    dataLayer.push({
-                        'event': 'page_load',
-                        'eventCallback': function() {
-                            redirect();
-                        },
-                        'referrer': document.referrer
-                    });
-                } else {
-                    redirect();
-                }
+                var search       = (window.location.search ? window.location.search : '') + (document.referrer ? ('?referrer=' + document.referrer) : '');
+                window.location.href = (lang || 'en').toLowerCase() + '/' + (is_logged_in ? 'trading' : 'home') + '.html' + search;
             }
 
             if (/^https:\/\/staging\.binary\.com\/translations\//i.test(window.location.href)) {
@@ -74,32 +59,25 @@
                     localStorage.setItem('index_referrer', document.referrer);
                 }
                 lang = getCookieItem('language');
-                var ws = new WebSocket('wss://ws.binaryws.com/websockets/v3?app_id=1');
-                ws.onopen = function(e) {
-                    ws.send(JSON.stringify({'website_status': '1'}));
-                };
-                ws.onmessage = function(msg) {
-                    var response = JSON.parse(msg.data);
-                    if (response.msg_type === 'website_status') {
-                        if (!lang && !response.error && response.hasOwnProperty('website_status')) {
-                            lang = getLanguage(response.website_status.clients_country);
+                if (lang) {
+                    redirect();
+                } else {
+                    var ws = new WebSocket('wss://ws.binaryws.com/websockets/v3?app_id=1');
+                    ws.onopen = function(e) {
+                        ws.send(JSON.stringify({'website_status': '1'}));
+                    };
+                    ws.onmessage = function(msg) {
+                        var response = JSON.parse(msg.data);
+                        if (response.msg_type === 'website_status') {
+                            if (!response.error && response.hasOwnProperty('website_status')) {
+                                lang = getLanguage(response.website_status.clients_country);
+                            }
+                            ws.close();
+                            redirect();
                         }
-                        ws.close();
-                        pushEvent(); // we need website_status.clients_country
-                    }
-                };
+                    };
+                }
             }
         </script>
     </head>
-    <body>
-<!-- Google Tag Manager -->
-<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-MZWFF7"
-height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-<script data-cfasync="false">(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','GTM-MZWFF7');</script>
-<!-- End Google Tag Manager -->
-    </body>
 </html>

src/root_files/app_2/index.html

@@ -47,23 +47,8 @@
                 var loginid      = localStorage.getItem('active_loginid');
                 var client_info  = JSON.parse(localStorage.getItem('client.accounts') || '{}')[loginid];
                 var is_logged_in = client_info && client_info['token'];
-                window.location.href = (/\/app\//.test(window.location.pathname) ? '' : 'app/') + (lang || 'en').toLowerCase() + '/trade' + window.location.search;
-            }
-            function isGtmApplicable() {
-                return /(www|staging)\.binary\.(com|me)/i.test(window.location.hostname);
-            }
-            function pushEvent() {
-                if (isGtmApplicable()) {
-                    dataLayer.push({
-                        'event': 'page_load',
-                        'eventCallback': function() {
-                            redirect();
-                        },
-                        'referrer': document.referrer
-                    });
-                } else {
-                    redirect();
-                }
+                var search       = (window.location.search ? window.location.search : '') + (document.referrer ? ('?referrer=' + document.referrer) : '');
+                window.location.href = (/\/app\//.test(window.location.pathname) ? '' : 'app/') + (lang || 'en').toLowerCase() + '/trade' + search;
             }
 
             if (document.referrer) {
@@ -85,21 +70,9 @@
                         }
                         ws.close();
                         redirect();
-                        pushEvent(); // we need website_status.clients_country
                     }
                 };
             }
         </script>
     </head>
-    <body>
-<!-- Google Tag Manager -->
-<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-MZWFF7"
-height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-<script data-cfasync="false">(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','GTM-MZWFF7');</script>
-<!-- End Google Tag Manager -->
-    </body>
 </html>