mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
remotes/origin/feature/gtag-6-9-19
gzbender 6 years ago
parent 319e5907c4
commit ea9cf12b99
5 changed files with 29 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      project/context_processors.py
  2. 23
      project/templates/lilcity/index.html
  3. 87
      project/templates/lilcity/layer.html
  4. 1
      web/src/js/app.js
  5. 1
      web/webpack.config.js

2
project/context_processors.py
Unescape View File

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

23
project/templates/lilcity/index.html
Unescape View File

@ -33,35 +33,12 @@
{% include 'templates/blocks/lil_store_js.html' %} {% include 'templates/blocks/lil_store_js.html' %}
{% block pre_app_js %}{% endblock pre_app_js %} {% block pre_app_js %}{% endblock pre_app_js %}
<script type="text/javascript" src="{% static "app.js" %}"></script> <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 src="https://js.pusher.com/4.1/pusher.min.js"></script>
<script> <script>
LIL_SERVER_TIME = "{% now 'U' %}"; LIL_SERVER_TIME = "{% now 'U' %}";
LIL_SERVER_TIME_DIFF = Math.floor((new Date().getTime()) / 1000) - parseInt(LIL_SERVER_TIME); LIL_SERVER_TIME_DIFF = Math.floor((new Date().getTime()) / 1000) - parseInt(LIL_SERVER_TIME);
USER_ID = "{{ request.user.id }}"; USER_ID = "{{ request.user.id }}";
COURSE_ID = "{{ course.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> </script>
<!-- End of LiveChat code -->
{% block foot_js %}{% endblock foot_js %} {% block foot_js %}{% endblock foot_js %}
{% endblock layer_body %} {% endblock layer_body %}

87
project/templates/lilcity/layer.html
Unescape View File

@ -47,70 +47,39 @@
} }
} }
</script> </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 %} {% block layer_head %}{% endblock layer_head %}
</head> </head>
<body {% block body_attr %}{% endblock body_attr %}> <body {% block body_attr %}{% endblock body_attr %}>
{% block layer_body %} {% block layer_body %}
{% endblock layer_body %} {% endblock layer_body %}
<!-- Facebook Pixel Code --> {% if settings.DEV_SERVER or settings.DEBUG %}
<script> <!-- Google Tag Manager (noscript) -->
!function(f,b,e,v,n,t,s) <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WGMCNS7&gtm_auth=vlrscZ1PfuTiK5kaBcQ-Ag&gtm_preview=env-5&gtm_cookies_win=x"
{if(f.fbq)return;n=f.fbq=function(){n.callMethod? height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
n.callMethod.apply(n,arguments):n.queue.push(arguments)}; <!-- End Google Tag Manager (noscript) -->
if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0'; {% else %}
n.queue=[];t=b.createElement(e);t.async=!0; <!-- Google Tag Manager (noscript) -->
t.src=v;s=b.getElementsByTagName(e)[0]; <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WGMCNS7&gtm_auth=Wg_pncigcHbhPKKVOVrvPw&gtm_preview=env-2&gtm_cookies_win=x"
s.parentNode.insertBefore(t,s)}(window,document,'script', height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
'https://connect.facebook.net/en_US/fbevents.js'); <!-- End Google Tag Manager (noscript) -->
fbq('init', '194961257900508'); {% endif %}
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" %}
</body> </body>
</html> </html>

1
web/src/js/app.js
Unescape View File

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

1
web/webpack.config.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save