From 16c0ac3fab852f5261f25e5b889f8f257071b436 Mon Sep 17 00:00:00 2001
From: Tal-Ben-Avi <talb@webiya.co.il>
Date: Sun, 17 Mar 2024 15:16:44 +0200
Subject: [PATCH 1/2] changing ga to gtm

---
 .../src/renderer/_default.page.server.tsx     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/workspaces/website/src/renderer/_default.page.server.tsx b/workspaces/website/src/renderer/_default.page.server.tsx
index 8a16c7c072..0b9587b7db 100644
--- a/workspaces/website/src/renderer/_default.page.server.tsx
+++ b/workspaces/website/src/renderer/_default.page.server.tsx
@@ -47,7 +47,7 @@ export async function render(pageContext: PageContextServer) {
     userAgent: pageContext.userAgent,
   });
 
-  const GOOGLE_TAG_ID = "G-WY42TERK5P";
+  const GOOGLE_GTM_ID = "GTM-K6LVSCS9";
   const pageSeo = (pageProps?.data ??
     pageProps?.roadmapPost ??
     pageProps?.tutorial) as SeoType;
@@ -123,15 +123,14 @@ export async function render(pageContext: PageContextServer) {
        }
        </script>
 
-      <!-- Google tag (gtag.js) -->
-      <script async src="https://www.googletagmanager.com/gtag/js?id=${GOOGLE_TAG_ID}"></script>
-      <script>
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-
-        gtag('config', '${GOOGLE_TAG_ID}');
-      </script>
+       <!-- Google Tag Manager -->
+       <script>(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=
+       'https://www.googletagmanager.com/gtm.js?id=${GOOGLE_GTM_ID}'+i+dl;f.parentNode.insertBefore(j,f);
+       })(window,document,'script','dataLayer','${GOOGLE_GTM_ID}');</script>
+       <!-- End Google Tag Manager -->
+       
       <!-- Hotjar Tracking Code for Starknet -->
       <script>
           (function(h,o,t,j,a,r){
@@ -153,7 +152,12 @@ export async function render(pageContext: PageContextServer) {
       }
     </head>
     <body>
+      <!-- Google Tag Manager (noscript) -->
+      <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-K6LVSCS9"
+      height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+      <!-- End Google Tag Manager (noscript) -->
       <div id="page-view">${stream}</div>
+      
     </body>
   </html>`;
 

From 6789b400785d0e5b6352c67fa5f80f25eb5cfe86 Mon Sep 17 00:00:00 2001
From: Igal Steklov <igal@webiya.co.il>
Date: Sun, 24 Mar 2024 17:06:39 +0200
Subject: [PATCH 2/2] Fix GTM so that it wouldn't have duplicate `GTM_ID`s in
 loading script url

---
 .../src/renderer/_default.page.server.tsx     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/workspaces/website/src/renderer/_default.page.server.tsx b/workspaces/website/src/renderer/_default.page.server.tsx
index 0b9587b7db..fa83ba9a62 100644
--- a/workspaces/website/src/renderer/_default.page.server.tsx
+++ b/workspaces/website/src/renderer/_default.page.server.tsx
@@ -48,14 +48,15 @@ export async function render(pageContext: PageContextServer) {
   });
 
   const GOOGLE_GTM_ID = "GTM-K6LVSCS9";
+
   const pageSeo = (pageProps?.data ??
     pageProps?.roadmapPost ??
     pageProps?.tutorial) as SeoType;
   const documentProps =
     pageContext.documentProps ?? pageContext.exports.documentProps;
 
-  // @ts-ignore
   const isGeoRegulationsPage =
+    // @ts-ignore
     pageProps?.data?.slug === "provisions-geo-regulations";
 
   const title = isGeoRegulationsPage
@@ -124,13 +125,13 @@ export async function render(pageContext: PageContextServer) {
        </script>
 
        <!-- Google Tag Manager -->
-       <script>(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=
-       'https://www.googletagmanager.com/gtm.js?id=${GOOGLE_GTM_ID}'+i+dl;f.parentNode.insertBefore(j,f);
-       })(window,document,'script','dataLayer','${GOOGLE_GTM_ID}');</script>
-       <!-- End Google Tag Manager -->
-       
+      <script>(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=
+      'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+      })(window,document,'script','dataLayer','${GOOGLE_GTM_ID}');</script>
+      <!-- End Google Tag Manager -->
+
       <!-- Hotjar Tracking Code for Starknet -->
       <script>
           (function(h,o,t,j,a,r){
@@ -145,19 +146,17 @@ export async function render(pageContext: PageContextServer) {
 
       ${
         pageSeo?.seoCanonicalUrl
-          ? `
-        <link rel="canonical" href="${pageSeo?.seoCanonicalUrl}" />
-      `
+          ? `<link rel="canonical" href="${pageSeo?.seoCanonicalUrl}" />`
           : ""
       }
     </head>
     <body>
       <!-- Google Tag Manager (noscript) -->
-      <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-K6LVSCS9"
+      <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=${GOOGLE_GTM_ID}"
       height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
       <!-- End Google Tag Manager (noscript) -->
+
       <div id="page-view">${stream}</div>
-      
     </body>
   </html>`;
 
