From 5db0b756bf5c389629e17fe5185fd37fdc3d3f83 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Tue, 11 Jan 2022 19:01:36 -0800
Subject: [PATCH] Fix adsense registration

---
 .../src/main/webapp/jsp/googleAnalytics.jsf       | 12 ++++++++++--
 wise-webapp/src/main/webapp/jsp/reactInclude.jsp  | 15 ++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
index 48e5e4b5..81230068 100644
--- a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
+++ b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
@@ -1,5 +1,13 @@
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <c:if test="${requestScope['google.analytics.enabled']}">
-  <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-4996113942657337" crossorigin="anonymous"></script>
-</c:if>
\ No newline at end of file
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-2347723-1"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() { dataLayer.push(arguments); }
+    gtag('js', new Date());
+    gtag('config', );
+  </script>
+</c:if>
+
diff --git a/wise-webapp/src/main/webapp/jsp/reactInclude.jsp b/wise-webapp/src/main/webapp/jsp/reactInclude.jsp
index 591af1bf..2e40474e 100644
--- a/wise-webapp/src/main/webapp/jsp/reactInclude.jsp
+++ b/wise-webapp/src/main/webapp/jsp/reactInclude.jsp
@@ -23,21 +23,10 @@
         };
 
     </script>
+    <%@ include file="/jsp/googleAnalytics.jsf" %>
 
     <c:if test="${requestScope['google.analytics.enabled']}">
-
-      <!-- Global site tag (gtag.js) - Google Analytics -->
-      <script async src="https://www.googletagmanager.com/gtag/js?id=UA-2347723-1"></script>
-      <script>
-        window.dataLayer = window.dataLayer || [];
-        function gtag() { dataLayer.push(arguments); }
-        gtag('js', new Date());
-        gtag('config', );
-      </script>
-    </c:if>
-
-    <c:if test="${requestScope['google.analytics.enabled']}">
-      <!-- Google Ads Sense  Config-->
+      <!-- Google Ads Sense Config-->
       <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-4996113942657337" crossorigin="anonymous"></script>
     </c:if>
 </head>