diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html index fc626bf6..554650e5 100644 --- a/apps/user/templates/user/profile-settings.html +++ b/apps/user/templates/user/profile-settings.html @@ -263,7 +263,49 @@ var openFile = function(file) { {% endblock content %} {% block foot %} + + + + + {% endblock foot %} diff --git a/web/src/js/modules/auth.js b/web/src/js/modules/auth.js index 3ec8780e..07f65cda 100644 --- a/web/src/js/modules/auth.js +++ b/web/src/js/modules/auth.js @@ -39,7 +39,8 @@ $(document).ready(function () { e.preventDefault(); pass.hide(); - login.fadeIn(); + // login.fadeIn(); + window.location.reload(); }); $('#password-reset__success-hide').on('click', function (e) { diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js index dea36989..a134cdf5 100644 --- a/web/src/js/modules/common.js +++ b/web/src/js/modules/common.js @@ -3,11 +3,11 @@ import Inputmask from "inputmask"; import SmoothScroll from 'smooth-scroll/dist/js/smooth-scroll'; import baguetteBox from 'baguettebox.js' +window.$ = window.jQuery = jQuery = $; window.Inputmask = Inputmask; window.baguetteBox = baguetteBox; $(document).ready(function () { - baguetteBox.run('.gallery'); // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery. $.ajaxSetup({ diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js index 0f8410c0..ae78ae6b 100644 --- a/web/src/js/modules/popup.js +++ b/web/src/js/modules/popup.js @@ -51,6 +51,10 @@ $(document).ready(function () { setTimeout(function(){ popup.removeClass('open'); }, 300); + + if($('#password-reset__sent').is(':visible')) { + window.location.reload(); + } } var selectedWeekdays = {}; diff --git a/web/webpack.config.js b/web/webpack.config.js index 86bb2b2b..8f41c12e 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -103,14 +103,15 @@ module.exports = { new webpack.ProvidePlugin({ $: "jquery", jQuery: "jquery", - "window.jQuery": "jquery" + "window.jQuery": "jquery", + "window.$": "jquery" }), new ExtractTextPlugin('[name].css'), ], resolve: { alias: { - vue: 'vue/dist/vue.js' + vue: 'vue/dist/vue.js', }, extensions: ['*', '.js', '.vue'] },