Merge remote-tracking branch 'origin/main'

static/js/authorization.js

@@ -18,7 +18,7 @@ function SendLoginForm(el){
         data: formData,
         success: function(data){
 
-            location.href = `/profile/page/dashboard/?mobile=${getInfoAboutUser() === 'mobile'}`
+            location.href = `/profile/page/dashboard/`
 
 
 

static/js/global_js.js

@@ -11,6 +11,28 @@ window.onload = function (){
     middleWareJS()
     openOrCloseCurtainSupportChat()
     openOverlayOrClose()
+    if (window.location.href.includes('profile') && !window.location.href.includes('login') && !window.location.href.includes('registration')){
+        let user_type = getInfoAboutUser()
+        if (user_type === 'mobile') {
+            open_curtain_w_btn_profile()
+
+        } else {
+            if (!window.location.href.includes('profile')){
+                open_curtain_w_btn_profile()
+            }
+        }
+        if (window.location.href.includes("profile")){
+            setStandartSettingsToBlockOverlay()
+        }
+
+        // if (window.location.href.includes("profile")){
+        //     selectTabProfileIfHisNotSelected(url)
+        // }
+        let chats = document.querySelector(`[data-ajax-url='chats']`)
+        if (chats){
+            deleteMarkerMessages()
+        }
+    }
 }
 //
 

static/js/registration.js

@@ -15,7 +15,7 @@ function SendRegistrationForm(el){
         data: formData,
         success: function(data){
 
-            location.href = `/profile/page/dashboard/?mobile=${getInfoAboutUser() === 'mobile'}`
+            location.href = `/profile/page/dashboard/`
         },
         error: function (data, exception){
             document.querySelector(".register").innerHTML = data.responseJSON.html