Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/lil-583

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

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 %}
+<meta property="og:image:height" content="{{ contest_work.image.image.height }}">
+<meta property="og:image:width" content="{{ contest_work.image.image.width }}">
+{% endblock head %}
 
 {% block content %}
 <div class="section" style="padding-bottom: 25px;">
@@ -25,7 +31,7 @@
     <div class="contest-work__info">
       <div class="contest-work__bio">
         <div>{{ contest_work.child_full_name }}</div>
-        <div class="contest-work__age">{{ contest_work.age }} {% if contest_work.age < 5 %}года{% else %}лет{% endif %}</div>
+        <div class="contest-work__age">{{ contest_work.age | rupluralize:"год,года,лет" }}</div>
       </div>
       <div class="contest-work__likes">
         <likes obj-type="contest_work" obj-id="{{ contest_work.id }}"

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()

apps/course/templates/course/course_only_lessons.html

@@ -184,7 +184,7 @@
               <div class="lessons__preview">
                 <div class="lessons__pic-wrapper">
                   <img class="lessons__pic"
-                       src="{% if lesson.cover %}{{ lesson.cover.image.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
+                       src="{% if lesson.cover %}{{ lesson.cover.image_thumbnail.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
                 </div>
               </div>
               <div>
@@ -233,31 +233,7 @@
 </div>
 <div class="section">
   <div class="section__center center center_sm">
-    <div class="share">
-      <div class="share__title">Поделиться курсом</div>
-      <div class="share__list likely">
-        <a class="share__item facebook" href="#">
-          <svg class="icon icon-share-facebook">
-            <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use>
-          </svg>
-        </a>
-        <a class="share__item twitter" href="#">
-          <svg class="icon icon-share-twitter">
-            <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use>
-          </svg>
-        </a>
-        <a class="share__item gplus" href="#">
-          <svg class="icon icon-share-google">
-            <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-google"></use>
-          </svg>
-        </a>
-        <a class="share__item pinterest" href="#">
-          <svg class="icon icon-share-pinterest">
-            <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-pinterest"></use>
-          </svg>
-        </a>
-      </div>
-    </div>
+    {% include 'templates/blocks/share.html' with share_object_name='курсом' %}
   </div>
 </div>
 {% endblock content %}

apps/course/templates/course/lesson.html

@@ -31,7 +31,7 @@
         <div class="lesson__preview">
           <div class="lesson__pic-wrapper">
             <img class="lesson__pic"
-                 src="{% if lesson.cover %}{{ lesson.cover.image.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
+                 src="{% if lesson.cover %}{{ lesson.cover.image_thumbnail.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
           </div>
         </div>
         <div>

apps/payment/templates/payment/payment_success.html

@@ -5,7 +5,7 @@
       {% if school %}
       <div class="done__title title">Вы успешно приобрели доступ к урокам онлайн-школы!</div>
       <div class="done__foot">
-        <a class="done__btn btn btn_md btn_stroke" href="{% url 'user' request.user.id %}">ПЕРЕЙТИ К ШКОЛЕ</a>
+        <a class="done__btn btn btn_md btn_stroke" href="{% url 'school:school' %}">ПЕРЕЙТИ К ШКОЛЕ</a>
       </div>
       {% else %}
       <div class="done__title title">Вы успешно приобрели курс!</div>

apps/payment/views.py

@@ -109,12 +109,15 @@ class SchoolBuyView(TemplateView):
             messages.error(request, 'Ошибка выбора дней недели.')
             return redirect('school:summer-school')
         if add_days:
-            _school_payment = SchoolPayment.objects.get(
+            _school_payment = SchoolPayment.objects.filter(
                 user=request.user,
                 date_start__lte=now().date(),
                 date_end__gte=now().date(),
                 add_days=False,
-            )
+            ).first()
+            if not _school_payment:
+                add_days = False
+        if add_days:
             school_payment = SchoolPayment.objects.create(
                 user=request.user,
                 weekdays=weekdays,
@@ -175,6 +178,7 @@ class PaymentwallCallbackView(View):
     def get(self, request, *args, **kwargs):
         payment_raw_data = request.GET.copy()
         pingback = Pingback(payment_raw_data, self.get_request_ip())
+        september2018 = datetime.date(2018, 9, 1)
 
         if pingback.validate():
             product_type_name, payment_id = pingback.get_product().get_id().split('_')
@@ -223,16 +227,15 @@ class PaymentwallCallbackView(View):
                     ).last()
                     if school_payment:
                         if payment.add_days:
