diff --git a/project/context_processors.py b/project/context_processors.py index 2ac5769e..cd2f0140 100644 --- a/project/context_processors.py +++ b/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} diff --git a/project/templates/blocks/mixpanel.html b/project/templates/blocks/mixpanel.html deleted file mode 100644 index e71a9121..00000000 --- a/project/templates/blocks/mixpanel.html +++ /dev/null @@ -1,9 +0,0 @@ -{% block mixpanel %} - - - -{% endblock mixpanel %} diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index 8c918a26..783964ff 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -33,35 +33,12 @@ {% 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 34915139..50245a19 100644 --- a/project/templates/lilcity/layer.html +++ b/project/templates/lilcity/layer.html @@ -47,70 +47,39 @@ } } - + {% if settings.DEV_SERVER or settings.DEBUG %} + + + + {% else %} + + + + {% endif %} {% block layer_head %}{% endblock layer_head %} {% block layer_body %} {% endblock layer_body %} - - - - - - - - - - - - {% include "templates/blocks/mixpanel.html" %} + {% if settings.DEV_SERVER or settings.DEBUG %} + + + + {% else %} + + + + {% endif %} diff --git a/web/src/img/gift-certificates/1000.jpg b/web/src/img/gift-certificates/1000.jpg index 9d682d7f..17e4fde8 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 9695841d..90026929 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 ec0483ac..c76671e8 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 bb6f3970..cd46cdd7 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 5bb83064..adfb3785 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 a59403d6..7f7278d0 100644 --- a/web/src/js/app.js +++ b/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"; diff --git a/web/webpack.config.js b/web/webpack.config.js index 24404936..35d16596 100644 --- a/web/webpack.config.js +++ b/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/*'),