diff --git a/project/context_processors.py b/project/context_processors.py index cd2f0140..2ac5769e 100644 --- a/project/context_processors.py +++ b/project/context_processors.py @@ -2,6 +2,7 @@ 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 @@ -54,5 +55,4 @@ def referrer(request): def settings(request): - from django.conf import settings return {'settings': settings} diff --git a/project/templates/blocks/mixpanel.html b/project/templates/blocks/mixpanel.html new file mode 100644 index 00000000..e71a9121 --- /dev/null +++ b/project/templates/blocks/mixpanel.html @@ -0,0 +1,9 @@ +{% block mixpanel %} + + + +{% endblock mixpanel %} diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index 783964ff..8c918a26 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -33,12 +33,35 @@ {% include 'templates/blocks/lil_store_js.html' %} {% block pre_app_js %}{% endblock pre_app_js %} + + {% comment %} ROISTAT {% endcomment %} + + + + {% block foot_js %}{% endblock foot_js %} {% endblock layer_body %} diff --git a/project/templates/lilcity/layer.html b/project/templates/lilcity/layer.html index 50245a19..34915139 100644 --- a/project/templates/lilcity/layer.html +++ b/project/templates/lilcity/layer.html @@ -47,39 +47,70 @@ } } - {% if settings.DEV_SERVER or settings.DEBUG %} - - - - {% else %} - - - - {% endif %} + {% block layer_head %}{% endblock layer_head %} {% block layer_body %} {% endblock layer_body %} - {% if settings.DEV_SERVER or settings.DEBUG %} - - - - {% else %} - - - - {% endif %} + + + + + + + + + + + + {% include "templates/blocks/mixpanel.html" %} diff --git a/web/src/img/gift-certificates/1000.jpg b/web/src/img/gift-certificates/1000.jpg index 17e4fde8..9d682d7f 100644 Binary files a/web/src/img/gift-certificates/1000.jpg and b/web/src/img/gift-certificates/1000.jpg differ diff --git a/web/src/img/gift-certificates/10000.jpg b/web/src/img/gift-certificates/10000.jpg index 90026929..9695841d 100644 Binary files a/web/src/img/gift-certificates/10000.jpg and b/web/src/img/gift-certificates/10000.jpg differ diff --git a/web/src/img/gift-certificates/2000.jpg b/web/src/img/gift-certificates/2000.jpg index c76671e8..ec0483ac 100644 Binary files a/web/src/img/gift-certificates/2000.jpg and b/web/src/img/gift-certificates/2000.jpg differ diff --git a/web/src/img/gift-certificates/3000.jpg b/web/src/img/gift-certificates/3000.jpg index cd46cdd7..bb6f3970 100644 Binary files a/web/src/img/gift-certificates/3000.jpg and b/web/src/img/gift-certificates/3000.jpg differ diff --git a/web/src/img/gift-certificates/5000.jpg b/web/src/img/gift-certificates/5000.jpg index adfb3785..5bb83064 100644 Binary files a/web/src/img/gift-certificates/5000.jpg and b/web/src/img/gift-certificates/5000.jpg differ diff --git a/web/src/js/app.js b/web/src/js/app.js index 7f7278d0..a59403d6 100644 --- a/web/src/js/app.js +++ b/web/src/js/app.js @@ -16,6 +16,7 @@ import "./modules/courses"; import "./modules/comments"; import "./modules/password-show"; import "./modules/notification"; +import "./modules/mixpanel"; import "../sass/app.sass"; diff --git a/web/webpack.config.js b/web/webpack.config.js index 35d16596..24404936 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -18,6 +18,7 @@ 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/*'),