Merge branch 'dev' into feature/api

apps/course/migrations/0021_auto_20180205_1559.py

@@ -0,0 +1,35 @@
+# Generated by Django 2.0.2 on 2018-02-05 15:59
+
+from django.db import migrations
+from django.contrib.contenttypes.models import ContentType
+
+
+def fwrd_func(apps, schema_editor):
+    CourseComment = apps.get_model('course', 'CourseComment')
+    LessonComment = apps.get_model('course', 'LessonComment')
+    db_alias = schema_editor.connection.alias
+    if CourseComment.objects.exists():
+        coursecomment_content_type = ContentType.objects.get(
+            app_label='course', model='coursecomment',
+        )
+        CourseComment.objects.using(db_alias).all().update(
+            polymorphic_ctype=coursecomment_content_type,
+        )
+    if LessonComment.objects.exists():
+        lessoncomment_content_type = ContentType.objects.get(
+            app_label='course', model='lessoncomment',
+        )
+        LessonComment.objects.using(db_alias).all().update(
+            polymorphic_ctype=lessoncomment_content_type,
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('course', '0020_auto_20180202_1716'),
+    ]
+
+    operations = [
+        migrations.RunPython(fwrd_func)
+    ]

apps/course/migrations/0022_auto_20180205_1615.py

@@ -0,0 +1,35 @@
+# Generated by Django 2.0.2 on 2018-02-05 16:15
+
+from django.db import migrations
+from django.contrib.contenttypes.models import ContentType
+
+
+def fwrd_func(apps, schema_editor):
+    CourseComment = apps.get_model('course', 'CourseComment')
+    LessonComment = apps.get_model('course', 'LessonComment')
+    db_alias = schema_editor.connection.alias
+    if CourseComment.objects.using(db_alias).all().exists():
+        coursecomment_content_type = ContentType.objects.get(
+            app_label='course', model='coursecomment',
+        )
+        CourseComment.objects.using(db_alias).all().update(
+            polymorphic_ctype=coursecomment_content_type,
+        )
+    if LessonComment.objects.using(db_alias).all().exists():
+        lessoncomment_content_type = ContentType.objects.get(
+            app_label='course', model='lessoncomment',
+        )
+        LessonComment.objects.using(db_alias).all().update(
+            polymorphic_ctype=lessoncomment_content_type,
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('course', '0021_auto_20180205_1559'),
+    ]
+
+    operations = [
+        migrations.RunPython(fwrd_func)
+    ]

apps/course/templates/course/_items.html

@@ -7,7 +7,11 @@
     {% if course.is_deferred_start %}data-future-course data-future-course-time={{ course.deferred_start_at.timestamp }}{% endif %}
 >
 <a class="courses__preview" href="{% url 'course' course.id %}?next={{ request.get_full_path }}">
+  {% if course.cover %}
   <img class="courses__pic" src="{{ course.cover.url }}"/>
+  {% else %}
+  <img class="courses__pic" src="{% static 'img/no_cover.png' %}"/>
+  {% endif %}
   <div class="courses__view">Подробнее</div>
   {% if course.is_featured %}
   <div class="courses__label courses__label_fav"></div>

apps/user/forms.py

@@ -0,0 +1,49 @@
+from django import forms
+from django.contrib.auth import get_user_model
+
+User = get_user_model()
+
+
+class UserEditForm(forms.ModelForm):
+    # first_name = forms.CharField()
+    # last_name = forms.CharField()
+    # email = forms.CharField()
+    # city = forms.CharField()
+    # country = forms.CharField()
+    birthday = forms.DateField(input_formats=['%d.%m.%Y'])
+    # gender = forms.ChoiceField(choices=User.GENDER_CHOICES, required=False)
+    gender = forms.CharField(required=False)
+    # about = forms.CharField()
+    old_password = forms.CharField(required=False)
+    new_password1 = forms.CharField(required=False)
+    new_password2 = forms.CharField(required=False)
+    instagram = forms.URLField(required=False)
+    facebook = forms.URLField(required=False)
+    twitter = forms.URLField(required=False)
+    pinterest = forms.URLField(required=False)
+    youtube = forms.URLField(required=False)
+    vkontakte = forms.URLField(required=False)
+    photo = forms.ImageField(required=False)
+
+    class Meta:
+        model = User
+        fields = (
+            'first_name',
+            'last_name',
+            'email',
+            'city',
+            'country',
+            'birthday',
+            'gender',
+            'about',
+            'old_password',
+            'new_password1',
+            'new_password2',
+            'instagram',
+            'facebook',
+            'twitter',
+            'pinterest',
+            'youtube',
+            'vkontakte',
+            'photo',
+        )

