From 3944615195e7adfcb064edd8da9a3e47e49dddef Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 12:52:40 +0300 Subject: [PATCH 01/13] fix comments --- api/v1/views.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/v1/views.py b/api/v1/views.py index c47ce413..2782830b 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -341,11 +341,13 @@ class CommentViewSet(ExtendedModelViewSet): queryset = self.queryset is_deactivated = self.request.query_params.get('is_deactivated', '0') if is_deactivated == '0': - return queryset + queryset = queryset elif is_deactivated == '1': - return queryset.filter(deactivated_at__isnull=True) + queryset = queryset.filter(deactivated_at__isnull=True) elif is_deactivated == '2': - return queryset.filter(deactivated_at__isnull=False) + queryset = queryset.filter(deactivated_at__isnull=False) + + return queryset class AuthorRequestViewSet(ExtendedModelViewSet): From 8157102c145a96086ada4879d6c31fe0de21f6d8 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 13:13:39 +0300 Subject: [PATCH 02/13] fix footer year --- project/templates/lilcity/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index dbdbcfe2..4e3c17e2 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -248,7 +248,7 @@
-
2017 © Lil City, UAB.
+
{% now "Y" %} © Lil City, UAB.
Договор-оферта
|
From e8784cc7905f9384b0c74d803d6cffe04c917eb4 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 13:26:11 +0300 Subject: [PATCH 03/13] fix self course buy --- apps/payment/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/payment/views.py b/apps/payment/views.py index e7490ad9..7f68a963 100644 --- a/apps/payment/views.py +++ b/apps/payment/views.py @@ -46,7 +46,7 @@ class CourseBuyView(TemplateView): host = request.scheme + '://' + request.get_host() course = Course.objects.get(id=pk) if request.user == course.author: - messages.error('Вы не можете приобрести свой курс.') + messages.error(request, 'Вы не можете приобрести свой курс.') return redirect(reverse_lazy('course', args=[course.id])) course_payment = CoursePayment.objects.create( user=request.user, From 1db3d02d63fe9abbb49139faa492774f9f6a98c2 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 13:46:40 +0300 Subject: [PATCH 04/13] status markers --- apps/course/templates/course/_items.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/course/templates/course/_items.html b/apps/course/templates/course/_items.html index 33312e53..f7b7d666 100644 --- a/apps/course/templates/course/_items.html +++ b/apps/course/templates/course/_items.html @@ -33,6 +33,16 @@
ЧЕРНОВИК
+ {% elif course.status == 3 %} +
+
В АРХИВЕ
+
+
+ {% elif course.status == 4 %} +
+
ОТКЛОНЕН
+
+
{% endif %}
From b37b14ea5d0795d45f46bc12448ccbe75743a1c9 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 14:27:40 +0300 Subject: [PATCH 05/13] fix price --- web/src/components/CourseRedactor.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue index a9580dbd..fde01f6e 100644 --- a/web/src/components/CourseRedactor.vue +++ b/web/src/components/CourseRedactor.vue @@ -663,7 +663,7 @@ }, displayPrice: { get: function () { - return this.course.is_paid ? this.course.price : 0; + return this.course.is_paid ? parseFloat(this.course.price) : 0; }, set: function (value) { this.course.price = value; From 1236fb58a73fee175b4ede7ea184503eb4ccf1b8 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 15:40:41 +0300 Subject: [PATCH 06/13] avatar fit --- web/src/sass/_common.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index a6bf777f..d0e84a37 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -780,6 +780,7 @@ a[name] width: 100% height: 100% border-radius: 50% + object-fit: cover &__input position: absolute top: 0 From b7fe703a4b279ddad4925ca33a3115f14670d5d6 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 16:23:57 +0300 Subject: [PATCH 07/13] revert link strikethrough --- web/src/sass/_common.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index d0e84a37..f924962a 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -24,7 +24,7 @@ =fl font-family: 'ProximaNova-Light', serif -$pink: #FF9393 +$pink: #FF9393linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%) $pink-light: #FDF8F9 $purple: #B995D9 $green: #8ECFC0 @@ -1859,7 +1859,7 @@ a.grey-link left: -10px right: -10px height: 2px - margin-top: 5px + margin-top: -2px background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%) &__title display: table From c21643cb00d66f66c5e967d383f13489bea5207c Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 17:00:54 +0300 Subject: [PATCH 08/13] comments reply fix --- apps/course/templates/course/blocks/comment.html | 2 +- web/src/js/modules/comments.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/course/templates/course/blocks/comment.html b/apps/course/templates/course/blocks/comment.html index 497c398d..096d0175 100644 --- a/apps/course/templates/course/blocks/comment.html +++ b/apps/course/templates/course/blocks/comment.html @@ -1,7 +1,7 @@ {% load static %} {% if not node.deactivated_at %} -
+
{% if node.author.photo %}
diff --git a/web/src/js/modules/comments.js b/web/src/js/modules/comments.js index 83f810ab..30b0a815 100644 --- a/web/src/js/modules/comments.js +++ b/web/src/js/modules/comments.js @@ -22,7 +22,7 @@ $(document).ready(function () { .done(function (data) { if (data.success === true) { if (replyToValue > 0) { - $(`#question__${replyToValue}`).after(data.comment); + $(`#question__replyto__${replyToValue}`).after(data.comment); } else { $('.questions__list').append(data.comment); } From 15a58f77a2a33e630236943d2f1ca2ce93749d07 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 17:34:27 +0300 Subject: [PATCH 09/13] grammar nazi fixes, category filter --- project/templates/lilcity/edit_index.html | 2 +- project/templates/lilcity/index.html | 4 ++-- web/build/index.html | 4 ++-- web/build/ui-kit.html | 4 ++-- web/src/js/modules/courses.js | 2 +- web/src/templates/partials/_header.pug | 2 +- web/src/templates/partials/_popups.pug | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/project/templates/lilcity/edit_index.html b/project/templates/lilcity/edit_index.html index 0c2fc067..6f4dd487 100644 --- a/project/templates/lilcity/edit_index.html +++ b/project/templates/lilcity/edit_index.html @@ -278,7 +278,7 @@
-
Выбор урока/дня
+
Выбор курса/дня
При записи на 5 уроков скидка 10%.
diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index 4e3c17e2..a39fb3b8 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -131,7 +131,7 @@ {% endcomment %}
-
ВИДЕО-КУРСЫ +
ВИДЕОКУРСЫ
{% category_menu_items category %}
@@ -439,7 +439,7 @@
-
Выбор урока/дня
+
Выбор курса/дня
diff --git a/web/build/index.html b/web/build/index.html index 38f1efe0..a1dbb725 100755 --- a/web/build/index.html +++ b/web/build/index.html @@ -87,7 +87,7 @@
-
ВИДЕО-КУРСЫ +
ВИДЕОКУРСЫ
ПЕРСОНАЖ
@@ -264,7 +264,7 @@
-
Выбор урока/дня
+
Выбор курса/дня
При записи на 5 уроков скидка 10%.
diff --git a/web/build/ui-kit.html b/web/build/ui-kit.html index a30145eb..2a429bba 100755 --- a/web/build/ui-kit.html +++ b/web/build/ui-kit.html @@ -87,7 +87,7 @@
-
ВИДЕО-КУРСЫ +
ВИДЕОКУРСЫ
ПЕРСОНАЖ
@@ -352,7 +352,7 @@
-
Выбор урока/дня
+
Выбор курса/дня
При записи на 5 уроков скидка 10%.
diff --git a/web/src/js/modules/courses.js b/web/src/js/modules/courses.js index 90ffeb97..49892540 100644 --- a/web/src/js/modules/courses.js +++ b/web/src/js/modules/courses.js @@ -31,7 +31,7 @@ $(document).ready(function () { e.preventDefault(); const currentCategory = $(this).attr('data-category-name'); $('[data-category-name]').removeClass('active'); - $(`[data-category-name=${currentCategory}]`).addClass('active'); + $(`[data-category-name='${currentCategory}']`).addClass('active'); history.replace($(this).attr('data-category-url')); load_courses($(this).attr('data-category-url'), true); }); diff --git a/web/src/templates/partials/_header.pug b/web/src/templates/partials/_header.pug index 569cfa92..67422350 100755 --- a/web/src/templates/partials/_header.pug +++ b/web/src/templates/partials/_header.pug @@ -65,7 +65,7 @@ else a.header__link(href='#') div.header__title Контакты .header__group - a.header__section.header__section_sub.js-header-section(href='#') ВИДЕО-КУРСЫ + a.header__section.header__section_sub.js-header-section(href='#') ВИДЕОКУРСЫ .header__list.js-header-list a.header__link(href='#') .header__title ПЕРСОНАЖ diff --git a/web/src/templates/partials/_popups.pug b/web/src/templates/partials/_popups.pug index 743ad542..3fe4f9af 100755 --- a/web/src/templates/partials/_popups.pug +++ b/web/src/templates/partials/_popups.pug @@ -71,7 +71,7 @@ .buy__row .buy__col .buy__head.buy__head_main - .buy__title Выбор урока/дня + .buy__title Выбор курса/дня .buy__content При записи на 5 уроков скидка 10%. .buy__col .buy__head From 7cf0f4fd8607651ee555ea2565bae11183c99361 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 18:26:46 +0300 Subject: [PATCH 10/13] 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; + } + ); + }); + } }); From 42e33cd63478e5b14703fa93befd04241536bb03 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 2 Apr 2018 19:27:45 +0300 Subject: [PATCH 11/13] course NaN fix --- web/src/components/CourseRedactor.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue index fde01f6e..c46fb75e 100644 --- a/web/src/components/CourseRedactor.vue +++ b/web/src/components/CourseRedactor.vue @@ -602,7 +602,7 @@ this.courseSyncHook = false; this.courseSaving = false; }); - }, 2000); + }, 3000); } }, mounted() { @@ -663,10 +663,10 @@ }, displayPrice: { get: function () { - return this.course.is_paid ? parseFloat(this.course.price) : 0; + return this.course.is_paid ? (this.course.price || 0) : 0; }, set: function (value) { - this.course.price = value; + this.course.price = value || 0; } }, categorySelect: { From 5943f95fbc881a47991dfbaafd5722b475eba367 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Tue, 3 Apr 2018 13:25:11 +0300 Subject: [PATCH 12/13] uuid save --- api/v1/serializers/course.py | 10 ++++++++++ api/v1/serializers/mixins.py | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/api/v1/serializers/course.py b/api/v1/serializers/course.py index 7f45c7a2..55272f85 100644 --- a/api/v1/serializers/course.py +++ b/api/v1/serializers/course.py @@ -203,6 +203,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): t.title = cdata['title'] t.lesson = lesson t.txt = cdata['txt'] + t.uuid = cdata['uuid'] t.save() else: t = Text.objects.create( @@ -210,6 +211,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): title=cdata['title'], lesson=lesson, txt=cdata['txt'], + uuid=cdata['uuid'], ) elif ctype == 'image': if 'id' in cdata and cdata['id']: @@ -218,6 +220,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): image.title = cdata['title'] image.lesson = lesson image.img = ImageObject.objects.get(id=cdata['img']) + image.uuid = cdata['uuid'] image.save() else: image = Image.objects.create( @@ -225,6 +228,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): title=cdata['title'], lesson=lesson, img=ImageObject.objects.get(id=cdata['img']), + uuid=cdata['uuid'], ) elif ctype == 'image-text': if 'id' in cdata and cdata['id']: @@ -234,6 +238,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): it.lesson = lesson it.img = ImageObject.objects.get(id=cdata['img']) it.txt = cdata['txt'] + it.uuid = cdata['uuid'] it.save() else: it = ImageText.objects.create( @@ -242,6 +247,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): lesson=lesson, img=ImageObject.objects.get(id=cdata['img']), txt=cdata['txt'], + uuid=cdata['uuid'], ) elif ctype == 'video': if 'id' in cdata and cdata['id']: @@ -250,6 +256,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): v.title = cdata['title'] v.lesson = lesson v.url = cdata['url'] + v.uuid = cdata['uuid'] v.save() else: v = Video.objects.create( @@ -257,6 +264,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): title=cdata['title'], lesson=lesson, url=cdata['url'], + uuid=cdata['uuid'], ) elif ctype == 'images': if 'id' in cdata and cdata['id']: @@ -264,6 +272,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): g.position = cdata['position'] g.title = cdata['title'] g.lesson = lesson + g.uuid = cdata['uuid'] g.save() if 'images' in cdata: for image in cdata['images']: @@ -276,6 +285,7 @@ class LessonCreateSerializer(serializers.ModelSerializer): lesson=lesson, position=cdata['position'], title=cdata['title'], + uuid=cdata['uuid'], ) if 'images' in cdata: for image in cdata['images']: diff --git a/api/v1/serializers/mixins.py b/api/v1/serializers/mixins.py index 71dd2029..cb19fafc 100644 --- a/api/v1/serializers/mixins.py +++ b/api/v1/serializers/mixins.py @@ -21,6 +21,7 @@ class DispatchContentMixin(object): t.title = cdata['title'] t.course = course t.txt = cdata['txt'] + t.uuid = cdata['uuid'] t.save() else: t = Text.objects.create( @@ -28,6 +29,7 @@ class DispatchContentMixin(object): title=cdata['title'], course=course, txt=cdata['txt'], + uuid=cdata['uuid'], ) elif ctype == 'image': if 'id' in cdata and cdata['id']: @@ -36,6 +38,7 @@ class DispatchContentMixin(object): image.title = cdata['title'] image.course = course image.img = ImageObject.objects.get(id=cdata['img']) + image.uuid = cdata['uuid'] image.save() else: image = Image.objects.create( @@ -43,6 +46,7 @@ class DispatchContentMixin(object): title=cdata['title'], course=course, img=ImageObject.objects.get(id=cdata['img']), + uuid=cdata['uuid'], ) elif ctype == 'image-text': if 'id' in cdata and cdata['id']: @@ -52,6 +56,7 @@ class DispatchContentMixin(object): it.course = course it.img = ImageObject.objects.get(id=cdata['img']) it.txt = cdata['txt'] + it.uuid = cdata['uuid'] it.save() else: it = ImageText.objects.create( @@ -60,6 +65,7 @@ class DispatchContentMixin(object): course=course, img=ImageObject.objects.get(id=cdata['img']), txt=cdata['txt'], + uuid=cdata['uuid'], ) elif ctype == 'video': if 'id' in cdata and cdata['id']: @@ -68,6 +74,7 @@ class DispatchContentMixin(object): v.title = cdata['title'] v.course = course v.url = cdata['url'] + v.uuid = cdata['uuid'] v.save() else: v = Video.objects.create( @@ -75,6 +82,7 @@ class DispatchContentMixin(object): title=cdata['title'], course=course, url=cdata['url'], + uuid=cdata['uuid'], ) elif ctype == 'images': if 'id' in cdata and cdata['id']: @@ -82,6 +90,7 @@ class DispatchContentMixin(object): g.course = course g.position = cdata['position'] g.title = cdata['title'] + g.uuid = cdata['uuid'] g.save() if 'images' in cdata: for image in cdata['images']: @@ -99,6 +108,7 @@ class DispatchContentMixin(object): course=course, position=cdata['position'], title=cdata['title'], + uuid=cdata['uuid'], ) if 'images' in cdata: for image in cdata['images']: From 2d60ef694e00c4f8f950892e281b394e9f8ce09c Mon Sep 17 00:00:00 2001 From: Sanasol Date: Tue, 3 Apr 2018 14:21:17 +0300 Subject: [PATCH 13/13] Email copyright year --- apps/notification/templates/notification/email/_base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/notification/templates/notification/email/_base.html b/apps/notification/templates/notification/email/_base.html index b4ce1c89..7ae29045 100644 --- a/apps/notification/templates/notification/email/_base.html +++ b/apps/notification/templates/notification/email/_base.html @@ -45,7 +45,7 @@ - +
2017 © Lil City, UAB. {% now "Y" %} © Lil City, UAB.