Merge branch 'master' into 'ga-ecommerce-gleb'

Master

See merge request lilschool/site!397
remotes/origin/ga-ecommerce-gleb
Gleb Mikhaylov 6 years ago
commit 043f75647e
  1. 14
      apps/auth/views.py
  2. 2
      apps/payment/views.py
  3. 2
      docker/.env.review
  4. 5
      project/templates/blocks/partners.html
  5. 4
      project/templates/blocks/students.html
  6. 8
      project/templates/lilcity/home.html
  7. BIN
      web/src/img/girl-brushes.png
  8. BIN
      web/src/img/uni_mitsubishi.png
  9. 21
      web/src/sass/_common.sass

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

@ -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,

@ -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

@ -37,6 +37,11 @@
<img class="partners__pic" src="{% static 'img/gamma.png' %}">
</a>
</div>
<div class="partners__item">
<a target="_blank" href="http://unipen.ru/">
<img class="partners__pic" src="{% static 'img/uni_mitsubishi.png' %}">
</a>
</div>
</div>
</div>
</div>

@ -18,12 +18,12 @@
<div class="section__column section__column_text">
<div class="section__quote">
<div class="section__quote-text">
Лил Скул для меня это место, где Солнце может быть синего цвета.
Лил Скул для меня это место,<br>где Солнце может быть синего цвета.
</div>
<div class="section__quote-name">Злата Пыльцина, 7 лет. Город Волгоград.</div>
</div>
<div class="section__buttons">
<a class="btn js-video-modal" style="width: auto;"
<a class="btn js-video-modal"
data-video-url="https://www.youtube.com/watch?v=QrlR5sL_eGI"
href="#">Видео отзыв</a>
</div>

@ -10,6 +10,14 @@
{% endif %}
{% endblock ogdescription %}
{% block head %}
<style>
.section_main .title {
font-weight: bold;
}
</style>
{% endblock head %}
{% block title %}Lil School{% endblock title %}
{% block body_attr %}class="main-page"{% endblock body_attr %}
{% block content %}

Binary file not shown.

After

Width:  |  Height:  |  Size: 645 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

@ -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

Loading…
Cancel
Save