Merge branch 'dev' into feature/api

apps/course/templates/course/_items.html

@@ -42,7 +42,7 @@
       {% endif %}
     </a>
     <div class="user__info">
-      <a href="{% url 'user' course.author.id %}">
+      <a href="{% url 'user' course.author.id %}" class="link--black">
         <div class="user__name">{{ course.author.get_full_name }}</div>
       </a>
       <div class="user__meta">

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

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

project/templates/lilcity/index.html

@@ -284,7 +284,7 @@
                       <div id="learner-auth-field-error__all" class="auth-register__common-error form__common-error learner-auth-form__field-error"></div>
                     </div>
                     <div class="auth__foot">
-                      <button class="auth__btn btn btn_light" tabindex="3">ВОЙТИ</button>
+                      <button id="learner-auth__button" class="auth__btn btn btn_light" tabindex="3">ВОЙТИ</button>
                       <div class="auth__or">или</div>
                       <button type="button" class="auth__btn btn btn_fb">
                         <svg class="icon icon-facebook">
@@ -385,7 +385,7 @@
                            class="form__common-error password-reset-form__field-error"></div>
                     </div>
                     <div class="auth__foot">
-                      <button class="auth__btn btn btn_light">ОТПРАВИТЬ</button>
+                      <button id="password-reset__button" class="auth__btn btn btn_light">ОТПРАВИТЬ</button>
                     </div>
                   </div>
                 </form>

web/build/js/app.js

@@ -27724,6 +27724,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
         (0, _jquery2.default)('.form__common-error').hide();
 
+        var passwordResetButton = (0, _jquery2.default)('#password-reset__button');
+        passwordResetButton.addClass('loading');
+
         _jquery2.default.ajax(passwordResetForm.attr('action'), {
             method: 'POST',
             data: passwordResetForm.serialize()
@@ -27753,6 +27756,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
                 }
             }
             (0, _jquery2.default)('#learner-auth-field-error__all').text('Произошла незвестная ошибка');
+        }).always(function () {
+            passwordResetButton.removeClass('loading');
         });
     });
 
@@ -27786,15 +27791,21 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
             return;
         }
 
+        var authButton = (0, _jquery2.default)('#learner-auth__button');
+        authButton.addClass('loading');
+
         _jquery2.default.ajax(authForm.attr('action'), {
             method: 'POST',
             data: authForm.serialize()
         }).done(function (data) {
             if (data.success === true) {
                 location.reload();
+            } else {
+                authButton.removeClass('loading');
             }
         }).fail(function (xhr) {
             console.log('error', xhr);
+            authButton.removeClass('loading');
             if (xhr.status === 400) {
                 if (xhr.responseJSON.errors) {
                     for (var errorField in xhr.responseJSON.errors) {
@@ -27859,6 +27870,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
         }
 
         (0, _jquery2.default)('.form__common-error').hide();
+        var registrationButton = (0, _jquery2.default)('#learner-registration-form__submit-button');
+        registrationButton.addClass('loading');
 
         _jquery2.default.ajax(registrationForm.attr('action'), {
             method: 'POST',
@@ -27866,9 +27879,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
         }).done(function (data) {
             if (data.success === true) {
                 location.reload();
+            } else {
+                registrationButton.removeClass('loading');
             }
         }).fail(function (xhr) {
             console.log('error', xhr);
+            registrationButton.removeClass('loading');
             if (xhr.status === 400) {
                 if (xhr.responseJSON.errors) {
                     for (var errorField in xhr.responseJSON.errors) {
@@ -28405,6 +28421,9 @@ var history = (0, _createBrowserHistory2.default)();
     // Обработчик выбора категории
     (0, _jquery2.default)('div.js-select-option[data-category-option]').on('click', function (e) {
         e.preventDefault();
+        var currentCategory = (0, _jquery2.default)(this).attr('data-category-name');
+        (0, _jquery2.default)('[data-category-name]').removeClass('active');
+        (0, _jquery2.default)('[data-category-name=' + currentCategory + ']').addClass('active');
         history.replace((0, _jquery2.default)(this).attr('data-category-url'));
         load_courses((0, _jquery2.default)(this).attr('data-category-url'), true);
     });

web/src/js/modules/auth.js

@@ -73,6 +73,9 @@ $(document).ready(function () {
 
         $('.form__common-error').hide();
 
+        let passwordResetButton = $('#password-reset__button');
+        passwordResetButton.addClass('loading');
+
         $.ajax(passwordResetForm.attr('action'), {
             method: 'POST',
             data: passwordResetForm.serialize(),
@@ -104,6 +107,9 @@ $(document).ready(function () {
                     }
                 }
                 $('#learner-auth-field-error__all').text('Произошла незвестная ошибка');
+            })
+            .always(() => {
+                passwordResetButton.removeClass('loading');
             });
     });
 
@@ -137,6 +143,9 @@ $(document).ready(function () {
             return;
         }
 
+        let authButton = $('#learner-auth__button');
+        authButton.addClass('loading');
+
         $.ajax(authForm.attr('action'), {
             method: 'POST',
             data: authForm.serialize(),
@@ -144,10 +153,13 @@ $(document).ready(function () {
             .done(function (data) {
                 if (data.success === true) {
                     location.reload();
+                } else {
+                    authButton.removeClass('loading');
                 }
             })
             .fail(function (xhr) {
                 console.log('error', xhr);
+                authButton.removeClass('loading');
                 if (xhr.status === 400) {
                     if (xhr.responseJSON.errors) {
                         for (let errorField in xhr.responseJSON.errors) {
@@ -212,6 +224,8 @@ $(document).ready(function () {
         }
 
         $('.form__common-error').hide();
+        let registrationButton = $('#learner-registration-form__submit-button');
+        registrationButton.addClass('loading');
 
         $.ajax(registrationForm.attr('action'), {
             method: 'POST',
@@ -220,10 +234,13 @@ $(document).ready(function () {
             .done(function (data) {
                 if (data.success === true) {
                     location.reload();
+                } else {
+                    registrationButton.removeClass('loading');
                 }
             })
             .fail(function (xhr) {
                 console.log('error', xhr);
+                registrationButton.removeClass('loading');
                 if (xhr.status === 400) {
                     if (xhr.responseJSON.errors) {
                         for (let errorField in xhr.responseJSON.errors) {

web/src/js/modules/courses.js

@@ -25,6 +25,9 @@ $(document).ready(function () {
     // Обработчик выбора категории
     $('div.js-select-option[data-category-option]').on('click', function (e) {
         e.preventDefault();
+        const currentCategory = $(this).attr('data-category-name');
+        $('[data-category-name]').removeClass('active');
+        $(`[data-category-name=${currentCategory}]`).addClass('active');
         history.replace($(this).attr('data-category-url'));
         load_courses($(this).attr('data-category-url'), true);
     });

web/src/sass/_common.sass

@@ -1837,11 +1837,11 @@ a.grey-link
     &:after
       content: ''
       position: absolute
-      top: 100%
+      top: 50%
       left: -10px
       right: -10px
       height: 2px
-      margin-top: 2px
+      margin-top: -2px
       background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%)
   &__title
     display: table
@@ -3241,7 +3241,9 @@ a.grey-link
     border-radius: 0 3px 3px 0 
     flex: 0 0 100px
 
-
+a
+  &.link--black
+    color: #000