LIL-701

apps/config/migrations/0012_auto_20181210_1729.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.0.7 on 2018-12-10 17:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('config', '0011_config_main_page_video_url'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='config',
+            name='SERVICE_OK_URL',
+            field=models.URLField(default='#', max_length=126),
+        ),
+        migrations.AddField(
+            model_name='config',
+            name='SERVICE_VK_URL',
+            field=models.URLField(default='#', max_length=126),
+        ),
+    ]

apps/config/models.py

@@ -10,6 +10,8 @@ class Config(models.Model):
     SERVICE_INSTAGRAM_URL = models.URLField(max_length=126, default='#')
     SERVICE_TWITTER_URL = models.URLField(max_length=126, default='#')
     SERVICE_FB_URL = models.URLField(max_length=126, default='#')
+    SERVICE_VK_URL = models.URLField(max_length=126, default='#')
+    SERVICE_OK_URL = models.URLField(max_length=126, default='#')
     SERVICE_YOUTUBE_URL = models.URLField(max_length=126, default='#')
     SERVICE_TELEGRAM_CHANNEL = models.URLField(max_length=126, default='https://t.me/lilschool')
     SERVICE_COMMISSION = models.IntegerField(default=10)

project/templates/blocks/footer.html

@@ -10,40 +10,54 @@
       <div class="footer__col">
         <div class="footer__title">Продукты</div>
         <nav class="footer__nav">
-          <a class="footer__link" href="{% url 'school:school' %}">Онлайн-школа</a>
+          <div>
-          <a class="footer__link" href="{% url 'courses' %}">Видео-курсы</a>
+            <a class="footer__link" href="{% url 'school:school' %}">Онлайн-школа</a>
-          <a class="footer__link" href="https://blog.lil.school">Блог</a>
+            <a class="footer__link" href="{% url 'courses' %}">Видео-курсы</a>
-          <a class="footer__link" href="/courses/?category=14">Метод. пособия</a>
+            <a class="footer__link" href="https://blog.lil.school">Блог</a>
-          <!--<a class="footer__link" href="#TODO">Бонусная система</a>-->
+          </div>
-          <a class="footer__link" href="/#game">Мобильные приложения</a>
+          <div>
+            <a class="footer__link" href="/courses/?category=14">Метод. пособия</a>
+            <!--<a class="footer__link" href="#TODO">Бонусная система</a>-->
+            <a class="footer__link" href="/#game">Мобильные приложения</a>
+          </div>
         </nav>
       </div>
       <div class="footer__col">
         <div class="footer__title">КОМПАНИЯ</div>
         <nav class="footer__nav">
-          <a class="footer__link" href="{% url 'about' %}">О&nbsp;нас</a>
+          <div>
-          <a class="footer__link" href="/#teachers">Преподаватели</a>
+            <a class="footer__link" href="{% url 'about' %}">О&nbsp;нас</a>
-          <a class="footer__link" href="{% url 'author_request' %}">Стать автором</a>
+            <a class="footer__link" href="/#teachers">Преподаватели</a>
-          <a class="footer__link" target="_blank" href="https://drive.google.com/drive/folders/1g14ExvB9X_8ZsES6XkNzkTY3QrZm2WgT?usp=sharing">Медиа-кит</a>
+            <a class="footer__link" href="{% url 'author_request' %}">Стать автором</a>
-          <a class="footer__link" href="{% url 'terms' %}">Договор-оферта</a>
+            <a class="footer__link" target="_blank" href="https://drive.google.com/drive/folders/1g14ExvB9X_8ZsES6XkNzkTY3QrZm2WgT?usp=sharing">Медиа-кит</a>
-          <a class="footer__link" href="{% url 'refund_policy' %}">Политика возврата</a>
+          </div>
-          <a class="footer__link" href="{% url 'privacy' %}">Политика обработки персональных&nbsp;данных</a>
+          <div>
+            <a class="footer__link" href="{% url 'terms' %}">Договор-оферта</a>
+            <a class="footer__link" href="{% url 'refund_policy' %}">Политика возврата</a>
+            <a class="footer__link" href="{% url 'privacy' %}">Политика обработки персональных&nbsp;данных</a>
+          </div>
         </nav>
       </div>
       <div class="footer__col">
         <div class="footer__title">Контакты</div>
