diff --git a/api/v1/serializers/config.py b/api/v1/serializers/config.py index e494f861..d2f199bd 100644 --- a/api/v1/serializers/config.py +++ b/api/v1/serializers/config.py @@ -9,6 +9,8 @@ class ConfigSerializer(serializers.ModelSerializer): SERVICE_TWITTER_URL = serializers.URLField(required=False) SERVICE_FB_URL = serializers.URLField(required=False) SERVICE_YOUTUBE_URL = serializers.URLField(required=False) + SERVICE_OK_URL = serializers.URLField(required=False) + SERVICE_VK_URL = serializers.URLField(required=False) SERVICE_TELEGRAM_CHANNEL = serializers.URLField(required=False) SERVICE_COMMISSION = serializers.IntegerField(required=False) SERVICE_DISCOUNT_MIN_AMOUNT = serializers.IntegerField(required=False) @@ -22,6 +24,7 @@ class ConfigSerializer(serializers.ModelSerializer): # MAIN_PAGE_TOP_IMAGE = serializers.ImageField(required=False, allow_null=True) REFERRER_BONUS = serializers.IntegerField() REFERRAL_BONUS = serializers.IntegerField() + MAIN_PAGE_VIDEO_URL = serializers.CharField(required=False) class Meta: model = Config @@ -29,6 +32,8 @@ class ConfigSerializer(serializers.ModelSerializer): 'SERVICE_INSTAGRAM_URL', 'SERVICE_TWITTER_URL', 'SERVICE_FB_URL', + 'SERVICE_OK_URL', + 'SERVICE_VK_URL', 'SERVICE_YOUTUBE_URL', 'SERVICE_TELEGRAM_CHANNEL', 'SERVICE_COMMISSION', @@ -41,6 +46,7 @@ class ConfigSerializer(serializers.ModelSerializer): 'MAIN_PAGE_TOP_IMAGE', 'REFERRER_BONUS', 'REFERRAL_BONUS', + 'MAIN_PAGE_VIDEO_URL', ) def get_SCHOOL_LOGO_IMAGE(self, config): diff --git a/apps/config/migrations/0011_config_main_page_video_url.py b/apps/config/migrations/0011_config_main_page_video_url.py new file mode 100644 index 00000000..6194f53f --- /dev/null +++ b/apps/config/migrations/0011_config_main_page_video_url.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.7 on 2018-12-03 18:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('config', '0010_auto_20180820_0853'), + ] + + operations = [ + migrations.AddField( + model_name='config', + name='MAIN_PAGE_VIDEO_URL', + field=models.URLField(default='https://www.youtube.com/embed/1w3amQGtQyc', max_length=126), + ), + ] diff --git a/apps/config/migrations/0012_auto_20181210_1729.py b/apps/config/migrations/0012_auto_20181210_1729.py new file mode 100644 index 00000000..b3147779 --- /dev/null +++ b/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), + ), + ] diff --git a/apps/config/models.py b/apps/config/models.py index 498dd00f..d6fed883 100644 --- a/apps/config/models.py +++ b/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) @@ -19,6 +21,7 @@ class Config(models.Model): MAIN_PAGE_TOP_IMAGE = models.ImageField(null=True, blank=True) REFERRER_BONUS = models.IntegerField(default=10) REFERRAL_BONUS = models.IntegerField(default=10) + MAIN_PAGE_VIDEO_URL = models.URLField(max_length=126, default='https://www.youtube.com/embed/1w3amQGtQyc') def save(self, *args, **kwargs): self.pk = 1 diff --git a/project/templates/blocks/about.html b/project/templates/blocks/about.html index 9d285f6c..d86d6cf7 100644 --- a/project/templates/blocks/about.html +++ b/project/templates/blocks/about.html @@ -1,48 +1,48 @@ {% load static %}
+
+
+
+

Вы житель мегаполиса и у вас нет времени дополнительно развивать своего ребенка? + Или вы живете в маленьком городе, + где нет качественных школ и секций для детей?

+

Lil School это решение для тех родителей, кто стремится дать лучшее своему ребенку. + Учитесь не выходя из дома!

+
+
+
+
- + +
Lil School в цифрах
-
+
-
- - - -
-
Видеоуроки
-
Каждый день
+
> 12000
+
учеников
+
прошли обучение в Lil School
-
- - - +
{{ works_count }}
+
работ
+
+ создано учениками Lil School.
+ Большую часть из них легко найти в инстаграм
-
В 17:00
-
По московскому времени
-
- - - -
-
7 дисциплин
-
В разных техниках
+
32
+
страны
+
где живут талантливые ученики Lil School
-
- - - -
-
Запись эфира
-
Хранится 7 дней
+
107
+
городов
+
со всего мира со счастливыми учениками Lil School
-
+
Часто задаваемые вопросы
diff --git a/project/templates/blocks/footer.html b/project/templates/blocks/footer.html index 14ebdebb..b1d37518 100644 --- a/project/templates/blocks/footer.html +++ b/project/templates/blocks/footer.html @@ -4,83 +4,71 @@
-
Первая онлайн-школа креативного мышления Lil School
+
Lil School – первая образовательная онлайн-платформа креативного мышления + для детей 5+
-
КОМПАНИЯ
+
Продукты
-
Программы
+
КОМПАНИЯ
Контакты
-
Общие вопросы: - school@lil.city -
-
Сотрудничество: - partnership@lil.city -
-
-
-
ПОДПИСАТЬСЯ НА НОВОСТИ
- - +
-
-
- - - - - - - - - - - - - - - - - - - - -
-
-
-
-
{% now 'Y' %} © Lil City, UAB.
-
- Договор-оферта -
|
- Политика обработки персональных данных -
|
- Политика возврата -
+
+
+
Подписаться на самую интересную рассылку на планете
+ +
+ Все права защищены © Lil City, UAB. Все материалы принадлежат компании Lil City, UAB.
+ Никакая из частей этого сайта, текстов или изображений, не может быть скопирована, использована или передана + на электронных, физических и других носителях без письменного согласия компании Lil City.
diff --git a/project/templates/blocks/gallery.html b/project/templates/blocks/gallery.html index 9a8c634a..5aedaa48 100644 --- a/project/templates/blocks/gallery.html +++ b/project/templates/blocks/gallery.html @@ -5,9 +5,8 @@
Галерея
-

