Merge remote-tracking branch 'origin/main'

static/css/styles(boris).css

@@ -1280,6 +1280,9 @@
     border-radius: 10px;
     /*padding: 20px;*/
 }
+.carrier-card.hide{
+    display: none;
+}
 
 .left-part-carrier-card{
     width: 58%;

static/css/styles.css

@@ -682,6 +682,10 @@ header .header-second {
     width: 40px;
     border-radius: 10px;
     aspect-ratio: 4/3;
+    display: none;
+}
+.route_contact_avatar.active{
+    display: inline-block;
 }
 
 .from_address_point_txt.red_text{

static/js/find_route.js

@@ -4,12 +4,13 @@ function show_inf_carrier (el) {
     let form = el.closest("div[name='form_carrier']")
     let finish_form = form.children
     let form_open = finish_form[0].children
+    let img_1 = form_open[0]
     let nm_1 = form_open[1]
     let ph_1 = form_open[2]
     let em_1 = form_open[3]
 
     let btn_open_chat = finish_form[1]
-    let els = [nm_1, ph_1.querySelectorAll(".el_for_open_el")[0],em_1.querySelectorAll(".el_for_open_el")[0]]
+    let els = [img_1, nm_1, ph_1.querySelectorAll(".el_for_open_el")[0],em_1.querySelectorAll(".el_for_open_el")[0]]
     // let iter_lists = 0
     for (let i = 0;i < els.length;i++){
         els[i].classList.toggle("active")

templates/widgets/w_carrier_card.html

@@ -7,11 +7,10 @@
         {% if departure_date_string < current_date %}
             <div class="carrier-card out_of_date" data-number-of-route="{{ route.id }}">
         {% else %}
-            <div class="carrier-card" data-number-of-route="{{ route.id }}">
+            <div class="carrier-card {% if route.owner == user %}hide{% endif %}" data-number-of-route="{{ route.id }}">
         {% endif %}
    {% endwith %}
-{% else %}
+
-    <div class="carrier-card" data-number-of-route="{{ route.id }}">
 {% endif %}
     <div class="left-part-carrier-card">
         {% if route.owner_type == 'mover'  %}
@@ -110,7 +109,8 @@
 
                              {% if user.is_authenticated %}
                     {#            <span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>#}
-                                <span class="name_carrier{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
+                                <span class="name_carrier{% if route.owner == user %}active{% endif %} el_for_open_el">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
+
                             {% endif %}
                              {% if not user.is_authenticated %}
                                 <span class="name_carrier"></span>
@@ -118,13 +118,13 @@
 
                             <a class="phones_carrier" data-href="tel:{{ route.phone }}">
                                 <img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
-                                <span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.phone }}</span>
+                                <span class="phones_carrier_span el_for_open_el">{{ route.phone }}</span>
                 {#                <input value="{{ route.phone }}">#}
                                 <div class="clear_both"></div>
                             </a>
                             <a class="email_carrier" data-href="mailto:{{ route.owner.email }}">
                                 <img class="inf_carrier_icon" src="{% static "/img/svg/email.svg" %}">
-                                <span class="email_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.owner.email }}</span>
+                                <span class="email_carrier_span el_for_open_el">{{ route.owner.email }}</span>
                 {#                <input value="{{ route.owner.email }}">#}
                                 <div class="clear_both"></div>
             {#                    <div>{{ route.get_cargo_type_display }}</div>#}

templates/widgets/w_route_info.html

@@ -67,14 +67,15 @@
                 <img class="inf_carrier_icon" src="{% static "/img/svg/cargo.svg" %}"/>
             {% endif %}
         </div>
-        <div>
+
-            <img class="route_contact_avatar" {% if route.owner.user_profile.avatar %}
-            src="{{ route.owner.user_profile.avatar.url }}"
-            {% else %}src="{% static "img/svg/user_icon_standart.png" %}"{% endif %}>
-            <span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
-        </div>
         <div name="form_carrier">
             <div class="inf_carrier">
+
+                <img class="route_contact_avatar {% if route.owner == user %} active{% endif %}" {% if route.owner.user_profile.avatar %}
+                    src="{{ route.owner.user_profile.avatar.url }}"
+                    {% else %}src="{% static "img/svg/user_icon_standart.png" %}"{% endif %}>
+                <span class="name_carrier{% if route.owner == user %} active{% endif %}">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
+
                 <a class="phones_carrier" href="tel:{{ route.phone }}">
                     <img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
                     <span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.phone }}</span>