From 9cf5c9eb71643fc1bd2278129bd2beab0b98f833 Mon Sep 17 00:00:00 2001 From: gzbender Date: Fri, 17 Aug 2018 19:08:50 +0500 Subject: [PATCH 01/16] =?UTF-8?q?LIL-619=20=D0=92=D1=8B=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D0=BF=D1=80=D0=B5=D0=B2=D1=8C=D1=8E,=20?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=20=D0=BE=D1=80=D0=B8=D0=B3=D0=B8=D0=BD?= =?UTF-8?q?=D0=B0=D0=BB=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=B1=D0=BB?= =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D0=BA=20=D1=83=D1=80=D0=BE=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/course/models.py | 3 --- apps/course/templates/course/course_only_lessons.html | 2 +- apps/course/templates/course/lesson.html | 2 +- web/src/components/blocks/Image.vue | 8 ++++---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/apps/course/models.py b/apps/course/models.py index 39eed28e..dac438db 100644 --- a/apps/course/models.py +++ b/apps/course/models.py @@ -4,7 +4,6 @@ from uuid import uuid4 from django.db import models from django.core.exceptions import ValidationError from django.utils import timezone -from django.utils.text import slugify from django.utils.timezone import now from django.contrib.auth import get_user_model from django.urls import reverse_lazy @@ -13,8 +12,6 @@ from polymorphic_tree.models import PolymorphicMPTTModel, PolymorphicTreeForeign from project.mixins import BaseModel, DeactivatedMixin -from .manager import CategoryQuerySet - from apps.content.models import ImageObject, Gallery, Video, ContestWork User = get_user_model() diff --git a/apps/course/templates/course/course_only_lessons.html b/apps/course/templates/course/course_only_lessons.html index b987475c..22ae46f3 100644 --- a/apps/course/templates/course/course_only_lessons.html +++ b/apps/course/templates/course/course_only_lessons.html @@ -184,7 +184,7 @@
+ src="{% if lesson.cover %}{{ lesson.cover.image_thumbnail.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html index 94d6b89b..9cc570c1 100644 --- a/apps/course/templates/course/lesson.html +++ b/apps/course/templates/course/lesson.html @@ -31,7 +31,7 @@
+ src="{% if lesson.cover %}{{ lesson.cover.image_thumbnail.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
diff --git a/web/src/components/blocks/Image.vue b/web/src/components/blocks/Image.vue index 013c63f1..527df9f1 100644 --- a/web/src/components/blocks/Image.vue +++ b/web/src/components/blocks/Image.vue @@ -14,7 +14,7 @@ export default { name: "lil-image", - props: ["imageId", "imageUrl", "accessToken"], + props: ["imageId", "imageUrl", "accessToken", "longSide"], data() { return { loading: false, @@ -23,7 +23,7 @@ methods: { onImageAdded(event) { this.loading = true; - const maxSize = 1600; + const longSide = +this.longSide || 1600; let file = event.target.files[0]; const reader = new FileReader(); reader.onload = () => { @@ -32,12 +32,12 @@ let w = 0; let h = 0; if(img.width > img.height) { - w = maxSize; + w = longSide; h = 0; } else { w = 0; - h = maxSize; + h = longSide; } downscale(img.src, w, h).then((dataURL) => { img = null; From 7425023feab6c78c705476dd1358de44bbbadf4a Mon Sep 17 00:00:00 2001 From: gzbender Date: Sat, 18 Aug 2018 22:22:47 +0500 Subject: [PATCH 02/16] =?UTF-8?q?LIL-622=20=D0=9E=D1=82=D0=BA=D1=80=D1=8B?= =?UTF-8?q?=D1=82=D1=8C=20=D1=88=D0=BA=D0=BE=D0=BB=D1=83=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B8=20=D1=83?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/payment/views.py | 6 ++++++ apps/school/views.py | 1 + 2 files changed, 7 insertions(+) diff --git a/apps/payment/views.py b/apps/payment/views.py index afe2b8ac..ba2cd5f0 100644 --- a/apps/payment/views.py +++ b/apps/payment/views.py @@ -100,6 +100,8 @@ class SchoolBuyView(TemplateView): weekdays = set(request.GET.getlist('weekdays', [])) add_days = 'add_days' in request.GET roistat_visit = request.COOKIES.get('roistat_visit', None) + date_start = now().date() + september2018 = datetime.date(2018, 9, 1) if not weekdays: messages.error(request, 'Выберите несколько дней недели.') return redirect('school:summer-school') @@ -108,6 +110,8 @@ class SchoolBuyView(TemplateView): except ValueError: messages.error(request, 'Ошибка выбора дней недели.') return redirect('school:summer-school') + if date_start < september2018: + date_start = september2018 if add_days: _school_payment = SchoolPayment.objects.get( user=request.user, @@ -131,6 +135,8 @@ class SchoolBuyView(TemplateView): user=request.user, weekdays=weekdays, roistat_visit=roistat_visit, + date_start=date_start, + date_end=date_start + timedelta(days=30) ) product = Product( f'school_{school_payment.id}', diff --git a/apps/school/views.py b/apps/school/views.py index 3f269067..62d5e1a9 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -61,6 +61,7 @@ class LiveLessonsDetailView(DetailView): def get(self, request, pk=None): response = super().get(request, pk=pk) + # ??? где проверка? #try: # school_payment = SchoolPayment.objects.get( # user=request.user, From 43eb30ac18110b48327af38fb7ca5803e1fa946a Mon Sep 17 00:00:00 2001 From: gzbender Date: Sat, 18 Aug 2018 22:43:27 +0500 Subject: [PATCH 03/16] =?UTF-8?q?LIL-622=20=D0=9E=D1=82=D0=BA=D1=80=D1=8B?= =?UTF-8?q?=D1=82=D1=8C=20=D1=88=D0=BA=D0=BE=D0=BB=D1=83=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B8=20=D1=83?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/school/templates/blocks/online.html | 2 +- apps/school/templates/blocks/promo.html | 2 +- apps/school/templates/summer/online.html | 2 +- apps/school/templates/summer/promo.html | 2 +- project/templates/blocks/about.html | 2 +- project/templates/blocks/last_courses.html | 2 +- project/templates/blocks/live.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/school/templates/blocks/online.html b/apps/school/templates/blocks/online.html index c4c82931..549dad08 100644 --- a/apps/school/templates/blocks/online.html +++ b/apps/school/templates/blocks/online.html @@ -1,7 +1,7 @@ {% load static %}
-
ПРЯМОЙ ЭФИР
+
ВИДЕОУРОКИ
Каждый день в 17.00 (по Мск)
Кроме выходных. Запись эфира доступна по завершению трансляции
diff --git a/apps/school/templates/blocks/promo.html b/apps/school/templates/blocks/promo.html index 72137dbb..86f1f1df 100644 --- a/apps/school/templates/blocks/promo.html +++ b/apps/school/templates/blocks/promo.html @@ -17,7 +17,7 @@
-
Прямой эфир
+
Видеоуроки
С понедельника по пятницу кроме выходных
diff --git a/apps/school/templates/summer/online.html b/apps/school/templates/summer/online.html index 3599afcc..d062abfb 100644 --- a/apps/school/templates/summer/online.html +++ b/apps/school/templates/summer/online.html @@ -1,7 +1,7 @@ {% load static %}
-
ПРЯМОЙ ЭФИР
+
ВИДЕОУРОКИ
В 17.00 (по Мск)
Понедельник, среда, пятница.
diff --git a/apps/school/templates/summer/promo.html b/apps/school/templates/summer/promo.html index 7bdf1178..dcab64a8 100644 --- a/apps/school/templates/summer/promo.html +++ b/apps/school/templates/summer/promo.html @@ -32,7 +32,7 @@
-
Прямой эфир
+
Видеоуроки
Понедельник, среда, пятница
diff --git a/project/templates/blocks/about.html b/project/templates/blocks/about.html index 5fefa4ca..93416110 100644 --- a/project/templates/blocks/about.html +++ b/project/templates/blocks/about.html @@ -12,7 +12,7 @@
-
Прямой эфир
+
Видеоуроки
Понедельник, среда, пятница
diff --git a/project/templates/blocks/last_courses.html b/project/templates/blocks/last_courses.html index 0b080bb8..9eee94ce 100644 --- a/project/templates/blocks/last_courses.html +++ b/project/templates/blocks/last_courses.html @@ -2,7 +2,7 @@
Видео-курсы без расписания
-
Если вам не совсем удобно заниматься с нами в прямом эфире каждый день как в нашей онлайн-школе, специально для вас мы +
Если вам не совсем удобно заниматься с нами каждый день в нашей онлайн-школе, специально для вас мы делаем отдельные уроки в записи, которые вы можете проходить когда вам будем удобно.
Учите и развивайте креативное мышление когда и где угодно
diff --git a/project/templates/blocks/live.html b/project/templates/blocks/live.html index 3599afcc..d062abfb 100644 --- a/project/templates/blocks/live.html +++ b/project/templates/blocks/live.html @@ -1,7 +1,7 @@ {% load static %}
-
ПРЯМОЙ ЭФИР
+
ВИДЕОУРОКИ
В 17.00 (по Мск)
Понедельник, среда, пятница.
From 7d95b7966f05e33283cc39639634a25ffedcc0f8 Mon Sep 17 00:00:00 2001 From: gzbender Date: Sun, 19 Aug 2018 11:03:11 +0500 Subject: [PATCH 04/16] LIL-582 likes --- apps/content/admin.py | 11 +++++++ .../templates/content/contest_work.html | 12 ++++++-- .../templates/course/course_only_lessons.html | 26 +---------------- project/templates/blocks/share.html | 29 +++++-------------- project/templates/lilcity/index.html | 1 + web/src/js/app.js | 2 ++ 6 files changed, 32 insertions(+), 49 deletions(-) diff --git a/apps/content/admin.py b/apps/content/admin.py index 1c92c012..c025f198 100644 --- a/apps/content/admin.py +++ b/apps/content/admin.py @@ -8,6 +8,7 @@ from polymorphic.admin import ( from apps.content.models import ( Baner, Content, Image, Text, ImageText, Video, Gallery, GalleryImage, ImageObject, + Contest,ContestWork, ) @@ -79,3 +80,13 @@ class ContentAdmin(PolymorphicParentModelAdmin): @admin.register(GalleryImage) class GalleryImageAdmin(admin.ModelAdmin): pass + + +@admin.register(Contest) +class ContestAdmin(admin.ModelAdmin): + base_model = Contest + + +@admin.register(ContestWork) +class ContestWorkAdmin(admin.ModelAdmin): + base_model = ContestWork diff --git a/apps/content/templates/content/contest_work.html b/apps/content/templates/content/contest_work.html index 67e2e287..5184faae 100644 --- a/apps/content/templates/content/contest_work.html +++ b/apps/content/templates/content/contest_work.html @@ -1,8 +1,14 @@ {% extends "templates/lilcity/index.html" %} +{% load rupluralize from plural %} {% load static %} -{% block title %}{{ contest_work.child_full_name }}, {{ contest_work.age }} лет{% endblock title %} - +{% block title %}Конкурс Lil.School{% endblock title %} +{% block description %}Работа {{ contest_work.child_full_name }}, {{ contest_work.age | rupluralize:"год,года,лет" }}{% endblock description%} +{% block ogdescription %}Работа {{ contest_work.child_full_name }}, {{ contest_work.age | rupluralize:"год,года,лет" }}{% endblock ogdescription %} {% block ogimage %}http://{{request.META.HTTP_HOST}}{{ contest_work.image.image.url }}{% endblock ogimage %} +{% block head %} + + +{% endblock head %} {% block content %}
@@ -25,7 +31,7 @@
{{ contest_work.child_full_name }}
-
{{ contest_work.age }} {% if contest_work.age < 5 %}года{% else %}лет{% endif %}
+
{{ contest_work.age | rupluralize:"год,года,лет" }}