Merge remote-tracking branch 'origin/main'

static/css/mobile_styles.css

@@ -1137,10 +1137,12 @@
         float: unset;
         /*background: linear-gradient(92deg, #000000 1%, #ffffff 93%, #ffffff);*/
         /*background: linear-gradient(90deg, #000000 1%, #ffffff 81%, #ffffff);*/
-        -webkit-text-fill-color: unset;
         padding-right: unset;
         font-size: 14px;
         top: unset;
+        background: linear-gradient(99deg, #000000 1%, #ffffff 16%, #ffffff);
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
     }
     .email_carrier{
         display: inline-block;

static/css/styles(boris).css

@@ -936,6 +936,8 @@
     border-radius: 10px;
     display: flex;
     padding: 13px;
+    position: relative;
+    z-index: 1000;
 }
 
 .container_form_search_carrier > form{
@@ -1925,6 +1927,7 @@
     width: 100%;
     color: #272424;
     margin-bottom: 20px;
+    margin-top: 15px;
 }
 
 .method_transport{
@@ -2620,6 +2623,7 @@
 .menu_profile{
     width: 320px;
     text-align: -webkit-center;
+    text-align: -moz-center;
     padding: 0;
     overflow-y: auto;
     height: calc(100vh - 95px);

static/css/styles.css

@@ -895,7 +895,7 @@ section.register>form {
     background: #FFF;
     display: flex;
     height: 70px;
-    margin-bottom: 40px;
+    margin: 0 auto;
 }
 
 
@@ -2479,7 +2479,7 @@ button#send_feedback_form{
 /*tabs_on_main_page*/
 
 .pre_bottom_block_static{
-    width: 90%;
+    width: 100%;
     margin: auto;
 }
 .pre_bottom_block_static>h2{

static/js/chat_socket_functions/etc_operations_for_chat_socket.js

@@ -21,15 +21,21 @@ function loader_show_message (data) {
     let send_btn = document.querySelector(".send-message")
     let at = document.querySelector(".attach-file-btn-message")
     if (loader){
-        if (loader.classList.contains("show")){
+        send_btn.classList.add("hide")
-            send_btn.classList.remove("hide")
+        loader.classList.add("show")
-            loader.classList.remove("show")
+        at.classList.add("loader")
-            at.classList.remove("loader")
+    } else {
-        } else {
+        console.log("cannot find loader")
-            send_btn.classList.add("hide")
+    }
-            loader.classList.add("show")
+}
-            at.classList.add("loader")
+function loader_hide_message (data) {
-        }
+    let loader = document.querySelector(".loader_show_message");
+    let send_btn = document.querySelector(".send-message")
+    let at = document.querySelector(".attach-file-btn-message")
+    if (loader){
+        send_btn.classList.remove("hide")
+        loader.classList.remove("show")
+        at.classList.remove("loader")
 
     } else {
         console.log("cannot find loader")

static/js/chat_sockets.js

@@ -106,6 +106,7 @@ function wsReceiveData (e) {
         play_required_beep(data,beep)
     }
     loader_show_message(data)
+    loader_hide_message(data)
 }
 
 

templates/forms/f_registration.html

@@ -12,21 +12,7 @@
     <form name="registration_form" method="POST">
         {% csrf_token %}
 
-{#          <div class="switch">#}
+{#
-{#            <div><a class="active" href="#">Перевозчик</a></div>#}
-{#            <div><a class="deadctive" href="#">Отправитель</a></div>#}
-{#          </div>#}
-{#        <div class="switch">#}
-{#            <div class="form_radio_btn">#}
-{##}
-{#                <input class="{% if account_type == "mover" %}active {% else  %} deactive{% endif %}" id="radio-1" type="radio" name="account_type" value="mover" >#}
-{#                <label for="radio-1">Перевозчик</label>#}
-{#            </div>#}
-{#            <div class="form_radio_btn">#}
-{#                <input class="{% if account_type == "sender" %}active {% else  %} deactive{% endif %}" id="radio-2" type="radio" name="account_type" value="sender" checked>#}
-{#                <label for="radio-2">Отправитель</label>#}
-{#            </div>#}
-{#        </div>#}
 
 
           <div class="inputs">

templates/pages/p_main.html

@@ -22,7 +22,27 @@
             </p>
         </span>
 
+
+{#         <div class="switch">#}
+{#            <div><a class="active" href="#">Перевозчик</a></div>#}
+{#            <div><a class="deadctive" href="#">Отправитель</a></div>#}
+{#          </div>#}
+
         </div>
+
+
+    </div>
+
+    <div class="switch">
+            <div class="form_radio_btn">
+                <input class="{% if route.owner_type == 'mover' %}active {% else  %} deactive{% endif %}" id="radio-1" type="radio" name="account_type" value="mover" >
+                <label for="radio-1">{% translate "Найти перевозчика" %}</label>
+            </div>
+
+            <div class="form_radio_btn">
+                <input class="{% if route.owner_type == 'customer' %}active {% else  %} deactive{% endif %}" id="radio-2" type="radio" name="account_type" value="customer" checked>
+                <label for="radio-2">{% translate "Найти отправителя" %}</label>
+            </div>
     </div>
 
     <div class="search_form_main">
@@ -158,11 +178,11 @@
                     <div class="card_title_1">{% translate "в 3 раза" %}</div>
                     <div class="card_title_2">{% translate "быстрее других сервисов" %}</div>
                     <div class="card_title_3">{% translate "Почтовые сервисы доставляет посылки в среднем за 10 дней. С нами - быстрее!" %}</div>
-
+                    <div class="card_gradient"></div>
 
 
 {#                <div class="cards_item_2_right">#}
-{#                    <div class="card_gradient"></div>#}
+{#                    #}
 {#                </div>#}
             </div>
             <div class="cards_item_3">