apps/user/migrations/0005_user_birthday.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.2 on 2018-02-06 13:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0004_auto_20180129_1259'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='birthday',
+            field=models.DateField(blank=True, null=True, verbose_name='День рождения'),
+        ),
+    ]

apps/user/migrations/0006_auto_20180206_1352.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.2 on 2018-02-06 13:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0005_user_birthday'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='about',
+            field=models.CharField(blank=True, max_length=1000, null=True, verbose_name='О себе'),
+        ),
+    ]

apps/user/migrations/0007_auto_20180207_0808.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.0.2 on 2018-02-07 08:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0006_auto_20180206_1352'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='city',
+            field=models.CharField(blank=True, max_length=85, null=True, verbose_name='Город'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='country',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Страна'),
+        ),
+    ]

apps/user/models.py

@@ -13,17 +13,21 @@ class User(AbstractUser):
         (AUTHOR_ROLE, 'автор'),
         (ADMIN_ROLE, 'администратор'),
     )
+    NOT_DEFINED = 'n'
+    MALE = 'm'
+    FEMALE = 'f'
     GENDER_CHOICES = (
-        ('n', 'не указан'),
+        (NOT_DEFINED, 'не указан'),
-        ('m', 'Мужчина'),
+        (MALE, 'Мужчина'),
-        ('f', 'Женщина'),
+        (FEMALE, 'Женщина'),
     )
     email = models.EmailField(_('email address'), unique=True)
     role = models.PositiveSmallIntegerField('Роль', default=0, choices=ROLE_CHOICES)
     gender = models.CharField('Пол', max_length=1, default='n', choices=GENDER_CHOICES)
-    country = models.CharField('Страна', max_length=50, default='')
+    birthday = models.DateField('День рождения', null=True, blank=True)
-    city = models.CharField('Город', max_length=85, default='')
+    country = models.CharField('Страна', max_length=50, null=True, blank=True)
-    about = models.CharField('О себе', max_length=1000, default='', blank=True)
+    city = models.CharField('Город', max_length=85, null=True, blank=True)
+    about = models.CharField('О себе', max_length=1000, null=True, blank=True)
     instagram = models.URLField(default='', null=True, blank=True)
     facebook = models.URLField(default='', null=True, blank=True)
     twitter = models.URLField(default='', null=True, blank=True)

apps/user/templates/user/profile-settings.html

