diff --git a/apps/auth/views.py b/apps/auth/views.py index d85a75aa..48719b3f 100644 --- a/apps/auth/views.py +++ b/apps/auth/views.py @@ -1,31 +1,30 @@ import os - +import logging from uuid import uuid4 from urllib.parse import urlsplit from facepy import GraphAPI from facepy.exceptions import FacepyError - from django.contrib.auth import get_user_model, logout, login, views from django.contrib.auth.forms import AuthenticationForm from django.core.files.base import ContentFile -from django.http import JsonResponse, Http404 +from django.http import JsonResponse from django.urls import reverse_lazy from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_exempt from django.views.generic import FormView, View, TemplateView -from django.views.generic.edit import BaseFormView from django.shortcuts import redirect from django.conf import settings from apps.notification.utils import send_email from apps.config.models import Config from apps.user.models import Referral - from .forms import LearnerRegistrationForm from .tokens import verification_email_token + User = get_user_model() +logger = logging.getLogger(__name__) class LearnerRegistrationView(FormView): @@ -75,7 +74,10 @@ class LearnerRegistrationView(FormView): http_referer = str(http_referer[0]) + '://' + str(http_referer[1]) token = verification_email_token.make_token(user) url = http_referer + str(reverse_lazy('lilcity:verification-email', args=[token, user.id])) - send_email('Вы успешно прошли регистрацию', email, "notification/email/verification_email.html", url=url, config=config) + try: + send_email('Вы успешно прошли регистрацию', email, "notification/email/verification_email.html", url=url, config=config) + except Exception as e: + logger.error(str(e)) if self.request.is_ajax(): return JsonResponse({"success": True}, status=201) diff --git a/apps/payment/views.py b/apps/payment/views.py index e2c11d14..4e3238e5 100644 --- a/apps/payment/views.py +++ b/apps/payment/views.py @@ -365,7 +365,7 @@ class PaymentwallCallbackView(View): payment.id, f'{product_type_name.title()} payment', payment.amount, - now().strftime('%Y-%m-%d %H:%M:%S'), + datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S'), pingback.get_type(), product_type_name, payment.roistat_visit, diff --git a/docker/.env.review b/docker/.env.review index 54d6c94e..1c898e6c 100644 --- a/docker/.env.review +++ b/docker/.env.review @@ -10,7 +10,7 @@ POSTGRES_PASSWORD=GPVs/E/{5&qe DJANGO_SETTINGS_MODULE=project.settings DATABASE_SERVICE_HOST=db SECRET_KEY=jelm*91lj(_-o20+6^a+bgv!4s6e_efry^#+f#=1ak&s1xr-2j -MAILGUN_API_KEY=key-ec6af2d43d031d59bff6b1c8fb9390c +MAILGUN_API_KEY=key-ec6af2d43d031d59bff6b1c8fb9390cb MAILGUN_SENDER_DOMAIN=mail.9ev.ru DEFAULT_FROM_EMAIL=postmaster@mail.9ev.ru TWILIO_ACCOUNT=ACdf4a96b776cc764bc3ec0f0e136ba550 diff --git a/project/templates/blocks/partners.html b/project/templates/blocks/partners.html index 16b3e26d..d26c0602 100644 --- a/project/templates/blocks/partners.html +++ b/project/templates/blocks/partners.html @@ -37,6 +37,11 @@ +
+ + + +
diff --git a/project/templates/blocks/students.html b/project/templates/blocks/students.html index ec66bf2c..60d95dd2 100644 --- a/project/templates/blocks/students.html +++ b/project/templates/blocks/students.html @@ -18,12 +18,12 @@
- Лил Скул для меня это место, где Солнце может быть синего цвета. + Лил Скул для меня это место,
где Солнце может быть синего цвета.
Злата Пыльцина, 7 лет. Город Волгоград.
- Видео отзыв
diff --git a/project/templates/lilcity/home.html b/project/templates/lilcity/home.html index f9173e21..95a74083 100644 --- a/project/templates/lilcity/home.html +++ b/project/templates/lilcity/home.html @@ -10,6 +10,14 @@ {% endif %} {% endblock ogdescription %} +{% block head %} + +{% endblock head %} + {% block title %}Lil School{% endblock title %} {% block body_attr %}class="main-page"{% endblock body_attr %} {% block content %} diff --git a/web/src/img/girl-brushes.png b/web/src/img/girl-brushes.png new file mode 100644 index 00000000..5517a769 Binary files /dev/null and b/web/src/img/girl-brushes.png differ diff --git a/web/src/img/uni_mitsubishi.png b/web/src/img/uni_mitsubishi.png new file mode 100644 index 00000000..be1663fd Binary files /dev/null and b/web/src/img/uni_mitsubishi.png differ diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 63c0801b..e1e05105 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -1158,12 +1158,14 @@ a[name] padding-bottom: 0 &_students &__column_img - background-image: url(/static/img/zlata.png) + background-image: url(/static/img/girl-brushes.png) height: 400px background-position: bottom center + z-index: -1 +m - height: auto + flex: 195px + background-size: 225px &_students &__center:nth-child(1) +m @@ -1174,11 +1176,17 @@ a[name] +m margin-top: 0 + flex-direction: column-reverse &_students &__center:nth-child(2) &__column_text +m padding: 0 0 0 10px + &_students .btn + width: auto + +m + width: 225px + &_course .go flex-wrap: wrap @@ -1190,6 +1198,7 @@ a[name] +m font-size: 14px + padding: 55px 35px 100px 150px &:before background-image: url(/static/img/bubble-icon.svg?196dc3af196a) @@ -1199,16 +1208,18 @@ a[name] width: 100% height: 80% content: ' ' - left: -2% + left: 0 top: -3% z-index: -1 +m - width: 90%; - left: 15% + width: 73% + left: 20% top: 10% & &-text margin-bottom: 20px + +m + margin-bottom: 15px & &-name text-decoration: underline