-                            date_start = self.add_months(sourcedate=now().replace(hour=0, minute=0, day=1), months=1)
+                            date_start = now().date()
                             date_end = school_payment.date_end
                         else:
                             date_start = arrow.get(school_payment.date_end, settings.TIME_ZONE).shift(days=1).datetime
                             date_end = arrow.get(date_start, settings.TIME_ZONE).shift(months=1).datetime
                     else:
-                        #month = 0 if now().day >= 1 and now().day <= 10 else 1
-                        # Логика июльского лагеря: до конца июля приобретаем только на текущий месяц
-                        month = 0
-                        date_start = self.add_months(sourcedate=now().replace(hour=0, minute=0, day=1), months=month)
+                        date_start = now().date()
+                        if date_start < september2018:
+                            date_start = september2018
                         date_end = arrow.get(date_start, settings.TIME_ZONE).shift(months=1, minutes=-1).datetime
                     payment.date_start = date_start
                     payment.date_end = date_end

apps/school/models.py

@@ -1,9 +1,10 @@
 import arrow
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, date
 
 from django.conf import settings
 from django.db import models
 from django.urls import reverse_lazy
+from django.utils.functional import cached_property
 from django.utils.timezone import now
 
 from project.mixins import BaseModel, DeactivatedMixin
@@ -50,15 +51,18 @@ class SchoolSchedule(models.Model):
         end_at = datetime.combine(now().today(), self.start_at) + timedelta(hours=1)
         return self.start_at <= now().time() and end_at.time() >= now().time() and self.weekday == now().isoweekday()
 
+    @cached_property
     def current_live_lesson(self):
-        now_time = now()
+        september2018 = date(2018, 9, 1)
+        date_start = max(september2018, now().date())
         live_lesson = LiveLesson.objects.filter(
             date__week_day=self.weekday % 7 + 1,
-            date__range=[now_time.date(), (now_time + timedelta(days=6)).date()],
+            date__range=[date_start, date_start + timedelta(days=6)],
             deactivated_at__isnull=True,
         ).first()
         return live_lesson
 