@@ -0,0 +1,209 @@
+{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
+<div class="section section_gray section_menu">
+  <div class="section__center center center_xs">
+    <div class="menu">
+      <a class="menu__link active" href="{% url 'user-edit' user.id %}">Профиль</a>
+      <a class="menu__link" href="#">Уведомления</a>
+      <a class="menu__link" href="#">Платежи</a>
+    </div>
+  </div>
+</div>
+{% comment %}
+<!-- <div class="section section_confirm">
+  <div class="section__center center center_xs">
+    <div class="confirm">
+      <div class="confirm__title title">Подтверждение почты</div>
+      <div class="confirm__content">На электронный адрес
+        <strong>sasha@lil.city</strong> отправлено письмо с кодом подтверждения. Введите код, чтобы подтвердить почту.</div>
+        <div class="confirm__form">
+          <div class="confirm__field field field_code">
+          <div class="field__wrap">
+            <input class="field__input" type="text" placeholder="Введите код подтверждения">
+          </div>
+        </div>
+        <button class="confirm__btn btn btn_dark">ПОДТВЕРДИТЬ</button>
+      </div>
+      <div class="confirm__content">Если у вас нет кода или письмо где-то затерялось, вы можете получить новый код подтверждения. Отправить новый код?</div>
+    </div>
+  </div>
+</div> -->
+{% endcomment %}
+{% if messages %}
+<div class="section section_gray section_menu">
+  <div class="section__center center center_xs">
+  {% for message in messages %}
+  <div class="message message_{{ message.tags }}">{{ message }}</div>
+  {% endfor %}
+</div>
+</div>
+{% endif %}
+{{form.errors}}
+<div class="section section_gray">
+  <div class="section__center center center_xs">
+    <div class="form">
+      <form action="" method="POST" enctype="multipart/form-data">
+        {% csrf_token %}
+        <div class="form__group">
+          <div class="form__title">Личные данные</div>
+          <div class="form__ava ava">
+            {% if user.photo %}
+            <img id="photo" class="ava__pic" src="{{user.photo.url}}">
+            {% else %}
+            <img id="photo" class="ava__pic" src="{% static 'img/user.jpg' %}">
+            {% endif %}
+            <input name="photo" class="ava__input" type="file" accept='image/*' onchange='openFile(event)'>
+            <div class="ava__icon">
+              <svg class="icon icon-photo">
+                <use xlink:href="{% static 'img/sprite.svg' %}#icon-photo"></use>
+              </svg>
+            </div>
+          </div>
+          <div class="form__fieldset">
+            <div class="form__field field">
+              <div class="field__label">ИМЯ</div>
+              <div class="field__wrap">
+                <input name='first_name' class="field__input" type="text" placeholder="Имя" value="{{ user.first_name }}">
+              </div>
+            </div>
+            <div class="form__field field">
+              <div class="field__label">ФАМИЛИЯ</div>
+              <div class="field__wrap">
+                <input name='last_name' class="field__input" type="text" placeholder="Фамилия" value="{{ user.last_name }}">
+              </div>
+            </div>
+          </div>
+          <div class="form__field field">
+            <div class="field__label">Почта</div>
+            <div class="field__wrap">
+              <input name='email' class="field__input" type="email" placeholder="Почта" value="{{ user.email }}">
+            </div>
+          </div>
+          <div class="form__fieldset">
+            <div class="form__field field">
+              <div class="field__label">ГОРОД</div>
+              <div class="field__wrap">
+                <input name='city' class="field__input" type="text" placeholder="Город" value="{% if user.city %}{{ user.city }}{% endif %}">
+              </div>
+            </div>
+            <div class="form__field field">
+              <div class="field__label">СТРАНА</div>
+              <div class="field__wrap">
+                <input name='country' class="field__input" type="text" placeholder="Страна" value="{% if user.country %}{{ user.country }}{% endif %}">
+              </div>
+            </div>
+          </div>
+          <div class="form__fieldset">
+            <div class="form__field field">
+              <div class="field__label">ДАТА РОЖДЕНИЯ</div>
+              <div class="field__wrap">
+                <input name='birthday' class="field__input" type="text" placeholder="dd.mm.yyyy" value="{% if user.birthday %}{{ user.birthday | date:'d.m.Y' }}{% endif %}">
+              </div>
+            </div>
+            <div class="form__field field">
+              <div class="field__label">ПОЛ</div>
+              <div class="field__wrap">
+                <div class="field__select select js-select{% if user.gender and user.gender != 'n' %} selected{% endif %}">
+                  <div class="select__head js-select-head">
+                    {% if user.gender == 'f' %}Ж{% elif user.gender == 'm' %}M{% else %}М / Ж{% endif %}
+                  </div>
+                  <div class="select__drop js-select-drop">
+                    <div class="select__option js-select-option" data-gender-option data-gender="m">
+                      <div class="select__title">М</div>
+                    </div>
+                    <div class="select__option js-select-option" data-gender-option data-gender="f">
+                      <div class="select__title">Ж</div>
+                    </div>
+                  </div>
+                  <input id="gender" name='gender' class="select__input" type="hidden">
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form__field field">
+            <div class="field__label">О себе</div>
+            <div class="field__wrap">
+              <textarea name='about' class="field__textarea" placeholder="Расскажите о себе и своем опыте">{% if user.about %}{{ user.about }}{% endif %}</textarea>
+            </div>
+          </div>
+        </div>
+        <div class="form__group">
+          <div class="form__title">Пароль</div>
+          <div class="form__field field">
+            <div class="field__label">ТЕКУЩИЙ ПАРОЛЬ</div>
+            <div class="field__wrap">
+              <input name='old_password' class="field__input" type="password" placeholder="Введите текущий пароль">
+            </div>
+          </div>
+          <div class="form__field field">
+            <div class="field__label">НОВЫЙ ПАРОЛЬ</div>
+            <div class="field__wrap">
+              <input name='new_password1' class="field__input" type="password" placeholder="Введите новый пароль">
+            </div>
+          </div>
+          <div class="form__field field">
+            <div class="field__label">ПОДТВЕРДИТЬ НОВЫЙ ПАРОЛЬ</div>
+            <div class="field__wrap">
+              <input name='new_password2' class="field__input" type="password" placeholder="Подтвердите новый пароль">
+            </div>
+          </div>
+        </div>
+        <div class="form__group">
+          <div class="form__title">Соцсети</div>
+          <div class="form__field field">
+            <div class="field__label">INSTAGRAM</div>
+            <div class="field__wrap">
+              <input name='instagram' class="field__input" type="text" placeholder="https://instagram.com/school.lil.city" value="{{ user.instagram }}">
+            </div>
+          </div>
+          <div class="form__field field">
+            <div class="field__label">FACEBOOK</div>
+            <div class="field__wrap">
+              <input name='facebook' class="field__input" type="text" placeholder="https://facebook.com/lilcitycompany" value="{{ user.facebook }}">
+            </div>
+          </div>
+          <div class="form__field field">
+            <div class="field__label">TWITTER</div>
+            <div class="field__wrap">
+              <input name='twitter' class="field__input" type="text" placeholder="https://twitter.com/lilcitycompany" value="{{ user.twitter }}">
+            </div>
+          </div>
+          <div class="form__field field">
+            <div class="field__label">PINTEREST</div>
+            <div class="field__wrap">
+              <input name='pinterest' class="field__input" type="text" placeholder="https://pinterest.com/lilcitycompany" value="{{ user.pinterest }}">
+            </div>
+          </div>
+          <div class="form__field field">
+            <div class="field__label">YOUTUBE</div>
+            <div class="field__wrap">
+              <input name='youtube' class="field__input" type="text" placeholder="https://youtube.com/lilcitycompany" value="{{ user.youtube }}">
+            </div>
+          </div>
+          <div class="form__field field">
+            <div class="field__label">VKONTAKTE</div>
+            <div class="field__wrap">
+              <input name='vkontakte' class="field__input" type="text" placeholder="https://vk.com/lilcitycompany" value="{{ user.vkontakte }}">
+            </div>
+          </div>
+        </div>
+        <div class="form__foot">
+          <button type="submit" class="form__btn btn btn_md">СОХРАНИТЬ</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+<script>
+var openFile = function(file) {
+  var input = file.target;
+
+  var reader = new FileReader();
+  reader.onload = function(){
+    var dataURL = reader.result;
+    var output = document.getElementById('photo');
+    output.src = dataURL;
+  };
+  reader.readAsDataURL(input.files[0]);
+};
+</script>
+{% endblock content %}

apps/user/templates/user/profile.html

@@ -2,7 +2,7 @@
 <div class="section">
   <div class="section__center center">
     <div class="profile">
-      <a class="profile__btn profile__btn_edit btn" href="#">Редактировать</a>
+      <a class="profile__btn profile__btn_edit btn" href="{% url 'user-edit' user.id %}">Редактировать</a>
       {% if user.photo %}
       <div class="profile__ava ava">
         <img class="ava__pic" src="{{ user.photo.url }}">

apps/user/views.py

@@ -1,9 +1,20 @@
-from django.shortcuts import render
+from io import BytesIO
-from django.views.generic import DetailView
+from PIL import Image
+from os.path import splitext
+from django.contrib.auth import login
+from django.shortcuts import render, reverse
+from django.views.generic import DetailView, UpdateView
+from django.contrib import messages
 from django.contrib.auth import get_user_model
+from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.auth.hashers import check_password, make_password
+from django.http import Http404
+from django.utils.decorators import method_decorator
 
 from apps.course.models import Course
 
+from .forms import UserEditForm
+
 User = get_user_model()
 
 
@@ -13,6 +24,65 @@ class UserView(DetailView):
 
     def get_context_data(self, object):
         context = super().get_context_data()
-        context['published'] = Course.objects.filter(author=self.object, status=Course.PUBLISHED)
+        context['published'] = Course.objects.filter(
+            author=self.object, status=Course.PUBLISHED
+        )
         context['paid'] = Course.objects.none()
         return context
+
+
+class UserEditView(UpdateView):
+    model = User
+    template_name = 'user/profile-settings.html'
+    form_class = UserEditForm
+
+    @method_decorator(login_required)
+    def dispatch(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        if request.user != self.object:
+            raise Http404()
+        return super().dispatch(request, *args, **kwargs)
+
+    def post(self, request, *args, **kwargs):
+        # it's magic *-*-*-*-*
+        if 'photo' in request.FILES:
+            photo_fp = request.FILES.pop('photo')[0]
+            fname = photo_fp.name
+            photo = Image.open(photo_fp)
+            lowest_side = min(photo.size)
+            horizontal_padding = (lowest_side - photo.size[0]) / 2
+            vertical_padding = (lowest_side - photo.size[1]) / 2
+            photo = photo.crop(
+                (
+                    -horizontal_padding,
+                    -vertical_padding,
+                    photo.size[0] + horizontal_padding,
+                    photo.size[1] + vertical_padding
+                )
+            )
+            if photo.size[0] > 512:
+                photo = photo.resize((512, 512,))
+            buffer = BytesIO()
+            ext = splitext(fname)[1][1:].upper()
+            if ext == 'JPG':
+                ext = 'JPEG'
+            photo.save(buffer, ext)
+            self.object.photo.save(fname, buffer)
+            buffer.close()
+        if not request.POST._mutable:
+            request.POST._mutable = True
+        old_password = request.POST.pop('old_password')[0]
+        new_password1 = request.POST.pop('new_password1')[0]
+        new_password2 = request.POST.pop('new_password2')[0]
+        if old_password:
+            if request.user.check_password(old_password) and new_password1 == new_password2:
+                request.user.set_password(new_password1)
+                request.user.save()
+                login(request, request.user)
+            else:
+                messages.error(request, 'Неверный пароль.')
+        messages.info(request, 'Данные сохранены.')
+        return super().post(request, *args, **kwargs)
+
+    def get_success_url(self):
+        return reverse('user-edit', args=[self.object.id])

docker-compose.yml

@@ -22,7 +22,7 @@ services:
     restart: always
     volumes:
       - .:/lilcity
-    command: bash -c "python manage.py migrate && python manage.py loaddata /lilcity/apps/*/fixtures/*.json && python manage.py runserver 0.0.0.0:8000 && celery worker -A project -Q web"
+    command: bash -c "python manage.py migrate && python manage.py loaddata /lilcity/apps/*/fixtures/*.json && python manage.py runserver 0.0.0.0:8000 && celery worker -A project"
     environment:
       - DJANGO_SETTINGS_MODULE=project.settings
       - DATABASE_SERVICE_HOST=db

project/settings.py

@@ -162,7 +162,7 @@ STATICFILES_DIRS = [
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 
-
+LOGIN_URL = '/'
 # Email
 # https://github.com/anymail/django-anymail
 

project/templates/lilcity/index.html

@@ -33,7 +33,7 @@
   <meta property="fb:admins" content="Facebook numeric ID">
   <meta name="csrf-token" content="{{ csrf_token }}">
   <link rel="stylesheet" media="all" href={% static "css/app.css" %}>
-  <link rel="shortcut icon" type="image/png" href="{% static 'favicon.ico' %}"/>
+  <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.ico' %}"/>
   <script>
       var viewportmeta = document.querySelector('meta[name="viewport"]');
       if (viewportmeta) {
@@ -126,10 +126,10 @@
             <div class="header__group"><a class="header__section" target="_blank" href="http://blog.lil.school">БЛОГ</a></div>
           </nav>
         </div>
-        {% if user.is_authenticated %}
+        {% if request.user.is_authenticated %}
         <div class="header__login">
-          {% if user.photo %}
+          {% if request.user.photo %}
-          <div class="header__ava ava"><img class="ava__pic" src="{{ user.photo.url }}"></div>
+          <div class="header__ava ava"><img class="ava__pic" src="{{ request.user.photo.url }}"></div>
           {% else %}
           <div class="header__ava ava"><img class="ava__pic" src="{% static 'img/user.jpg' %}"></div>
           {% endif %}
@@ -138,7 +138,7 @@
             <a class="header__link header__link_green" href="#">
               <div class="header__title">ДОБАВИТЬ КУРС</div>
             </a>
-            <a class="header__link" href="{% url 'user' user.id %}">
+            <a class="header__link" href="{% url 'user' request.user.id %}">
               <div class="header__title">ПРОФИЛЬ</div>
             </a>
             <a class="header__link" href="#">
@@ -158,7 +158,7 @@
         {% endif %}
       </div>
     </div>
-    {% if user.is_authenticated and not user.fb_id or user.is_authenticated and not user.is_email_proved %}
+    {% if request.user.is_authenticated and not request.user.fb_id or request.user.is_authenticated and not request.user.is_email_proved %}
     <div class="message message_error">Необходимо подтвердить электронную почту</div>
     {% endif %}
   </header>

project/urls.py

@@ -24,7 +24,7 @@ from apps.course.views import (
     lessoncomment,
 )
 from apps.course.models import Course
-from apps.user.views import UserView
+from apps.user.views import UserView, UserEditView
 
 urlpatterns = [
     path('admin/', admin.site.urls),
@@ -37,6 +37,7 @@ urlpatterns = [
     path('lesson/<int:lesson_id>/comment', lessoncomment, name='lessoncomment'),
     path('search/', SearchView.as_view(), name='search'),
     path('user/<int:pk>/', UserView.as_view(), name='user'),
+    path('user/<int:pk>/edit/', UserEditView.as_view(), name='user-edit'),
     path('privacy', TemplateView.as_view(template_name="templates/lilcity/privacy_policy.html"), name='privacy'),
     path('terms', TemplateView.as_view(template_name="templates/lilcity/terms.html"), name='terms'),
     path('refund-policy', TemplateView.as_view(template_name="templates/lilcity/refund_policy.html"), name='refund_policy'),

web/build/js/app.js

@@ -26857,6 +26857,8 @@ __webpack_require__(152);
 
 __webpack_require__(153);
 
+__webpack_require__(154);
+
 /***/ }),
 /* 127 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -29632,6 +29634,32 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     });
 });
 
+/***/ }),
+/* 154 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _jquery = __webpack_require__(1);
+
+var _jquery2 = _interopRequireDefault(_jquery);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+(0, _jquery2.default)(document).ready(function () {
+  // Обработчик выбора пола
+  var genderInput = (0, _jquery2.default)('#gender');
+
+  (0, _jquery2.default)('div.js-select-option[data-gender-option]').on('click', function (e) {
+    e.preventDefault();
+    var currentGender = (0, _jquery2.default)(this).attr('data-gender');
+    (0, _jquery2.default)('[data-gender]').removeClass('active');
+    (0, _jquery2.default)('[data-gender=' + currentGender + ']').addClass('active');
+    genderInput.val(currentGender);
+  });
+});
+
 /***/ })
 /******/ ]);
 //# sourceMappingURL=app.js.map

