Merge branch 'master' of gitlab.com:lilcity/backend into feature/new-main-page

apps/content/migrations/0028_auto_20190726_0106.py

@@ -0,0 +1,39 @@
+# Generated by Django 2.0.7 on 2019-07-26 01:06
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('content', '0027_auto_20190621_1107'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='banner',
+            name='button_text',
+            field=models.CharField(blank=True, default='', max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='banner',
+            name='main_banner',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(choices=[(1, 'Главная'), (2, 'Курсы'), (3, 'Школа')]), blank=True, default=[], size=None),
+        ),
+        migrations.AlterField(
+            model_name='banner',
+            name='pages',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(choices=[(1, 'Главная'), (2, 'Курсы'), (3, 'Школа')]), blank=True, default=[], size=None),
+        ),
+        migrations.AlterField(
+            model_name='banner',
+            name='text',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AlterField(
+            model_name='banner',
+            name='url',
+            field=models.URLField(blank=True, default=''),
+        ),
+    ]

apps/content/models.py

@@ -153,9 +153,9 @@ class Banner(models.Model):
         (PAGE_SCHOOL, 'Школа'),
     )
 
-    text = models.TextField()
+    text = models.TextField(blank=True, default='')
-    button_text = models.CharField(max_length=50)
+    button_text = models.CharField(max_length=50, blank=True, default='')
-    url = models.URLField()
+    url = models.URLField(blank=True, default='')
     image = models.ImageField()
     use = models.BooleanField(default=False)
     color = models.CharField(max_length=7, blank=True, default='')

apps/school/templates/school/free_lessons.html

@@ -1,6 +1,6 @@
 {% extends "templates/lilcity/index.html" %} {% load static %}
 {% block title %}Месяц открытых дверей в LilCity{% endblock title%}
-{% block ogimage %}http://{{request.META.HTTP_HOST}}{% static 'img/og_camp.jpg' %}{% endblock %}
+{% block ogimage %}http://{{request.META.HTTP_HOST}}{% static 'img/og_free_lessons.jpg' %}{% endblock %}
 {% block ogsite-name %}Первая образовательная онлайн-платформа креативного мышления для детей{% endblock ogsite-name %}
 
 {% block content %}

project/templates/blocks/about.html

@@ -2,7 +2,7 @@
 <div class="section section_flex section_about">
   <div class="section__center center">
     <div class="section__column section__column_img"
-      style="background-image: url(/static/img/child_think.png)">
+      style="background-image: url(/static/img/girl-umbrela.png); background-position: 40% bottom;">
     </div>
     <div class="section__column section__column_text">
       <div class="title">Для кого?</div>

project/templates/blocks/banner.html

@@ -1,62 +1,31 @@
-{% if banner %}
+<div class="banner"
-<div class="banner {% if banner.color %}banner_colored{% endif %} {% if banner.future_date %}banner_countdown{% endif %}"
+     data-banner="{{banner.id}}" style="display: none;
-     data-banner="{{banner.id}}" style="display: none; background-color: {{ banner.color|default:'white' }};">
+    background: {{ banner.color|default:'white' }};
-  <div class="banner__bg" style="
+    {% if banner.color2 %}
-        {% if not request.user_agent.is_mobile or banner.future_date %}
+    background: -moz-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        background-image: url({{ banner.image.url }});
+    background: -webkit-gradient(left top, right bottom, color-stop(0%, {{ banner.color }}), color-stop(100%, {{ banner.color2 }}));
-        {% endif %}
+    background: -webkit-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        {% if request.user_agent.is_mobile and banner.future_date %}
+    background: -o-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        opacity: 0.7;
+    background: -ms-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        {% endif %}
+    background: linear-gradient(135deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        {% if banner.stretch_image %}
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='{{ banner.color }}', endColorstr='{{ banner.color2 }}', GradientType=1 );
-        background-position: center;
+    {% endif %}">
-        background-size: cover;
+    <div class="banner__content">
-        {% else %}
-        background-position: center bottom;
-        {% endif %}"></div>
-  {% if request.user_agent.is_mobile %}
-    {% if not banner.future_date %}
-    <a href="{{ banner.url }}" class="banner__image-wrap">
-      <img class="banner__image" src="{{ banner.image.url }}" />
-    </a>
-    {% endif %}
-  <div class="banner__content">
-    <div class="banner__content-center">
       <div class="banner__text-column">
