From 7cf0f4fd8607651ee555ea2565bae11183c99361 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 18:26:46 +0300 Subject: [PATCH] fix delayed courses countdown, some other fixes --- apps/course/templates/course/course.html | 2 +- project/templates/lilcity/edit_index.html | 4 ++ web/src/js/modules/courses.js | 2 + web/src/js/modules/mixpanel.js | 54 ++++++++++++----------- 4 files changed, 35 insertions(+), 27 deletions(-) diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html index 0a3c2ce4..48105a1f 100644 --- a/apps/course/templates/course/course.html +++ b/apps/course/templates/course/course.html @@ -174,7 +174,7 @@ {% if course.is_deferred_start %}
Курс начнется:
-
{{ course.deferred_start_at_humanize }}
+
{{ course.deferred_start_at_humanize }}
{% else %} {% comment %} diff --git a/project/templates/lilcity/edit_index.html b/project/templates/lilcity/edit_index.html index 6f4dd487..b5e79164 100644 --- a/project/templates/lilcity/edit_index.html +++ b/project/templates/lilcity/edit_index.html @@ -345,6 +345,10 @@ + {% block foot %}{% endblock foot %} diff --git a/web/src/js/modules/courses.js b/web/src/js/modules/courses.js index 49892540..2581df46 100644 --- a/web/src/js/modules/courses.js +++ b/web/src/js/modules/courses.js @@ -17,7 +17,9 @@ $(document).ready(function () { $('div[data-future-course]').each((_, element) => { const courseTime = parseInt($(element).attr('data-future-course-time')) + LIL_SERVER_TIME_DIFF; const relativeTimeString = moment(courseTime, 'X').fromNow(); + $(element).find('div.courses__time').text(relativeTimeString); + $(element).find('div.video__time').text(relativeTimeString); }); }, 1000); diff --git a/web/src/js/modules/mixpanel.js b/web/src/js/modules/mixpanel.js index d6c0626f..bfa7040e 100644 --- a/web/src/js/modules/mixpanel.js +++ b/web/src/js/modules/mixpanel.js @@ -1,34 +1,36 @@ import $ from 'jquery'; $(document).ready(function (e) { - mixpanel.identify(USER_ID); - let body = $('body'), - cource = $('.course'); + if (typeof mixpanel != 'undefined') { + mixpanel.identify(USER_ID); + let body = $('body'), + cource = $('.course'); - if (cource.length) { - mixpanel.track( - 'Open course', - { 'course_id': COURSE_ID } - ); - }; - - body.on('click', '[data-popup]', function (e) { - let data = $(this).data('popup'); - if (data === '.js-popup-buy') { + if (cource.length) { mixpanel.track( - 'Open school buy popup' + 'Open course', + { 'course_id': COURSE_ID } ); - } - }); - body.on('click', '[data-course-buy]', function (e) { - e.preventDefault(); - let href = $(this).attr('href'); - let t = mixpanel.track( - 'Click course buy button', - { 'course_id': COURSE_ID }, - function () { - window.location = href; + }; + + body.on('click', '[data-popup]', function (e) { + let data = $(this).data('popup'); + if (data === '.js-popup-buy') { + mixpanel.track( + 'Open school buy popup' + ); } - ); - }); + }); + body.on('click', '[data-course-buy]', function (e) { + e.preventDefault(); + let href = $(this).attr('href'); + let t = mixpanel.track( + 'Click course buy button', + { 'course_id': COURSE_ID }, + function () { + window.location = href; + } + ); + }); + } });