web/gulp/tasks/copy.js

@@ -22,7 +22,7 @@ gulp.task('copy:rootfiles', function() {
 gulp.task('copy:img', function() {
     return gulp
         .src([
-            config.src.img + '/**/*.{jpg,png,jpeg,svg,gif}',
+            config.src.img + '/**/*.{jpg,png,jpeg,svg,gif,ico}',
             '!' + config.src.img + '/svgo/**/*.*'
         ])
         .pipe(gulp.dest(config.dest.img));

web/src/js/app.js

@@ -12,3 +12,4 @@ import "./modules/popup";
 import "./modules/courses";
 import "./modules/comments";
 import "./modules/password-show";
+import "./modules/profile";

web/src/js/modules/profile.js

@@ -0,0 +1,14 @@
+import $ from 'jquery';
+
+$(document).ready(function () {
+  // Обработчик выбора пола
+  let genderInput = $('#gender')
+
+  $('div.js-select-option[data-gender-option]').on('click', function (e) {
+    e.preventDefault();
+    const currentGender = $(this).attr('data-gender');
+    $('[data-gender]').removeClass('active');
+    $(`[data-gender=${currentGender}]`).addClass('active');
+    genderInput.val(currentGender)
+  });
+})

web/src/sass/_common.sass

@@ -3218,6 +3218,8 @@ a.grey-link
   z-index: 999
   &_error
     background: $pink
+  &_info
+    background: $green
     
 
 .mobile-hide

web/yarn.lock

@@ -5386,6 +5386,10 @@ slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
+smooth-scroll@^12.1.5:
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/smooth-scroll/-/smooth-scroll-12.1.5.tgz#b6d8deca371a9edd5ea3ad291ef0fb7e741ed41e"
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"