-        <div class="banner__text">{{ banner.text }}</div>
+        <div class="banner__text">{{ banner.text|safe }}</div>
-        {% if not banner.future_date %}
+        {% if banner.url %}
         <a href="{{ banner.url }}" class="banner__link">{{ banner.button_text }}</a>
         {% endif %}
       </div>
-      {% if banner.future_date %}
+      <div class="banner__image-column">
-      <div class="banner__countdown-column">
+        <img src="{{ banner.image.url }}"/>
-        <div>
+
+        {% if banner.future_date %}
+        <div class="banner__countdown-wrap">
           <div class="banner__countdown-title">До конца акции осталось</div>
           <countdown date="{{ banner.future_date|date:'Y-m-d H:i:s' }}"></countdown>
         </div>
-        <div>
+        {% endif %}
-          <a href="{{ banner.url }}" class="banner__link">{{ banner.button_text }}</a>
-        </div>
-      </div>
-      {% endif %}
-    </div>
-  </div>
-  {% else %}
-  <div class="banner__content">
-    <div class="banner__content-center">
-      <div class="banner__text-column">
-        <div class="banner__text">{{ banner.text }}</div>
-        <a href="{{ banner.url }}" class="banner__link">{{ banner.button_text }}</a>
-      </div>
-      {% if banner.future_date %}
-      <div class="banner__countdown-column">
-        <div class="banner__countdown-title">До конца акции осталось</div>
-        <countdown date="{{ banner.future_date|date:'Y-m-d H:i:s' }}"></countdown>
       </div>
-      {% endif %}
     </div>
-  </div>
-  {% endif %}
-  <a href="#" class="banner__hide">Скрыть{% if not request.user_agent.is_mobile %} баннер{% endif %}</a>
 </div>
-{% endif %}

project/templates/blocks/banners.html

@@ -1,3 +1,4 @@
+{% if banners|length > 1 %}
 <swiper class="banners" :options="{
   effect: 'slide',
   speed: 700,
@@ -9,41 +10,11 @@
   }}">
   {% for banner in banners %}
   <swiper-slide>
-    <div class="banner"
+    {% include 'templates/blocks/banner.html' %}
-     data-banner="{{banner.id}}" style="display: none;
-        background: {{ banner.color|default:'white' }};
-        {% if banner.color2 %}
-        background: -moz-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        background: -webkit-gradient(left top, right bottom, color-stop(0%, {{ banner.color }}), color-stop(100%, {{ banner.color2 }}));
-        background: -webkit-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        background: -o-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        background: -ms-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        background: linear-gradient(135deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='{{ banner.color }}', endColorstr='{{ banner.color2 }}', GradientType=1 );
-        {% endif %}">
-        <div class="banner__content">
-          <div class="banner__text-column">
-            <div class="banner__text">{{ banner.text }}</div>
-            {% if banner.url %}
-            <a href="{{ banner.url }}" class="banner__link mobile-hide">{{ banner.button_text }}</a>
-            {% endif %}
-          </div>
-          <div class="banner__image-column">
-            <img src="{{ banner.image.url }}"/>
-
-            {% if banner.future_date %}
-            <div class="banner__countdown-wrap">
-              <div class="banner__countdown-title">До конца акции осталось</div>
-              <countdown date="{{ banner.future_date|date:'Y-m-d H:i:s' }}"></countdown>
-            </div>
-            {% endif %}
-            {% if banner.url %}
-            <a href="{{ banner.url }}" class="banner__link mobile-show">{{ banner.button_text }}</a>
-            {% endif %}
-          </div>
-        </div>
-    </div>
   </swiper-slide>
   {% endfor %}
   <div class="swiper-pagination" slot="pagination"></div>
 </swiper>
+{% else %}
+  {% include 'templates/blocks/banner.html' with banner=banners.0 %}
+{% endif %}