Analytics tags have been updated

meg4cyberc4t · Sep 9, 2024 · f06d9a6 · f06d9a6
1 parent 73e37c1
commit f06d9a6
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 31 deletions.
diff --git a/_includes/custom-head.html b/_includes/custom-head.html
diff --git a/_includes/footer.html b/_includes/footer.html
diff --git a/_includes/google-analytics.html b/_includes/google-analytics.html
@@ -1,9 +1,10 @@
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-7Q9E6D64MT"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag() {
-    dataLayer.push(arguments);
-  }
-  gtag("js", new Date());
-  gtag("config", "G-7Q9E6D64MT");
-</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=' + i + dl; f.parentNode.insertBefore(j, f);
+  })(window, document, 'script', 'dataLayer', 'GTM-PC33S45W');</script>
+<!-- End Google Tag Manager -->
diff --git a/_includes/google-tag-header.html b/_includes/google-tag-header.html
@@ -0,0 +1,4 @@
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PC33S45W" height="0" width="0"
+                style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
diff --git a/_includes/head.html b/_includes/head.html
@@ -3,14 +3,13 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   {%- seo -%}
-  <link rel="stylesheet" href="{{ "/assets/css/style.css" | relative_url }}">
+  <link rel="stylesheet" href="{{ " {{ base }} /assets/css/style.css" }}">
   <link href="https://fonts.googleapis.com/css?family=JetBrains Mono" rel="stylesheet" />
 
   {%- feed_meta -%}
-  {%- if jekyll.environment == 'production' and site.google_analytics -%}
-    {%- include google-analytics.html -%}
+  {%- if jekyll.environment == 'production' -%}
+  {%- include google-analytics.html -%}
+  {%- include yandex-analytics.html -%}
   {%- endif -%}
 
-  {%- include custom-head.html -%}
-
-</head>
+</head>
diff --git a/_includes/header.html b/_includes/header.html
diff --git a/_includes/yandex-analytics.html b/_includes/yandex-analytics.html
@@ -0,0 +1,20 @@
+<!-- Yandex.Metrika counter -->
+<script type="text/javascript">
+  (function (m, e, t, r, i, k, a) {
+    m[i] = m[i] || function () { (m[i].a = m[i].a || []).push(arguments) };
+    m[i].l = 1 * new Date();
+    for (var j = 0; j < document.scripts.length; j++) { if (document.scripts[j].src === r) { return; } }
+    k = e.createElement(t), a = e.getElementsByTagName(t)[0], k.async = 1, k.src = r, a.parentNode.insertBefore(k, a)
+  })
+    (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+
+  ym(97046883, "init", {
+    clickmap: true,
+    trackLinks: true,
+    accurateTrackBounce: true
+  });
+</script>
+<noscript>
+  <div><img src="https://mc.yandex.ru/watch/97046883" style="position:absolute; left:-9999px;" alt="" /></div>
+</noscript>
+<!-- /Yandex.Metrika counter -->
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -4,17 +4,14 @@
 {%- include head.html -%}
 
 <body>
-
-  {%- include header.html -%}
+  {%- include google-tag-header.html -%}
 
   <main class="page-content" aria-label="Content">
     <div class="wrapper">
       {{ content }}
     </div>
   </main>
 
-  {%- include footer.html -%}
-
 </body>
 
 </html>