Merge branch 'feature/gtag-6-9-19' into 'master'

Поставить счётчик GTM

See merge request lilschool/site!404

project/context_processors.py

@@ -2,7 +2,6 @@ from django.db.models import Func, F
 from django.utils.timezone import now
 from paymentwall.pingback import Pingback
 from django.contrib.auth import get_user_model
-from django.conf import settings
 from apps.config.models import Config
 from apps.content.models import Banner
 from apps.payment.models import SchoolPayment
@@ -55,4 +54,5 @@ def referrer(request):
 
 
 def settings(request):
+    from django.conf import settings
     return {'settings': settings}

project/templates/blocks/mixpanel.html

@@ -1,9 +0,0 @@
-{% block mixpanel %}
-<!-- start Mixpanel -->
-<script type="text/javascript">(function(e,a){if(!a.__SV){var b=window;try{var c,l,i,j=b.location,g=j.hash;c=function(a,b){return(l=a.match(RegExp(b+"=([^&]*)")))?l[1]:null};g&&c(g,"state")&&(i=JSON.parse(decodeURIComponent(c(g,"state"))),"mpeditor"===i.action&&(b.sessionStorage.setItem("_mpcehash",g),history.replaceState(i.desiredHash||"",e.title,j.pathname+j.search)))}catch(m){}var k,h;window.mixpanel=a;a._i=[];a.init=function(b,c,f){function e(b,a){var c=a.split(".");2==c.length&&(b=b[c[0]],a=c[1]);b[a]=function(){b.push([a].concat(Array.prototype.slice.call(arguments,
-  0)))}}var d=a;"undefined"!==typeof f?d=a[f]=[]:f="mixpanel";d.people=d.people||[];d.toString=function(b){var a="mixpanel";"mixpanel"!==f&&(a+="."+f);b||(a+=" (stub)");return a};d.people.toString=function(){return d.toString(1)+".people (stub)"};k="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.unset people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
-  for(h=0;h<k.length;h++)e(d,k[h]);a._i.push([b,c,f])};a.__SV=1.2;b=e.createElement("script");b.type="text/javascript";b.async=!0;b.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";c=e.getElementsByTagName("script")[0];c.parentNode.insertBefore(b,c)}})(document,window.mixpanel||[]);
-  mixpanel.init("79bd6bfd98667ed977737e6810b8abcd");
-</script>
-<!-- end Mixpanel -->
-{% endblock mixpanel %}

project/templates/lilcity/index.html

@@ -33,35 +33,12 @@
     {% include 'templates/blocks/lil_store_js.html' %}
     {% block pre_app_js %}{% endblock pre_app_js %}
     <script type="text/javascript" src="{% static "app.js" %}"></script>
-    <script>
-      var schoolDiscount = parseFloat({{ config.SERVICE_DISCOUNT }});
-      var schoolAmountForDiscount = parseFloat({{ config.SERVICE_DISCOUNT_MIN_AMOUNT }});
-    </script>
-    {% comment %} ROISTAT {% endcomment %}
-    <script>
-      (function(w, d, s, h, id) { w.roistatProjectId = id; w.roistatHost = h; var p = d.location.protocol == "https:" ? "https://" : "http://"; var u = /^.*roistat_visit=[^;]+(.*)?$/.test(d.cookie) ? "/dist/module.js" : "/api/site/1.0/"+id+"/init"; var js = d.createElement(s); js.charset="UTF-8"; js.async = 1; js.src = p+h+u; var js2 = d.getElementsByTagName(s)[0]; js2.parentNode.insertBefore(js, js2);})(window, document, 'script', 'cloud.roistat.com', '{% setting "ROISTAT_COUNTER_ID" %}');
-    </script>
     <script src="https://js.pusher.com/4.1/pusher.min.js"></script>
     <script>
       LIL_SERVER_TIME = "{% now 'U' %}";
       LIL_SERVER_TIME_DIFF = Math.floor((new Date().getTime()) / 1000) - parseInt(LIL_SERVER_TIME);
       USER_ID = "{{ request.user.id }}";
       COURSE_ID = "{{ course.id }}";
-      MIXPANEL_CUSTOM_LIB_URL = "/static/mixpanel-2-latest.js";
-    </script>
-    <!-- Start of LiveChat (www.livechatinc.com) code -->
-    <script type="text/javascript">
-    window.__lc = window.__lc || {};
-    window.__lc.license = 9917240;
-    {% if request.user.is_authenticated %}
-    window.__lc.visitor = { name: '{{ request.user.get_full_name }}', email: '{{ request.user.email }}' };
-    {% endif %}
-    (function() {
-      var lc = document.createElement('script'); lc.type = 'text/javascript'; lc.async = true;
-      lc.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'cdn.livechatinc.com/tracking.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(lc, s);
-    })();
     </script>
-    <!-- End of LiveChat code -->
     {% block foot_js %}{% endblock foot_js %}
 {% endblock layer_body %}

project/templates/lilcity/layer.html

@@ -47,70 +47,39 @@
             }
         }
     </script>
-
+    {% if settings.DEV_SERVER or settings.DEBUG %}
+    <!-- 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+ '&gtm_auth=vlrscZ1PfuTiK5kaBcQ-Ag&gtm_preview=env-5&gtm_cookies_win=x';f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-WGMCNS7');</script>
+    <!-- End Google Tag Manager -->
+    {% else %}
+    <!-- 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+ '&gtm_auth=Wg_pncigcHbhPKKVOVrvPw&gtm_preview=env-2&gtm_cookies_win=x';f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-WGMCNS7');</script>
+    <!-- End Google Tag Manager -->
+    {% endif %}
 
     {% block layer_head %}{% endblock layer_head %}
   </head>
   <body {% block body_attr %}{% endblock body_attr %}>
     {% block layer_body %}
     {% endblock layer_body %}
-    <!-- Facebook Pixel Code -->
-      <script>
-        !function(f,b,e,v,n,t,s)
-        {if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-        n.callMethod.apply(n,arguments):n.queue.push(arguments)};
-        if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
-        n.queue=[];t=b.createElement(e);t.async=!0;
-        t.src=v;s=b.getElementsByTagName(e)[0];
-        s.parentNode.insertBefore(t,s)}(window,document,'script',
-        'https://connect.facebook.net/en_US/fbevents.js');
-          fbq('init', '194961257900508');
-        fbq('track', 'PageView');
-      </script>
-      <noscript>
-        <img height="1" width="1"
-        src="https://www.facebook.com/tr?id=194961257900508&ev=PageView
-        &noscript=1"/>
-      </noscript>
-      <!-- End Facebook Pixel Code -->
-      <!-- Global site tag (gtag.js) - Google Ads: 808701460 -->
-      <script async src="https://www.googletagmanager.com/gtag/js?id=UA-121923960-1"></script>
-      <script>
-         window.dataLayer = window.dataLayer || [];
-         function gtag(){dataLayer.push(arguments);}
-         gtag('js', new Date());
-         //gtag('config', 'AW-808701460');
-         gtag('config', 'UA-121923960-1');
-      </script>
-      <!-- Yandex.Metrika counter -->
-      <script type="text/javascript" >
-          (function (d, w, c) {
-              (w[c] = w[c] || []).push(function() {
-                  try {
-                      w.yaCounter49354039 = new Ya.Metrika2({
-                          id:49354039,
-                          clickmap:true,
-                          trackLinks:true,
-                          accurateTrackBounce:true,
-                          webvisor:true
-                      });
-                  } catch(e) { }
-              });
-
-              var n = d.getElementsByTagName("script")[0],
-                  s = d.createElement("script"),
-                  f = function () { n.parentNode.insertBefore(s, n); };
-              s.type = "text/javascript";
-              s.async = true;
-              s.src = "https://mc.yandex.ru/metrika/tag.js";
-
-              if (w.opera == "[object Opera]") {
-                  d.addEventListener("DOMContentLoaded", f, false);
-              } else { f(); }
-          })(document, window, "yandex_metrika_callbacks2");
-      </script>
-      <noscript><div><img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
-      <!-- /Yandex.Metrika counter -->
-      {% include "templates/blocks/mixpanel.html" %}
+      {% if settings.DEV_SERVER or settings.DEBUG %}
+      <!-- Google Tag Manager (noscript) -->
+      <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WGMCNS7&gtm_auth=vlrscZ1PfuTiK5kaBcQ-Ag&gtm_preview=env-5&gtm_cookies_win=x"
+      height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+      <!-- End Google Tag Manager (noscript) -->
+      {% else %}
+      <!-- Google Tag Manager (noscript) -->
+      <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WGMCNS7&gtm_auth=Wg_pncigcHbhPKKVOVrvPw&gtm_preview=env-2&gtm_cookies_win=x"
+      height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+      <!-- End Google Tag Manager (noscript) -->
+      {% endif %}
   </body>
 </html>

web/src/js/app.js

@@ -16,7 +16,6 @@ import "./modules/courses";
 import "./modules/comments";
 import "./modules/password-show";
 import "./modules/notification";
-import "./modules/mixpanel";
 
 import "../sass/app.sass";
 

web/webpack.config.js

@@ -18,7 +18,6 @@ module.exports = {
     freeLessons: "./src/js/pages/free-lessons.js",
     userGalleryEdit: "./src/js/pages/user-gallery-edit.js",
     pay: "./src/js/pages/pay.js",
-    mixpanel: "./src/js/third_party/mixpanel-2-latest.js",
     sprite: glob('./src/icons/*.svg'),
     images: glob('./src/img/*.*'),
     imagesCertificates: glob('./src/img/user-certificates/*'),