Merge branch 'dev' of gitlab.com:lilcity/backend into dev

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

@@ -263,7 +263,49 @@ var openFile = function(file) {
 {% endblock content %}
 
 {% block foot %}
+<script src="https://code.jquery.com/jquery-2.2.0.min.js" type="text/javascript"></script>
+
+<script src="https://cdn.rawgit.com/RobinHerbots/jquery.inputmask/3.2.7/dist/min/jquery.inputmask.bundle.min.js" type="text/javascript"></script>
+<script src="https://cdn.rawgit.com/andr-04/inputmask-multi/1.2.0/js/jquery.inputmask-multi.min.js" type="text/javascript"></script>
+
 <script>
-    (new Inputmask('+7 (999) 999-99-99')).mask(document.querySelector('[name=phone]'));
+
+  $(function(){
+      var maskList = $.masksSort($.masksLoad("https://cdn.rawgit.com/andr-04/inputmask-multi/master/data/phone-codes.json"), ['#'], /[0-9]|#/, "mask");
+      var maskOpts = {
+          inputmask: {
+              definitions: {
+                  '#': {
+                      validator: "[0-9]",
+                      cardinality: 1
+                  }
+              },
+              showMaskOnHover: false,
+              autoUnmask: true,
+              clearMaskOnLostFocus: false
+          },
+          match: /[0-9]/,
+          replace: '#',
+          list: maskList,
+          listKey: "mask",
+          onMaskChange: function(maskObj, determined) {
+              if (determined) {
+                  var hint = maskObj.name_en;
+                  if (maskObj.desc_en && maskObj.desc_en != "") {
+                      hint += " (" + maskObj.desc_en + ")";
+                  }
+                  $("#descr").html(hint);
+              } else {
+                  $("#descr").html("Mask of input");
+              }
+          }
+      };
+
+      $('[name=phone]').inputmasks(maskOpts);
+
+  });
+
+
+    // (new Inputmask('+7 (999) 999-99-99')).mask(document.querySelector('[name=phone]'));
 </script>
 {% endblock foot %}

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

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({

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 = {};

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']
   },