+    @cached_property
     def previous_live_lesson(self):
         now_time = now()
         live_lesson = LiveLesson.objects.filter(

apps/school/templates/blocks/online.html

@@ -1,7 +1,7 @@
 {% load static %}
 <a class="online" target="_blank" href="https://www.youtube.com/watch?v=PhZ8qQbIej0" style="background-image: url({% static 'img/video-1.jpg' %});">
   <div class="online__center center">
-    <div class="online__type">ПРЯМОЙ ЭФИР</div>
+    <div class="online__type">ВИДЕОУРОКИ</div>
     <div class="online__title">Каждый день в 17.00 (по Мск) </div>
     <div class="online__text text">Кроме выходных. Запись эфира доступна по завершению трансляции</div>
     <div class="online__action">

apps/school/templates/blocks/promo.html

@@ -17,7 +17,7 @@
             <use xlink:href="{% static 'img/sprite.svg' %}#icon-online"></use>
           </svg>
         </div>
-        <div class="school__title">Прямой эфир</div>
+        <div class="school__title">Видеоуроки</div>
         <div class="school__text">С понедельника по&nbsp;пятницу кроме выходных</div>
       </div>
       <div class="school__col">

apps/school/templates/blocks/schedule_item.html

@@ -15,8 +15,6 @@
             {% if live_lesson and live_lesson.title %}
               {% include './open_lesson.html' %}
             {% endif %}
-          {% else %}
-            {% include './day_pay_btn.html' %}
           {% endif %}
         {% endif %}
       </div>

apps/school/templates/school/livelessons_list.html

@@ -9,7 +9,7 @@
     <div class="kit__body">
       <div class="lessons__list">
         {% for livelesson in livelesson_list %}
-        <div class="lessons__item" v-for="(lesson, index) in lessons">
+        <div class="lessons__item">
           <div class="lessons__actions lessons__actions__no-hover">
             <a target="_blank" class="lessons__action" href="{% url 'school:lesson-detail' livelesson.id %}">
               <svg class="icon icon-eye">

apps/school/templates/summer/online.html

@@ -1,9 +1,9 @@
 {% load static %}
 <a class="online" target="_blank" href="https://www.youtube.com/watch?v=PhZ8qQbIej0" style="background-image: url({% static 'img/video-1.jpg' %});">
   <div class="online__center center">
-    <div class="online__type">ПРЯМОЙ ЭФИР</div>
+    <div class="online__type">ВИДЕОУРОКИ</div>
     <div class="online__title">В 17.00 (по Мск) </div>
-    <div class="online__text text">Понедельник, среда, пятница.</div>
+    <div class="online__text text">Каждый день с 1 сентября</div>
     <div class="online__action">
       <svg class="icon icon-play">
         <use xlink:href="{% static 'img/sprite.svg' %}#icon-play"></use>

apps/school/templates/summer/promo.html

@@ -5,7 +5,7 @@
       <span class="main__bold">Lil School</span> — первая образовательная онлайн-платформа креативного мышления для детей
     </div>
     <div class="main__subtitle">
-      Присоединяйтесь в Рисовальный лагерь
+      Присоединяйтесь к школе с 1 сентября
     </div>
     <div class="main__actions">
       <a
@@ -19,7 +19,7 @@
           class="main__btn btn"
           href="#"
         >
-        {% if not is_purchased and not is_purchased_future %}Получить доступ{% endif %}
+        {% if not is_purchased and not is_purchased_future %}Купить доступ от {{ min_school_price }} руб./месяц{% endif %}
         {% if is_purchased_future and not is_purchased %}ваша подписка начинается {{school_purchased_future.date_start}}{% endif %}
         {% if is_purchased %}ваша подписка истекает {{ subscription_ends_humanize }}<br/>перейти к оплате{% endif %}
       </a>
@@ -32,8 +32,8 @@
             <use xlink:href="{% static 'img/sprite.svg' %}#icon-online"></use>
           </svg>
         </div>
-        <div class="school__title">Прямой эфир</div>
-        <div class="school__text">Понедельник, среда, пятница</div>
+        <div class="school__title">Видеоуроки</div>
+        <div class="school__text">Каждый день с 1 сентября</div>
       </div>
       <div class="school__col">
         <div class="school__preview">

apps/school/templates/summer/schedule_purchased.html

@@ -26,14 +26,12 @@
           <div class="casing__title title">Новые уроки</div>
           {% endif %}
 
-          {% comment %}
           <label class="casing__switcher switcher">
             <span class="switcher__wrap">
-              <a href="{% url 'school:summer-school' %}?is_previous=true" class="switcher__item{% if is_previous %} active{% endif %}">запись уроков</a>
-              <a href="{% url 'school:summer-school' %}" class="switcher__item{% if not is_previous %} active{% endif %}">новые уроки</a>
+              <a href="{% url 'school:school' %}?is_previous=true" class="switcher__item{% if is_previous %} active{% endif %}">запись уроков</a>
+              <a href="{% url 'school:school' %}" class="switcher__item{% if not is_previous %} active{% endif %}">новые уроки</a>
             </span>
           </label>
-          {% endcomment %}
         </div>
         {% endif %}
         <div class="casing__timing timing js-timing">

apps/school/urls.py

@@ -3,12 +3,11 @@ from django.urls import path, include
 from .views import (
     LiveLessonsView, LiveLessonEditView,
     LiveLessonsDetailView, SchoolView,
-    SchoolSchedulesPrintView, SummerSchoolView,
+    SchoolSchedulesPrintView,
 )
 
 urlpatterns = [
     path('', SchoolView.as_view(), name='school'),
-    path('summer', SummerSchoolView.as_view(), name='summer-school'),
     path('schedules/print', SchoolSchedulesPrintView.as_view(), name='school_schedules-print'),
     path('lessons/', LiveLessonsView.as_view(), name='lessons'),
     path('lessons/create', LiveLessonEditView.as_view(), name='lessons-create'),

apps/school/views.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, date
 from paymentwall import Pingback
 
 from django.contrib.auth import get_user_model
@@ -34,19 +34,22 @@ class LiveLessonsView(ListView):
     template_name = 'school/livelessons_list.html'
 
     def get_queryset(self):
+        september2018 = date(2018, 9, 1)
+        date_start = (now() - timedelta(days=7)).date()
+        if date_start < september2018:
+            date_start = september2018
         date_range = Q(
             date__range=[
-                (now() - timedelta(days=7)).date(),
-                (now() + timedelta(days=10)).date(),
+                date_start,
+                date_start + timedelta(days=17),
             ]
         )
         queryset = LiveLesson.objects.filter(date_range)
         if queryset.count() < 17:
-            start_date = now() - timedelta(days=7)
             for i in range(18):
                 try:
                     LiveLesson.objects.create(
-                        date=(start_date + timedelta(days=i)).date(),
+                        date=date_start + timedelta(days=i),
                     )
                 except IntegrityError:
                     pass
@@ -61,6 +64,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,
@@ -107,75 +111,8 @@ class LiveLessonEditView(TemplateView):
 
 
 class SchoolView(TemplateView):
-    template_name = 'school/school.html'
-
-    def get_context_data(self):
-        context = super().get_context_data()
-        is_previous = 'is_previous' in self.request.GET
-        date_now = now().date()
-        now_time = now()
-        try:
-            school_schedule = SchoolSchedule.objects.get(weekday=now_time.isoweekday())
-        except SchoolSchedule.DoesNotExist:
-            online = False
-        else:
-            end_at = datetime.combine(now_time.today(), school_schedule.start_at)
-            online = (
-                school_schedule.start_at <= now_time.time() and
-                (end_at + timedelta(hours=1)).time() >= now_time.time() and
-                school_schedule.current_live_lesson()
-            )
-        if self.request.user.is_authenticated:
-            school_payment = SchoolPayment.objects.filter(
-                user=self.request.user,
-                status__in=[
-                    Pingback.PINGBACK_TYPE_REGULAR,
-                    Pingback.PINGBACK_TYPE_GOODWILL,
-                    Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
-                ],
-                date_start__lte=date_now,
-                date_end__gte=date_now
-            )
-            school_payment_exists = school_payment.exists()
-            school_schedules_purchased = school_payment.annotate(
-                joined_weekdays=Func(F('weekdays'), function='unnest',)
-            ).values_list('joined_weekdays', flat=True).distinct()
-        else:
-            school_payment_exists = False
-            school_schedules_purchased = []
-        if school_payment_exists and is_previous:
-            live_lessons = LiveLesson.objects.filter(
-                date__gte=school_payment.last().date_start,
-                date__range=[(now_time - timedelta(days=8)).date(), (now_time - timedelta(days=1)).date()],
-                deactivated_at__isnull=True,
-            )
-            live_lessons_exists = live_lessons.exists()
-        else:
-            live_lessons = None
-            live_lessons_exists = False
-        context.update({
-            'online': online,
-            'live_lessons': live_lessons,
-            'live_lessons_exists': live_lessons_exists,
-            'is_previous': is_previous,
-            'course_items': Course.objects.filter(status=Course.PUBLISHED)[:6],
-            'is_purchased': school_payment_exists,
-            'min_school_price': SchoolSchedule.objects.aggregate(Min('month_price'))['month_price__min'],
-            'school_schedules': SchoolSchedule.objects.all(),
-            'school_schedules_purchased': school_schedules_purchased,
-            'subscription_ends': school_payment.filter(add_days=False).first().date_end if school_payment_exists else None,
-        })
-        return context
-
-class SummerSchoolView(TemplateView):
     template_name = 'school/summer_school.html'
 
-    def get(self, request, *args, **kwargs):
-        context = self.get_context_data(**kwargs)
-        if not context.get('is_purchased'):
-            return redirect('/')
-        return self.render_to_response(context)
-
     def get_context_data(self):
         context = super().get_context_data()
         is_previous = 'is_previous' in self.request.GET
@@ -193,10 +130,14 @@ class SummerSchoolView(TemplateView):
             online = (
                 school_schedule.start_at <= now_time.time() and
                 (end_at + timedelta(hours=1)).time() >= now_time.time() and
-                school_schedule.current_live_lesson()
+                school_schedule.current_live_lesson
             )
 
         school_schedules = SchoolSchedule.objects.all()
+        try:
+            school_schedules = sorted(school_schedules, key=lambda ss: ss.current_live_lesson and ss.current_live_lesson.date)
+        except Exception:
+            pass
         school_schedules_dict = {ss.weekday: ss for ss in school_schedules}
         school_schedules_dict[0] = school_schedules_dict.get(7)
         all_schedules_purchased = []
@@ -250,7 +191,7 @@ class SummerSchoolView(TemplateView):
             school_schedules_purchased = []
         if all_schedules_purchased and is_previous:
             live_lessons = LiveLesson.objects.filter(
-                date__range=[month_start, yesterday],
+                date__range=[yesterday - timedelta(days=7), yesterday],
                 deactivated_at__isnull=True,
                 date__week_day__in=all_schedules_purchased,
             ).order_by('-date')

apps/user/templates/user/profile.html

@@ -64,7 +64,7 @@
   <div class="section__center center">
     <div class="tabs js-tabs">
       <div class="tabs__nav">
-        {# <button class="tabs__btn js-tabs-btn active">ЛАГЕРЬ</button> #}
+        <button class="tabs__btn js-tabs-btn active">ОНЛАЙН-ШКОЛА</button>
         <button class="tabs__btn js-tabs-btn">ПРИОБРЕТЕННЫЕ
           <span class="mobile-hide">КУРСЫ</span>
         </button>
@@ -75,7 +75,6 @@
         {% endif %}
       </div>
       <div class="tabs__container">
-        {% comment %}
         <div class="tabs__item js-tabs-item" style="display: block;">
           {% if is_purchased_future %}
             <div class="center center_xs">
@@ -89,7 +88,7 @@
             {% else %}
             <div class="center center_xs">
               <div class="done">
-                <div class="done__title title">Вы не подписаны на лагерь!</div>
+                <div class="done__title title">Вы не подписаны на онлайн-школу!</div>
                 <div class="done__foot">
                   <a
                     {% if not user.is_authenticated %}
@@ -106,8 +105,7 @@
             {% endif %}
           {% endif %}
         </div>
-        {% endcomment %}
-        <div class="tabs__item js-tabs-item" style="display: block;">
+        <div class="tabs__item js-tabs-item">
           <div class="courses courses_scroll">
             <div class="courses__list">
               {% if paid.exists %}

project/templates/blocks/about.html

@@ -12,8 +12,8 @@
             <use xlink:href="{% static 'img/sprite.svg' %}#icon-online"></use>
           </svg>
         </div>
-        <div class="school__title">Прямой эфир</div>
-        <div class="school__text">Понедельник, среда, пятница</div>
+        <div class="school__title">Видеоуроки</div>
+        <div class="school__text">Каждый день с 1 сентября</div>
       </div>
       <div class="school__col">
         <div class="school__preview">
@@ -44,7 +44,6 @@
       </div>
     </div>
     <div class="letsgo">
-        {% comment %}
         {% if not is_purchased and not is_purchased_future %}
           <a
               {% if not user.is_authenticated %}
@@ -58,7 +57,6 @@
           купить доступ от {{ min_school_price }} руб./месяц
           </a>
         {% endif %}
-        {% endcomment %}
     </div>
   </div>
 </div>

project/templates/blocks/footer.html

@@ -19,7 +19,6 @@
       <div class="footer__col">
         <div class="footer__title">Программы</div>
         <nav class="footer__nav">
-          <a class="footer__link" href="{% url 'school:summer-school' %}">Лагерь</a>
           <a class="footer__link" href="{% url 'school:school' %}">Онлайн-школа</a>
           <a class="footer__link" href="{% url 'courses' %}">Онлайн-курсы</a>
           <a class="footer__link" href="{% url 'author_request' %}">Стать автором</a>

project/templates/blocks/header.html

@@ -25,19 +25,10 @@
           </form>
         </div>
         <nav class="header__nav">
-          {% if is_summer_school_purchased %}
-          <div class="header__group">
-            <a class="header__section {% active_link 'school:summer-school' %}" href="{% url 'school:summer-school' %}?is_previous=true">
-              ЛАГЕРЬ {% if online or livelesson.is_online %}
-              <div class="header__dot"></div>
-              {% endif %}
-            </a>
-          </div>
-          {% endif %}
           <div class="header__group">
             <a class="header__section {% active_link 'school:school' %}" href="{% url 'school:school' %}">
               ОНЛАЙН-ШКОЛА {% if online or livelesson.is_online %}
-              <!--<div class="header__dot"></div>-->
+              <div class="header__dot"></div>
               {% endif %}
             </a>
           </div>

project/templates/blocks/last_courses.html

@@ -2,7 +2,7 @@
 <div class="section section_courses">
   <div class="section__center center">
     <div class="title title_center">Видео-курсы без расписания</div>
-    <div class="text text_courses">Если вам не совсем удобно заниматься с нами в прямом эфире каждый день как в нашей онлайн-школе, специально для вас мы
+    <div class="text text_courses">Если вам не совсем удобно заниматься с нами каждый день в нашей онлайн-школе, специально для вас мы
       делаем отдельные уроки в записи, которые вы можете проходить когда вам будем удобно.</div>
     <div class="head">
       <div class="head__text">Учите и развивайте креативное мышление когда и где угодно</div>

project/templates/blocks/live.html

@@ -1,9 +1,9 @@
 {% load static %}
 <a class="online" target="_blank" href="https://www.youtube.com/watch?v=PhZ8qQbIej0" style="background-image: url({% static 'img/video-1.jpg' %});">
   <div class="online__center center">
-    <div class="online__type">ПРЯМОЙ ЭФИР</div>
+    <div class="online__type">ВИДЕОУРОКИ</div>
     <div class="online__title">В 17.00 (по Мск) </div>
-    <div class="online__text text">Понедельник, среда, пятница.</div>
+    <div class="online__text text">Каждый день с 1 сентября</div>
     <div class="online__action">
       <svg class="icon icon-play">
         <use xlink:href="{% static 'img/sprite.svg' %}#icon-play"></use>

project/templates/blocks/promo.html

@@ -46,7 +46,6 @@
       </div>
     {% else %}
     <div class="main__subtitle">
-      {# Присоединяйтесь в Рисовальный лагерь #}
       Приглашаем вас на месяц открытых дверей в Lil School
     </div>
     <div class="main__actions">
@@ -67,7 +66,6 @@
         </a>
       {% endif %}
       {% endcomment %}
-      {# <a class="main__btn btn btn_white" href="{% url 'school:summer-school' %}">О лагере</a> #}
       <a class="main__btn btn btn_white" href="{% url 'course' pk=50 %}">Подробнее</a>
     </div>
     {% endif %}

project/templates/blocks/share.html

@@ -1,27 +1,14 @@
 {% load static %}
 
+
 <div class="share">
   <div class="share__title">Поделиться {% if share_object_name %}{{ share_object_name }}{% else %}{% if livelesson or lesson %}уроком{% else %}курсом{% endif %}{% endif %}</div>
-  <div class="share__list likely">
-    <a class="share__item facebook" href="#" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
-      <svg class="icon icon-share-facebook">
-        <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use>
-      </svg>
-    </a>
-    <a class="share__item twitter" href="#" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
-      <svg class="icon icon-share-twitter">
-        <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use>
-      </svg>
-    </a>
-    <a class="share__item gplus" href="#" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
-      <svg class="icon icon-share-google">
-        <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-google"></use>
-      </svg>
-    </a>
-    <a class="share__item pinterest" href="#" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
-      <svg class="icon icon-share-pinterest">
-        <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-pinterest"></use>
-      </svg>
-    </a>
+  <div class="share__list likely likely-big" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
+    <div class="twitter"></div>
+    <div class="facebook"></div>
+    <div class="gplus"></div>
+    <div class="vkontakte"></div>
+    <div class="telegram"></div>
+    <div class="pinterest"></div>
   </div>
 </div>

project/templates/lilcity/index.html

@@ -115,6 +115,7 @@
     <noscript><div><img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
     <!-- /Yandex.Metrika counter -->
     {% include "templates/blocks/mixpanel.html" %}
+    {% block head %}{% endblock head %}
   </head>
   <body>
     {% include "templates/blocks/social.html" %}

project/views.py

@@ -36,14 +36,14 @@ class IndexView(TemplateView):
             online = (
                 school_schedule.start_at <= now_time.time() and
                 (end_at + timedelta(hours=1)).time() >= now_time.time() and
-                school_schedule.current_live_lesson()
+                school_schedule.current_live_lesson
             )
             online_coming_soon = (
                 school_schedule.start_at > now_time.time() and
                 (
                     datetime.combine(datetime.today(), school_schedule.start_at) - timedelta(hours=12)
                 ).time() <= now_time.time() and
-                school_schedule.current_live_lesson()
+                school_schedule.current_live_lesson
             )
 
         date_now = now_time.date()

web/src/components/ContestWorks.vue

@@ -1,7 +1,15 @@
 <template>
   <div class="contest-works">
     <div class="contest-works__works">
-      <contest-work v-for="contestWork in contestWorks" :key="contestWork.id" :contest-work="contestWork"></contest-work>
+      <div class="contest-works__column">
+        <contest-work v-for="contestWork in columns[0]" :key="contestWork.id" :contest-work="contestWork"></contest-work>
+      </div>
+      <div class="contest-works__column">
+        <contest-work v-for="contestWork in columns[1]" :key="contestWork.id" :contest-work="contestWork"></contest-work>
+      </div>
+      <div class="contest-works__column">
+        <contest-work v-for="contestWork in columns[2]" :key="contestWork.id" :contest-work="contestWork"></contest-work>
+      </div>
     </div>
     <div v-show="loading" class="contest-works__loader"><div class="loading-loader"></div></div>
     <div v-if="loaded && !contestWorks.length"  class="contest-works__no-works">Здесь вы сможете увидеть работы участников после их добавления</div>
@@ -38,6 +46,18 @@
         });
       }
     },
+    computed: {
+      columns() {
+        const first = [];
+        const second = [];
+        const third = [];
+        for(let i=0; i < this.contestWorks.length; i++) {
+          const work = this.contestWorks[i];
+          [first, second, third][i % 3].push(work);
+        }
+        return [first, second, third];
+      }
+    },
     methods: {
       load() {
         this.loading = true;
@@ -70,9 +90,13 @@
       width: 100%;
     }
     .contest-works__works {
-      column-width: 300px;
-      column-gap: 20px;
       text-align: left;
+      display: flex;
+    }
+    .contest-works__column {
+      display: flex;
+      flex-direction: column;
+      margin-right: 20px;
     }
     .contest-works__loader {
       width: 100%;

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;

web/src/js/app.js

@@ -1,6 +1,8 @@
 /**
  * Входная точка клиентского приложения.
  */
+import 'ilyabirman-likely/release/likely.js';
+import 'ilyabirman-likely/release/likely.css';
 import "./modules/common";
 import "./modules/header";
 import "./modules/search";