Merge remote-tracking branch 'origin/dev' into dev

apps/auth/templates/auth/password_reset.html

@@ -1,2 +1,10 @@
-Someone asked for password reset for email {{ email }}. Follow the link below:
-{{ protocol}}://{{ domain }}{% url 'lilcity:password_reset_confirm' uidb64=uid token=token %}
+{% extends "notification/email/_base.html" %}
+
+{% block content %}
+  <p style="margin: 0 0 20px">Для восстановления пароля нажмите кнопку ниже.</p>
+  <div style="margin-bottom: 10px;">
+    <a href="{{ protocol}}://{{ domain }}{% url 'lilcity:password_reset_confirm' uidb64=uid token=token %}" style="text-decoration: none; position: relative; padding: 13px 24px 12px; background-image: linear-gradient(-225deg, #D1FF7F 0%, #56FFFD 100%); border-radius: 3px; font-size: 12px; color: #191919; text-transform: uppercase; letter-spacing: 2px; text-align: center; transition: all .2s; z-index: 2;">Нажмите для восстановления</a>
+    <p>Или скопируйте ссылку ниже, и вставьте её в адресную строку браузера.</p>
+    <p>{{ protocol}}://{{ domain }}{% url 'lilcity:password_reset_confirm' uidb64=uid token=token %}</p>
+  </div>
+{% endblock content %}

apps/auth/templates/auth/password_reset.txt

@@ -0,0 +1,2 @@
+Восстановление пароля для {{ email }}. Перейдите по ссылке ниже:
+{{ protocol}}://{{ domain }}{% url 'lilcity:password_reset_confirm' uidb64=uid token=token %}

apps/auth/templates/auth/password_reset_confirm.html

@@ -1,12 +1,38 @@
+{% extends "templates/lilcity/index.html" %}
+{% load static %}
+
+{% block content %} 
 {% if validlink %}
-<h3>Change password</h3>
-<form method="post">
-  {% csrf_token %}
-  {{ form.as_p }}
-  <button type="submit">Change password</button>
-</form>
-{% else %}
-<p>
-  The password reset link was invalid, possibly because it has already been used.
-  Please request a new password reset.
-</p>
+<div class="section section_border">
+  <div class="section__center center">
+    <div class="head">
+      <div class="head__title title title_center">Смена пароля</div>
+    </div>
+  </div>
+</div>
+<div class="section">
+  <div class="section__center center center_sm">
+    <form method="post">
+      {% csrf_token %}
+      <div class="field">
+        <div class="field__label">Новый пароль</div>
+        <div class="field__wrap">
+          <input class="field__input" name="new_password1" required="" id="id_new_password1" type="password" placeholder="">
+        </div>
+      </div>
+      <div class="field">
+        <div class="field__label">Повторите пароль</div>
+        <div class="field__wrap">
+          <input class="field__input" name="new_password2" required="" id="id_new_password2" type="password" placeholder="">
+        </div>
+      </div>
+      <button class="btn" type="submit">Сменить пароль</button>
+    </form>
+    {% else %}
+    <p>
+      The password reset link was invalid, possibly because it has already been used. Please request a new password reset.
+    </p>
+    {% endif %}
+  </div>
+</div>
+{% endblock content %}

apps/auth/views.py

@@ -94,13 +94,13 @@ class SuccessVerificationEmailView(TemplateView):
 
 
 class PasswordResetView(views.PasswordContextMixin, BaseFormView):
-    email_template_name = "auth/password_reset.html"
+    email_template_name = 'auth/password_reset.txt'
     subject_template_name = "auth/password_reset_subject.txt"
     form_class = views.PasswordResetForm
 
     extra_email_context = None
     from_email = None
-    html_email_template_name = None
+    html_email_template_name = "auth/password_reset.html"
     title = 'Password reset'
     token_generator = views.default_token_generator
 
@@ -139,7 +139,6 @@ class FacebookLoginOrRegistration(View):
             return JsonResponse({"success": False})
 
         fb_id = data.get('id')
-        print(fb_id)
 
         lilcity_user_settings = User.objects.filter(fb_id=fb_id)
         if lilcity_user_settings.count():

apps/course/templates/course/inclusion/category_items.html

@@ -1,5 +1,5 @@
-{% for category in category_items %}
-  <div class="select__option js-select-option" data-category-option data-category-url="{% url 'courses' %}?category={{ category.title }}">
-    <div class="select__title">{{ category.title }}</div>
+{% for cat in category_items %}
+  <div class="select__option js-select-option" data-category-option data-category-url="{% url 'courses' %}?category={{ cat.title }}">
+    <div class="select__title">{{ cat.title }}</div>
   </div>
 {% endfor %}

apps/course/views.py

@@ -176,6 +176,12 @@ class CoursesView(ListView):
         filtered = CourseFilter(self.request.GET, queryset=queryset)
         return filtered.qs
 
+    def get_context_data(self):
+        context = super().get_context_data()
+        filtered = CourseFilter(self.request.GET)
+        context.update(filtered.data)
+        return context
+
     def get_template_names(self):
         if self.request.is_ajax():
             return 'course/course_items.html'