Тысячи шедевров уже созданы благодаря Lil School. Более 10000 работ можно - увидеть в Инстаграм

- +

Тысячи шедевров уже созданы благодаря Lil School. Более 10000 работ можно + увидеть в Инстаграм

diff --git a/project/templates/blocks/last_courses.html b/project/templates/blocks/last_courses.html index e76270ac..1ef6f488 100644 --- a/project/templates/blocks/last_courses.html +++ b/project/templates/blocks/last_courses.html @@ -1,17 +1,16 @@ {% load static %} {% if course_items %}
-
Видео-курсы без расписания
-
Если вам не совсем удобно заниматься с нами каждый день в нашей онлайн-школе, специально для вас мы - делаем отдельные уроки в записи, которые вы можете проходить, когда вам будет удобно.

- Учите и развивайте креативное мышление когда и где угодно +
Онлайн-курсы
+
Помимо школы у нас есть углубленные видео-курсы на разные темы для тех, + кто хочет стать настоящим профессионалом
{% include "course/course_items.html" %}
-
- Узнать подробнее +
+ Подробнее о видео-курсах
diff --git a/project/templates/blocks/messages.html b/project/templates/blocks/messages.html index 9702c39d..1455209d 100644 --- a/project/templates/blocks/messages.html +++ b/project/templates/blocks/messages.html @@ -1,5 +1,5 @@ {% if messages %} -
+
{% for message in messages %}
{{ message }}
diff --git a/project/templates/blocks/mobile_apps.html b/project/templates/blocks/mobile_apps.html index 0227f9e7..cb9e085a 100644 --- a/project/templates/blocks/mobile_apps.html +++ b/project/templates/blocks/mobile_apps.html @@ -17,7 +17,7 @@
- +
diff --git a/project/templates/blocks/online_school.html b/project/templates/blocks/online_school.html new file mode 100644 index 00000000..0353982c --- /dev/null +++ b/project/templates/blocks/online_school.html @@ -0,0 +1,28 @@ +
+
+
Процесс
+
+ Онлайн-образование — это очень удобно! Можете учиться в пижаме, без макияжа + и с огурцами на лице!) +
+
+
+
Видеоуроки
+
Каждый день!
+
+
+
В 17:00
+
По московскому времени
+
+
+
7 дисциплин
+
В разных техниках
+
+
+
Запись эфира
+
Хранится 7 дней
+
+
+
+
+
diff --git a/project/templates/blocks/partners.html b/project/templates/blocks/partners.html index ad3041bc..ca19eaba 100644 --- a/project/templates/blocks/partners.html +++ b/project/templates/blocks/partners.html @@ -8,32 +8,35 @@ Скидка 15% по промокоду у наших партнеров
- - - - - - - - - - - - -
-
+ + +
LIL
+ + +
LILCITY
+ + +
LILCITY
+ + +
LILCITY
+
+ + + +
diff --git a/project/templates/blocks/promo.html b/project/templates/blocks/promo.html index 1dcb87d2..f438e36f 100644 --- a/project/templates/blocks/promo.html +++ b/project/templates/blocks/promo.html @@ -69,7 +69,7 @@ Подарить другу {% else %} - Подробнее + Подробнее {% endif %}
{% endif %} diff --git a/project/templates/blocks/reviews.html b/project/templates/blocks/reviews.html index 33a1d8d8..7e9b1c12 100644 --- a/project/templates/blocks/reviews.html +++ b/project/templates/blocks/reviews.html @@ -1,50 +1,20 @@ {% load static %} -
-
- -
Отзывы
- -
Мы получаем сотни тёплых отзывов от довольных родителей. Их можно почитать - здесь;) -
-
-
-
- -
-
-
@redanna333
-
Мой ребёнок зарисовал!!! Хотя, я и не ставила таких глобальных целей, участвуя в этом лагере, просто занять дитё - чем-то творческим хоть иногда, но он реально рисует, сам, и не надо приглашать и уговаривать, просто берёт и - рисует) Спасибо, Саша, от всей души) Надеемся на встречу в школе)
-
-
-
-
- -
-
-
@redanna333
-
Саша, огромное спасибо за ещё одну возможность погружения в удивительный мир Ваших уроков! С начала первого летнего - лагеря и до сегодняшнего дня, был запущен творческий круговорот разных идей, по заданиям и просто так)). На самом - деле, удивительная способность, находясь далеко, по другую сторону экрана, создавать уникальный контакт присутствия - рядом, будто в одной комнате и давно знакомы). И ещё одно важное качество- быть на стороне ребёнка в непростом - творческом процессе- моя дочь, слушая Ваше задание, расправляет "крылья", не боясь оценочного мнения , а сосредоточившись - на задаче)). P.S В школу идём без сомнений!
-
+
+
+
+ +
Отзывы о Lil School
+ +
Тёплых отзывов настолько много, что потребуется несколько суток, чтобы их просмотреть + и несколько месяцев чтобы прочитать.
+ P.S.: Но мы читаем их все!)
-
-
- -
-
-
@redanna333
-
Саша, 👋 Вы потрясающе четко и качественно можете объяснить задание урока! Дети настолько увлекаются процессом, - что взрослые и сами включаются в эту интересную игру ТВОРЧЕСТВО! Спасибо Вам за Вдохновение, Любовь и желание - творить Чудеса! Темыч теперь легко может начать рисовать "трудные" картинки, потому что тетя Саша сказала: "все - состоит из простых форм!" Теперь это наш девиз) главное ушёл страх, что не выйдет ПРАВИЛЬНО, потому что нет ограничений - и правил в творчестве😜🙌надеемся на скорую встречу!!!
-
+
+
+
+ {% for review_image in review_images|slice:":10" %} + + {% endfor %}
diff --git a/project/templates/blocks/video.html b/project/templates/blocks/video.html index efa0b43c..33b3a4f1 100644 --- a/project/templates/blocks/video.html +++ b/project/templates/blocks/video.html @@ -1,12 +1,13 @@
- +
Много развивающих видео на нашем YouTube канале
diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html index 27561352..2bd38646 100644 --- a/project/templates/lilcity/main.html +++ b/project/templates/lilcity/main.html @@ -17,9 +17,12 @@ {% include "templates/blocks/arts.html" %} {% include "templates/blocks/video.html" %} {% include "templates/blocks/about.html" %} - {% include "templates/blocks/last_courses.html" %} {% include "templates/blocks/gallery.html" %} + {% include "templates/blocks/mobile_apps.html" %} + {% include "templates/blocks/online_school.html" %} + {% include "templates/blocks/reviews.html" %} {% include "templates/blocks/teachers.html" %} - {% include "templates/blocks/game.html" %} + {% include "templates/blocks/last_courses.html" %} {% include "templates/blocks/partners.html" %} + {% include "templates/blocks/game.html" %} {% endblock content %} diff --git a/project/views.py b/project/views.py index d563f0c6..7404e317 100644 --- a/project/views.py +++ b/project/views.py @@ -1,4 +1,5 @@ from datetime import datetime, timedelta +from random import shuffle import short_url from django.db.models import Min, Func, F @@ -9,7 +10,7 @@ from paymentwall.pingback import Pingback from apps.course.models import Course from apps.school.models import SchoolSchedule -from apps.payment.models import SchoolPayment, UserGiftCertificate +from apps.payment.models import SchoolPayment, UserGiftCertificate, Payment User = get_user_model() @@ -85,7 +86,11 @@ class IndexView(TemplateView): except: user_gift_certificate = None + review_images = list(map(str, range(1, 107))) + shuffle(review_images) + context.update({ + 'review_images': review_images, 'gift_certificate': user_gift_certificate.gift_certificate if user_gift_certificate else None, 'user_gift_certificate': user_gift_certificate, 'is_gift_certificate_url': bool(user_gift_certificate), @@ -100,6 +105,7 @@ class IndexView(TemplateView): 'school_schedules': SchoolSchedule.objects.all(), 'school_schedules_purchased': set(school_schedules_purchased), 'teachers': User.objects.filter(role=User.TEACHER_ROLE, show_in_mainpage=True), + 'works_count': Payment.objects.filter(status__in=Payment.PW_PAID_STATUSES).count() * 5, 'subscription_ends': school_payment.filter(add_days=False).first().date_end if school_payment_exists else None, 'subscription_ends_humanize': school_payment.filter(add_days=False).first().date_end_humanize if school_payment_exists else None, diff --git a/web/src/img/gamma.png b/web/src/img/gamma.png new file mode 100644 index 00000000..14b31153 Binary files /dev/null and b/web/src/img/gamma.png differ diff --git a/web/src/img/reviews/1.png b/web/src/img/reviews/1.png new file mode 100644 index 00000000..0b6741fc Binary files /dev/null and b/web/src/img/reviews/1.png differ diff --git a/web/src/img/reviews/10.png b/web/src/img/reviews/10.png new file mode 100644 index 00000000..f3a2a6d2 Binary files /dev/null and b/web/src/img/reviews/10.png differ diff --git a/web/src/img/reviews/100.png b/web/src/img/reviews/100.png new file mode 100644 index 00000000..656269e9 Binary files /dev/null and b/web/src/img/reviews/100.png differ diff --git a/web/src/img/reviews/101.png b/web/src/img/reviews/101.png new file mode 100644 index 00000000..90019054 Binary files /dev/null and b/web/src/img/reviews/101.png differ diff --git a/web/src/img/reviews/102.png b/web/src/img/reviews/102.png new file mode 100644 index 00000000..99c81560 Binary files /dev/null and b/web/src/img/reviews/102.png differ diff --git a/web/src/img/reviews/103.png b/web/src/img/reviews/103.png new file mode 100644 index 00000000..05226418 Binary files /dev/null and b/web/src/img/reviews/103.png differ diff --git a/web/src/img/reviews/104.png b/web/src/img/reviews/104.png new file mode 100644 index 00000000..a49aac56 Binary files /dev/null and b/web/src/img/reviews/104.png differ diff --git a/web/src/img/reviews/105.png b/web/src/img/reviews/105.png new file mode 100644 index 00000000..47528e3b Binary files /dev/null and b/web/src/img/reviews/105.png differ diff --git a/web/src/img/reviews/106.png b/web/src/img/reviews/106.png new file mode 100644 index 00000000..95d91445 Binary files /dev/null and b/web/src/img/reviews/106.png differ diff --git a/web/src/img/reviews/11.png b/web/src/img/reviews/11.png new file mode 100644 index 00000000..089a9f1e Binary files /dev/null and b/web/src/img/reviews/11.png differ diff --git a/web/src/img/reviews/12.png b/web/src/img/reviews/12.png new file mode 100644 index 00000000..10267fc7 Binary files /dev/null and b/web/src/img/reviews/12.png differ diff --git a/web/src/img/reviews/13.png b/web/src/img/reviews/13.png new file mode 100644 index 00000000..056a49bb Binary files /dev/null and b/web/src/img/reviews/13.png differ diff --git a/web/src/img/reviews/14.png b/web/src/img/reviews/14.png new file mode 100644 index 00000000..b8701400 Binary files /dev/null and b/web/src/img/reviews/14.png differ diff --git a/web/src/img/reviews/15.png b/web/src/img/reviews/15.png new file mode 100644 index 00000000..d4d9c157 Binary files /dev/null and b/web/src/img/reviews/15.png differ diff --git a/web/src/img/reviews/16.png b/web/src/img/reviews/16.png new file mode 100644 index 00000000..a97c50b8 Binary files /dev/null and b/web/src/img/reviews/16.png differ diff --git a/web/src/img/reviews/17.png b/web/src/img/reviews/17.png new file mode 100644 index 00000000..d9612904 Binary files /dev/null and b/web/src/img/reviews/17.png differ diff --git a/web/src/img/reviews/18.png b/web/src/img/reviews/18.png new file mode 100644 index 00000000..45c70b8b Binary files /dev/null and b/web/src/img/reviews/18.png differ diff --git a/web/src/img/reviews/19.png b/web/src/img/reviews/19.png new file mode 100644 index 00000000..33af16da Binary files /dev/null and b/web/src/img/reviews/19.png differ diff --git a/web/src/img/reviews/2.png b/web/src/img/reviews/2.png new file mode 100644 index 00000000..70fcdfc1 Binary files /dev/null and b/web/src/img/reviews/2.png differ diff --git a/web/src/img/reviews/20.png b/web/src/img/reviews/20.png new file mode 100644 index 00000000..6084069d Binary files /dev/null and b/web/src/img/reviews/20.png differ diff --git a/web/src/img/reviews/21.png b/web/src/img/reviews/21.png new file mode 100644 index 00000000..b5df8d32 Binary files /dev/null and b/web/src/img/reviews/21.png differ diff --git a/web/src/img/reviews/22.png b/web/src/img/reviews/22.png new file mode 100644 index 00000000..ae44a52f Binary files /dev/null and b/web/src/img/reviews/22.png differ diff --git a/web/src/img/reviews/23.png b/web/src/img/reviews/23.png new file mode 100644 index 00000000..b9054f66 Binary files /dev/null and b/web/src/img/reviews/23.png differ diff --git a/web/src/img/reviews/24.png b/web/src/img/reviews/24.png new file mode 100644 index 00000000..c045f290 Binary files /dev/null and b/web/src/img/reviews/24.png differ diff --git a/web/src/img/reviews/25.png b/web/src/img/reviews/25.png new file mode 100644 index 00000000..c2351089 Binary files /dev/null and b/web/src/img/reviews/25.png differ diff --git a/web/src/img/reviews/26.png b/web/src/img/reviews/26.png new file mode 100644 index 00000000..6472e524 Binary files /dev/null and b/web/src/img/reviews/26.png differ diff --git a/web/src/img/reviews/27.png b/web/src/img/reviews/27.png new file mode 100644 index 00000000..ac67ad03 Binary files /dev/null and b/web/src/img/reviews/27.png differ diff --git a/web/src/img/reviews/28.png b/web/src/img/reviews/28.png new file mode 100644 index 00000000..9d2bd24c Binary files /dev/null and b/web/src/img/reviews/28.png differ diff --git a/web/src/img/reviews/29.png b/web/src/img/reviews/29.png new file mode 100644 index 00000000..298259a7 Binary files /dev/null and b/web/src/img/reviews/29.png differ diff --git a/web/src/img/reviews/3.png b/web/src/img/reviews/3.png new file mode 100644 index 00000000..f29723f9 Binary files /dev/null and b/web/src/img/reviews/3.png differ diff --git a/web/src/img/reviews/30.png b/web/src/img/reviews/30.png new file mode 100644 index 00000000..8ef664d4 Binary files /dev/null and b/web/src/img/reviews/30.png differ diff --git a/web/src/img/reviews/31.png b/web/src/img/reviews/31.png new file mode 100644 index 00000000..9cf7e279 Binary files /dev/null and b/web/src/img/reviews/31.png differ diff --git a/web/src/img/reviews/32.png b/web/src/img/reviews/32.png new file mode 100644 index 00000000..a2a95abd Binary files /dev/null and b/web/src/img/reviews/32.png differ diff --git a/web/src/img/reviews/33.png b/web/src/img/reviews/33.png new file mode 100644 index 00000000..c65cab77 Binary files /dev/null and b/web/src/img/reviews/33.png differ diff --git a/web/src/img/reviews/34.png b/web/src/img/reviews/34.png new file mode 100644 index 00000000..48c2b939 Binary files /dev/null and b/web/src/img/reviews/34.png differ diff --git a/web/src/img/reviews/35.png b/web/src/img/reviews/35.png new file mode 100644 index 00000000..59f8f6f7 Binary files /dev/null and b/web/src/img/reviews/35.png differ diff --git a/web/src/img/reviews/36.png b/web/src/img/reviews/36.png new file mode 100644 index 00000000..e99fbd7c Binary files /dev/null and b/web/src/img/reviews/36.png differ diff --git a/web/src/img/reviews/37.png b/web/src/img/reviews/37.png new file mode 100644 index 00000000..164cb64d Binary files /dev/null and b/web/src/img/reviews/37.png differ diff --git a/web/src/img/reviews/38.png b/web/src/img/reviews/38.png new file mode 100644 index 00000000..8d4efc42 Binary files /dev/null and b/web/src/img/reviews/38.png differ diff --git a/web/src/img/reviews/39.png b/web/src/img/reviews/39.png new file mode 100644 index 00000000..cec63354 Binary files /dev/null and b/web/src/img/reviews/39.png differ diff --git a/web/src/img/reviews/4.png b/web/src/img/reviews/4.png new file mode 100644 index 00000000..2b73e32f Binary files /dev/null and b/web/src/img/reviews/4.png differ diff --git a/web/src/img/reviews/40.png b/web/src/img/reviews/40.png new file mode 100644 index 00000000..36e5b543 Binary files /dev/null and b/web/src/img/reviews/40.png differ diff --git a/web/src/img/reviews/41.png b/web/src/img/reviews/41.png new file mode 100644 index 00000000..ae1b1171 Binary files /dev/null and b/web/src/img/reviews/41.png differ diff --git a/web/src/img/reviews/42.png b/web/src/img/reviews/42.png new file mode 100644 index 00000000..f48e55e1 Binary files /dev/null and b/web/src/img/reviews/42.png differ diff --git a/web/src/img/reviews/43.png b/web/src/img/reviews/43.png new file mode 100644 index 00000000..08b7c93b Binary files /dev/null and b/web/src/img/reviews/43.png differ diff --git a/web/src/img/reviews/44.png b/web/src/img/reviews/44.png new file mode 100644 index 00000000..428756ee Binary files /dev/null and b/web/src/img/reviews/44.png differ diff --git a/web/src/img/reviews/45.png b/web/src/img/reviews/45.png new file mode 100644 index 00000000..96358eee Binary files /dev/null and b/web/src/img/reviews/45.png differ diff --git a/web/src/img/reviews/46.png b/web/src/img/reviews/46.png new file mode 100644 index 00000000..7c45140b Binary files /dev/null and b/web/src/img/reviews/46.png differ diff --git a/web/src/img/reviews/47.png b/web/src/img/reviews/47.png new file mode 100644 index 00000000..3feaf28c Binary files /dev/null and b/web/src/img/reviews/47.png differ diff --git a/web/src/img/reviews/48.png b/web/src/img/reviews/48.png new file mode 100644 index 00000000..d7d943ba Binary files /dev/null and b/web/src/img/reviews/48.png differ diff --git a/web/src/img/reviews/49.png b/web/src/img/reviews/49.png new file mode 100644 index 00000000..7c78a605 Binary files /dev/null and b/web/src/img/reviews/49.png differ diff --git a/web/src/img/reviews/5.png b/web/src/img/reviews/5.png new file mode 100644 index 00000000..08320aea Binary files /dev/null and b/web/src/img/reviews/5.png differ diff --git a/web/src/img/reviews/50.png b/web/src/img/reviews/50.png new file mode 100644 index 00000000..da8b2ac6 Binary files /dev/null and b/web/src/img/reviews/50.png differ diff --git a/web/src/img/reviews/51.png b/web/src/img/reviews/51.png new file mode 100644 index 00000000..14280f03 Binary files /dev/null and b/web/src/img/reviews/51.png differ diff --git a/web/src/img/reviews/52.png b/web/src/img/reviews/52.png new file mode 100644 index 00000000..56975028 Binary files /dev/null and b/web/src/img/reviews/52.png differ diff --git a/web/src/img/reviews/53.png b/web/src/img/reviews/53.png new file mode 100644 index 00000000..5af3c9f9 Binary files /dev/null and b/web/src/img/reviews/53.png differ diff --git a/web/src/img/reviews/54.png b/web/src/img/reviews/54.png new file mode 100644 index 00000000..d84e99cb Binary files /dev/null and b/web/src/img/reviews/54.png differ diff --git a/web/src/img/reviews/55.png b/web/src/img/reviews/55.png new file mode 100644 index 00000000..876d6265 Binary files /dev/null and b/web/src/img/reviews/55.png differ diff --git a/web/src/img/reviews/56.png b/web/src/img/reviews/56.png new file mode 100644 index 00000000..c161882d Binary files /dev/null and b/web/src/img/reviews/56.png differ diff --git a/web/src/img/reviews/57.png b/web/src/img/reviews/57.png new file mode 100644 index 00000000..9c8e2121 Binary files /dev/null and b/web/src/img/reviews/57.png differ diff --git a/web/src/img/reviews/58.png b/web/src/img/reviews/58.png new file mode 100644 index 00000000..e17988c0 Binary files /dev/null and b/web/src/img/reviews/58.png differ diff --git a/web/src/img/reviews/59.png b/web/src/img/reviews/59.png new file mode 100644 index 00000000..841742b9 Binary files /dev/null and b/web/src/img/reviews/59.png differ diff --git a/web/src/img/reviews/6.png b/web/src/img/reviews/6.png new file mode 100644 index 00000000..c4d899f8 Binary files /dev/null and b/web/src/img/reviews/6.png differ diff --git a/web/src/img/reviews/60.png b/web/src/img/reviews/60.png new file mode 100644 index 00000000..6dd4555a Binary files /dev/null and b/web/src/img/reviews/60.png differ diff --git a/web/src/img/reviews/61.png b/web/src/img/reviews/61.png new file mode 100644 index 00000000..3e0e918c Binary files /dev/null and b/web/src/img/reviews/61.png differ diff --git a/web/src/img/reviews/62.png b/web/src/img/reviews/62.png new file mode 100644 index 00000000..e590dcc4 Binary files /dev/null and b/web/src/img/reviews/62.png differ diff --git a/web/src/img/reviews/63.png b/web/src/img/reviews/63.png new file mode 100644 index 00000000..8645ee58 Binary files /dev/null and b/web/src/img/reviews/63.png differ diff --git a/web/src/img/reviews/64.png b/web/src/img/reviews/64.png new file mode 100644 index 00000000..dfecadc6 Binary files /dev/null and b/web/src/img/reviews/64.png differ diff --git a/web/src/img/reviews/65.png b/web/src/img/reviews/65.png new file mode 100644 index 00000000..dadf8b1c Binary files /dev/null and b/web/src/img/reviews/65.png differ diff --git a/web/src/img/reviews/66.png b/web/src/img/reviews/66.png new file mode 100644 index 00000000..94ec5759 Binary files /dev/null and b/web/src/img/reviews/66.png differ diff --git a/web/src/img/reviews/67.png b/web/src/img/reviews/67.png new file mode 100644 index 00000000..57f44bf0 Binary files /dev/null and b/web/src/img/reviews/67.png differ diff --git a/web/src/img/reviews/68.png b/web/src/img/reviews/68.png new file mode 100644 index 00000000..b9e91ab5 Binary files /dev/null and b/web/src/img/reviews/68.png differ diff --git a/web/src/img/reviews/69.png b/web/src/img/reviews/69.png new file mode 100644 index 00000000..66bbce18 Binary files /dev/null and b/web/src/img/reviews/69.png differ diff --git a/web/src/img/reviews/7.png b/web/src/img/reviews/7.png new file mode 100644 index 00000000..0ee90ab1 Binary files /dev/null and b/web/src/img/reviews/7.png differ diff --git a/web/src/img/reviews/70.png b/web/src/img/reviews/70.png new file mode 100644 index 00000000..29b047c6 Binary files /dev/null and b/web/src/img/reviews/70.png differ diff --git a/web/src/img/reviews/71.png b/web/src/img/reviews/71.png new file mode 100644 index 00000000..ee3f5524 Binary files /dev/null and b/web/src/img/reviews/71.png differ diff --git a/web/src/img/reviews/72.png b/web/src/img/reviews/72.png new file mode 100644 index 00000000..789d9780 Binary files /dev/null and b/web/src/img/reviews/72.png differ diff --git a/web/src/img/reviews/73.png b/web/src/img/reviews/73.png new file mode 100644 index 00000000..556ade6a Binary files /dev/null and b/web/src/img/reviews/73.png differ diff --git a/web/src/img/reviews/74.png b/web/src/img/reviews/74.png new file mode 100644 index 00000000..b6f5e2b3 Binary files /dev/null and b/web/src/img/reviews/74.png differ diff --git a/web/src/img/reviews/75.png b/web/src/img/reviews/75.png new file mode 100644 index 00000000..481f31e2 Binary files /dev/null and b/web/src/img/reviews/75.png differ diff --git a/web/src/img/reviews/76.png b/web/src/img/reviews/76.png new file mode 100644 index 00000000..3e9ad76f Binary files /dev/null and b/web/src/img/reviews/76.png differ diff --git a/web/src/img/reviews/77.png b/web/src/img/reviews/77.png new file mode 100644 index 00000000..8c7c25ac Binary files /dev/null and b/web/src/img/reviews/77.png differ diff --git a/web/src/img/reviews/78.png b/web/src/img/reviews/78.png new file mode 100644 index 00000000..60dba167 Binary files /dev/null and b/web/src/img/reviews/78.png differ diff --git a/web/src/img/reviews/79.png b/web/src/img/reviews/79.png new file mode 100644 index 00000000..2c5ced62 Binary files /dev/null and b/web/src/img/reviews/79.png differ diff --git a/web/src/img/reviews/8.png b/web/src/img/reviews/8.png new file mode 100644 index 00000000..c59eb00d Binary files /dev/null and b/web/src/img/reviews/8.png differ diff --git a/web/src/img/reviews/80.png b/web/src/img/reviews/80.png new file mode 100644 index 00000000..48b42040 Binary files /dev/null and b/web/src/img/reviews/80.png differ diff --git a/web/src/img/reviews/81.png b/web/src/img/reviews/81.png new file mode 100644 index 00000000..b397d143 Binary files /dev/null and b/web/src/img/reviews/81.png differ diff --git a/web/src/img/reviews/82.png b/web/src/img/reviews/82.png new file mode 100644 index 00000000..f82a12cc Binary files /dev/null and b/web/src/img/reviews/82.png differ diff --git a/web/src/img/reviews/83.png b/web/src/img/reviews/83.png new file mode 100644 index 00000000..bc7c937c Binary files /dev/null and b/web/src/img/reviews/83.png differ diff --git a/web/src/img/reviews/84.png b/web/src/img/reviews/84.png new file mode 100644 index 00000000..4782062f Binary files /dev/null and b/web/src/img/reviews/84.png differ diff --git a/web/src/img/reviews/85.png b/web/src/img/reviews/85.png new file mode 100644 index 00000000..048e86db Binary files /dev/null and b/web/src/img/reviews/85.png differ diff --git a/web/src/img/reviews/86.png b/web/src/img/reviews/86.png new file mode 100644 index 00000000..ea8e5bac Binary files /dev/null and b/web/src/img/reviews/86.png differ diff --git a/web/src/img/reviews/87.png b/web/src/img/reviews/87.png new file mode 100644 index 00000000..db6a6433 Binary files /dev/null and b/web/src/img/reviews/87.png differ diff --git a/web/src/img/reviews/88.png b/web/src/img/reviews/88.png new file mode 100644 index 00000000..87255780 Binary files /dev/null and b/web/src/img/reviews/88.png differ diff --git a/web/src/img/reviews/89.png b/web/src/img/reviews/89.png new file mode 100644 index 00000000..4f7ab8b3 Binary files /dev/null and b/web/src/img/reviews/89.png differ diff --git a/web/src/img/reviews/9.png b/web/src/img/reviews/9.png new file mode 100644 index 00000000..162d27bf Binary files /dev/null and b/web/src/img/reviews/9.png differ diff --git a/web/src/img/reviews/90.png b/web/src/img/reviews/90.png new file mode 100644 index 00000000..b46da144 Binary files /dev/null and b/web/src/img/reviews/90.png differ diff --git a/web/src/img/reviews/91.png b/web/src/img/reviews/91.png new file mode 100644 index 00000000..27732845 Binary files /dev/null and b/web/src/img/reviews/91.png differ diff --git a/web/src/img/reviews/92.png b/web/src/img/reviews/92.png new file mode 100644 index 00000000..31bb91aa Binary files /dev/null and b/web/src/img/reviews/92.png differ diff --git a/web/src/img/reviews/93.png b/web/src/img/reviews/93.png new file mode 100644 index 00000000..17c89cf6 Binary files /dev/null and b/web/src/img/reviews/93.png differ diff --git a/web/src/img/reviews/94.png b/web/src/img/reviews/94.png new file mode 100644 index 00000000..e3e9423b Binary files /dev/null and b/web/src/img/reviews/94.png differ diff --git a/web/src/img/reviews/95.png b/web/src/img/reviews/95.png new file mode 100644 index 00000000..948fce83 Binary files /dev/null and b/web/src/img/reviews/95.png differ diff --git a/web/src/img/reviews/96.png b/web/src/img/reviews/96.png new file mode 100644 index 00000000..75e63f3b Binary files /dev/null and b/web/src/img/reviews/96.png differ diff --git a/web/src/img/reviews/97.png b/web/src/img/reviews/97.png new file mode 100644 index 00000000..d3de74a1 Binary files /dev/null and b/web/src/img/reviews/97.png differ diff --git a/web/src/img/reviews/98.png b/web/src/img/reviews/98.png new file mode 100644 index 00000000..0ad2645b Binary files /dev/null and b/web/src/img/reviews/98.png differ diff --git a/web/src/img/reviews/99.png b/web/src/img/reviews/99.png new file mode 100644 index 00000000..116ac701 Binary files /dev/null and b/web/src/img/reviews/99.png differ diff --git a/web/src/img/screens2.png b/web/src/img/screens2.png new file mode 100644 index 00000000..4abd2d84 Binary files /dev/null and b/web/src/img/screens2.png differ diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js index a2bc6999..6c3cb578 100644 --- a/web/src/js/modules/common.js +++ b/web/src/js/modules/common.js @@ -29,6 +29,7 @@ $(document).ready(function () { updateHeader(); }); + //===========BANNERS=============== const $banner = $('[data-banner]'); const bannerId = $banner.data('banner') + ''; if(Cookies.get('hide_banner') !== bannerId){ @@ -42,6 +43,66 @@ $(document).ready(function () { Cookies.set('hide_banner', bannerId); }); + //===========REVIEWS=============== + const $reviews = $('.reviews'); + const $reviewsWrap = $('.reviews__wrap'); + const reviewImages = $reviews.data('review-images').split(','); + const reviewsHeight = $reviews.height(); + let reviewsScrollInterval = null; + let reviewsScrollActive = false; + let currentReviewNum = 10; + let reviewsLoading = 0; + const reviewsScrollFn = () => { + if(! reviewsScrollActive){ + clearInterval(reviewsScrollInterval); + reviewsScrollInterval = null; + } + for(let item of $reviewsWrap.find('.reviews__item')){ + let $item = $(item); + let top = parseFloat($reviewsWrap.css('top')); + let marginTop = parseFloat($reviewsWrap.css('marginTop')); + if(marginTop + top + $item.outerHeight(true) >= 0){ + break; + } + $reviewsWrap.css('marginTop', (marginTop + $item.outerHeight(true)) + 'px'); + $item.remove(); + } + let top = parseFloat($reviewsWrap.css('top')); + let marginTop = parseFloat($reviewsWrap.css('marginTop')); + $reviewsWrap.css('top', top - 100 + 'px'); + if(($reviewsWrap.height() + top + marginTop < reviewsHeight + 500) && ! reviewsLoading){ + for(let i=0; i<5; i++){ + currentReviewNum = (currentReviewNum >= (reviewImages.length - 1)) ? 0 : (currentReviewNum + 1); + let $img = $(``); + $img[0].src = `${window.LIL_STORE.staticUrl}img/reviews/${reviewImages[currentReviewNum]}.png`; + reviewsLoading++; + + $img[0].onload = () => { + reviewsLoading--; + $reviewsWrap.append($img); + }; + } + } + } + + const checkScroll = e => { + const scrollTop = window.pageYOffset; + const reviewsTop = $reviews[0].offsetTop; + if(scrollTop + window.innerHeight > reviewsTop - 200 && scrollTop < reviewsTop + reviewsHeight){ + if(! reviewsScrollInterval){ + reviewsScrollActive = true; + reviewsScrollInterval = setInterval(reviewsScrollFn, 3000); + reviewsScrollFn(); + } + } + else{ + reviewsScrollActive = false; + } + } + + $(window).scroll(checkScroll); + checkScroll(); + if(window.LIL_STORE.flags.isReferralUrl){ if(window.LIL_STORE.user.id){ showNotification('error', 'Извините, вы уже зарегистрировались на нашем сервисе, получить бонусные баллы возможно только для новых пользователей'); diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 03555501..efb20271 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -13,16 +13,16 @@ +font(ProximaNova-Regular, ProximaNova-Regular) =f - font-family: 'ProximaNova-Regular', serif + font-family: 'ProximaNova-Regular', sans-serif +font(ProximaNova-Bold, ProximaNova-Bold) =fb - font-family: 'ProximaNova-Bold', serif + font-family: 'ProximaNova-Bold', sans-serif +font(ProximaNova-SemiBold, ProximaNova-SemiBold) =fs - font-family: 'ProximaNova-SemiBold', serif + font-family: 'ProximaNova-SemiBold', sans-serif +font(ProximaNova-Light, ProximaNova-Light) =fl - font-family: 'ProximaNova-Light', serif + font-family: 'ProximaNova-Light', sans-serif $pink: #FF9393 $pink-light: #FDF8F9 @@ -772,10 +772,10 @@ a.btn &_sm &__title margin-bottom: 0 &_default - padding-top: 165px - padding-bottom: 30px + padding-top: 200px + padding-bottom: 125px &_default &__center - margin-bottom: 0 + margin: 0 auto &_default &__title margin-bottom: 25px +f @@ -805,7 +805,7 @@ a[name] .title position: relative margin-bottom: 35px - +fb + +f font-size: 32px line-height: (35/32) z-index: 4 @@ -819,6 +819,8 @@ a[name] &_sm margin-bottom: 20px font-size: 25px + &_light + font-family: 'ProximaNova-Light', serif .subtitle margin-bottom: 25px @@ -900,6 +902,11 @@ a[name] +m left: 30px bottom: -20px + &_five + left: -100px + bottom: -90px + &_left + text-align: left &_lg max-width: 740px &_mb0 @@ -939,8 +946,6 @@ a[name] padding: 30px 0 +m padding: 20px 0 - &_review - background: url(../img/bg-elephants.jpg) 0 0 / 100px 102px &_gray background: $bg &_pink-light @@ -997,6 +1002,28 @@ a[name] &_video padding: 70px 0 70px +.reviews-section + background: linear-gradient(to bottom, rgba(248,248,248,1) 0%, rgba(254,244,244,1) 100%) + padding: 0 + &__center + display: flex + height: 650px + +m + padding-bottom: 20px + flex-direction: column + &__title + flex: 0 0 60%; + padding-right: 100px + padding-top: 150px + +m + padding: 20px 0 0 + flex: 0 + text-align: center + .text + text-align: left + +m + text-align: center + .ava display: block position: relative @@ -1314,35 +1341,23 @@ a[name] line-height: 1.2 .reviews - padding-right: 80px - +t - padding: 0 - &__item - display: flex - &:not(:last-child) - margin-bottom: 20px - +t - margin-bottom: 40px - &__ava - height: 60px - margin-right: 20px - flex: 0 0 60px - +t - height: 45px - flex: 0 0 45px - +m - margin-right: 10px + width: 300px + height: 650px + overflow: hidden + position: relative + +m + width: 100% &__wrap - padding: 20px 30px 30px - background: white - box-shadow: 0 10px 20px 0 rgba(0,0,0,0.10) - border-radius: 0 10px 10px 10px + transition: top 3s linear + position: absolute + display: flex + flex-direction: column + &__item + margin: 10px 0 + width: 100% +m - padding: 15px 20px 20px - &__name - +fb - font-size: 15px - line-height: 1.33 + max-width: 600px + margin: 10px auto .gallery display: flex @@ -1379,17 +1394,15 @@ a[name] width: 140px height: 140px margin: 0 10px 20px - +m - width: 140px - height: 140px + +t + width: calc(33.33% - 10px) margin: 0 5px 10px &_lg width: 300px height: 300px overflow: hidden - +m + +t width: calc(66.66% - 10px) - height: calc(66.66% - 10px) &:nth-child(4) clear: both &__pic @@ -1826,19 +1839,22 @@ a.grey-link .partners display: flex margin: 0 -10px -20px - flex-wrap: wrap align-items: center justify-content: center +m margin: 0 -5px -10px + flex-wrap: wrap &__item margin: 0 10px 20px flex: 0 0 calc(16.66% - 20px) + text-align: center + height: 160px +m margin: 0 5px 10px - flex: 0 0 calc(33.33% - 10px) - &_promocodes &__item - text-align: center; + flex: 0 0 100px + & a + height: 120px + display: flex &__item-promocode border: 1px solid #333; display: inline-block; @@ -1848,8 +1864,8 @@ a.grey-link letter-spacing: 2px; text-transform: uppercase; &__pic - display: block - width: 100% + max-width: 100% + object-fit: contain .switch display: block @@ -1949,64 +1965,26 @@ a.grey-link .footer padding: 50px 0 30px - background: $bg +t padding: 30px 0 35px &__row display: flex - margin: 0 -10px + margin: 0 -10px 50px flex-wrap: wrap - &__row_first &__col - &:nth-child(2) - +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 - margin-top: 50px - +t - display: block - width: 60% - margin-top: -50px +m - width: 100% - margin-top: 30px + flex-direction: column + margin: 0 0 10px &__col - padding: 0 10px - flex: 0 0 16.66% + flex: 0 0 25% +t - flex: 0 0 33.33% + margin: 10px + &__row_second &__col:nth-child(2) + flex: 1 + &__nav +m - flex: 0 0 50% - &_md - flex: 0 0 25% - &_lg - flex: 0 0 75% + display: flex + &__nav > div + flex: 50% &__logo width: 188px height: 58px @@ -2051,33 +2029,34 @@ a.grey-link &__links display: flex color: #888 - &__copyright - margin-right: 20px - +t - margin: 20px 0 0 - &__links +t display: none &__links &__link color: #888 &__divider margin: 0 10px + &__copyright + margin-top: 50px + margin-bottom: 20px + font-size: 14px + color: $gray .subscribe - &__field - margin-bottom: 10px - &__input - width: 100% + margin-top: 10px + display: flex + &__btn height: 40px + width: 220px + &__input + height: 39px + width: 220px padding: 0 10px font-size: 16px text-align: center - &__btn - width: 100% - &__content - margin-top: 15px - font-size: 12px - line-height: 1.25 + margin-right: 20px + background: $bg + +m + margin-right: 0 .socials display: flex @@ -2429,6 +2408,12 @@ a.grey-link &.visible &__wrap transform: scale(1) +.main-video + margin-top: -140px + z-index: 10 + position: relative + box-shadow: 0 10px 100px rgba(0,0,0,0.20) + .head display: flex margin-bottom: 50px @@ -3899,12 +3884,17 @@ a.grey-link +m flex: 0 0 50% &_main &__preview - margin-bottom: 15px - .icon - fill: white - &_main &__title + margin-bottom: 10px + font-size: 32px +t - font-size: 16px + font-size: 24px + &_main &__title + font-size: 15px + text-transform: uppercase + font-weight: bold + &_main &__text + text-transform: none + font-size: 15px .arts display: flex diff --git a/web/webpack.config.js b/web/webpack.config.js index 8156ab03..e0e7820c 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -15,6 +15,7 @@ module.exports = { images: glob('./src/img/*.*'), imagesCertificates: glob('./src/img/user-certificates/*'), imagesGiftCertificates: glob('./src/img/gift-certificates/*'), + imagesReviews: glob('./src/img/reviews/*'), fonts: glob('./src/fonts/*') }, output: { @@ -87,7 +88,7 @@ module.exports = { { test: /\.(png|gif|jpg|svg)$/, exclude: [path.resolve(__dirname, 'src/icons'), path.resolve(__dirname, 'src/img/user-certificates'), - path.resolve(__dirname, 'src/img/gift-certificates')], + path.resolve(__dirname, 'src/img/gift-certificates'), path.resolve(__dirname, 'src/img/reviews')], loader: 'file-loader?name=[name].[ext]&outputPath=./img/' }, { @@ -100,6 +101,11 @@ module.exports = { include: path.resolve(__dirname, 'src/img/gift-certificates'), loader: 'file-loader?name=[name].[ext]&outputPath=./img/gift-certificates/' }, + { + test: /\.(png|jpg)$/, + include: path.resolve(__dirname, 'src/img/reviews'), + loader: 'file-loader?name=[name].[ext]&outputPath=./img/reviews/' + }, { test: /\.(ttf|otf|eot|woff(2)?)(\?[a-z0-9]+)?$/, loader: 'file-loader?name=[name].[ext]'