-        <a class="footer__link" href="{{ config.SERVICE_INSTAGRAM_URL }}">Instagram</a>
+        <nav class="footer__nav">
-        <a class="footer__link" href="{{ config.SERVICE_FB_URL }}">Facebook</a>
+          <div>
-        <a class="footer__link" href="{{ config.SERVICE_YOUTUBE_URL }}">YouTube</a>
+            {% if config.SERVICE_INSTAGRAM_URL != '#' %}<a class="footer__link" href="{{ config.SERVICE_INSTAGRAM_URL }}">Instagram</a>{% endif %}
-        <a class="footer__link" href="{{ config.SERVICE_TWITTER_URL }}">Twitter</a>
+            {% if config.SERVICE_FB_URL != '#' %}<a class="footer__link" href="{{ config.SERVICE_FB_URL }}">Facebook</a>{% endif %}
-        <!--<a class="footer__link" href="{{ config.SERVICE_FB_URL }}">Odnoklassniki</a>-->
+            {% if config.SERVICE_YOUTUBE_URL != '#' %}<a class="footer__link" href="{{ config.SERVICE_YOUTUBE_URL }}">YouTube</a>{% endif %}
-        <!--<a class="footer__link" href="{{ config.SERVICE_FB_URL }}">VKontakte</a>-->
+            {% if config.SERVICE_TWITTER_URL != '#' %}<a class="footer__link" href="{{ config.SERVICE_TWITTER_URL }}">Twitter</a>{% endif %}
-        <a class="footer__link" href='mailto:school@lil.city'>Email по&nbsp;общим вопросам</a>
+          </div>
-        <a class="footer__link" href='mailto:partnership@lil.city'>Сотрудничество</a>
+          <div>
+            {% if config.SERVICE_OK_URL != '#' %}<a class="footer__link" href="{{ config.SERVICE_OK_URL }}">Odnoklassniki</a>{% endif %}
+            {% if config.SERVICE_VK_URL != '#' %}<a class="footer__link" href="{{ config.SERVICE_VK_URL }}">VKontakte</a>{% endif %}
+            <a class="footer__link" href='mailto:school@lil.city'>Email по&nbsp;общим вопросам</a>
+            <a class="footer__link" href='mailto:partnership@lil.city'>Сотрудничество</a>
+          </div>
+        </nav>
       </div>
     </div>
     <div class="footer__row footer__row_second">
-      <div class="footer__col footer__col_md"></div>
+      <div class="footer__col footer__col_md mobile-hide"></div>
       <div class="footer__col footer__col_md">
         <div>Подписаться на&nbsp;самую интересную рассылку на&nbsp;планете</div>
         <form class="subscribe" method="post" action="{% url 'subscribe' %}">

web/src/js/modules/common.js

@@ -86,7 +86,7 @@ $(document).ready(function () {
     }
 
     const checkScroll = e => {
-        const scrollTop = $(window).scrollTop();
+        const scrollTop = window.pageYOffset;
         const reviewsTop = $reviews[0].offsetTop;
         if(scrollTop + window.innerHeight > reviewsTop - 200 && scrollTop < reviewsTop + reviewsHeight){
             if(! reviewsScrollInterval){

web/src/sass/_common.sass

@@ -1971,41 +1971,20 @@ a.grey-link
     display: flex
     margin: 0 -10px 50px
     flex-wrap: wrap
+    +m
+      flex-direction: column
+      margin: 0 0 10px
   &__col
     flex: 0 0 25%
-  &__row_first &__col
+    +t
-    &:nth-child(2)
+      margin: 10px
-      +t
-        order: 1
-    &:nth-child(3)
-      +t
-        order: 2
-    &:nth-child(4)
-      +t
-        order: 3
-      +m
-        margin-top: 30px
-        flex: 0 0 100%
-    &:nth-child(1)
-      +t
-        flex: 0 0 59%
-        order: 4
-      +m
-        flex: 0 0 100%
-        order: 5
-    &:nth-child(5)
-      +t
-        flex: 0 0 41%
-        order: 5
-      +m
-        flex: 0 0 100%
-        order: 4
-    &:nth-child(1),
-    &:nth-child(5)
-      +t
-        margin-top: 40px
   &__row_second &__col:nth-child(2)
       flex: 1
+  &__nav
+    +m
+      display: flex
+  &__nav > div
+    flex: 50%
   &__logo
     width: 188px
     height: 58px
@@ -2058,11 +2037,13 @@ a.grey-link
     margin: 0 10px
   &__copyright
     margin-top: 50px
+    margin-bottom: 20px
     font-size: 14px
     color: $gray
 
 .subscribe
   margin-top: 10px
+  display: flex
   &__btn
     height: 40px
     width: 220px
@@ -2074,6 +2055,8 @@ a.grey-link
     text-align: center
     margin-right: 20px
     background: $bg
+    +m
+      margin-right: 0
 
 .socials
   display: flex