Merge remote-tracking branch 'origin/main'

static/css/styles(boris).css

@@ -700,7 +700,7 @@
 }
 
 .left-part-carrier-card{
-    width: calc(70% - 20px);
+    width: calc(65% - 20px);
     float: left;
     padding: 20px;
 }
@@ -810,7 +810,7 @@
 .inf_carrier{
     padding-top: 15px;
     display: block;
-
+    margin-bottom: 15px;
 }
 
 .phones_carrier{
@@ -824,16 +824,26 @@
 .phones_carrier_span{
     position: relative;
     top: 4px;
-    background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff);
+    background: linear-gradient(99deg, #040404 56%, #9f9f9f 25%, #ffffff);
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
     transition: 200ms;
+    width: calc(90% - 10px);
+    overflow: hidden;
+    float: right;
+    padding-right: 10px;
+}
+
+.inf_carrier_icon{
+    width: 10%;
 }
 
 .phones_carrier_span.active{
     background: unset;
     -webkit-background-clip: unset;
     -webkit-text-fill-color: unset;
+    overflow: unset;
+    overflow-wrap: break-word;
 }
 
 .phones_carrier input{
@@ -849,17 +859,23 @@
 
 .email_carrier_span{
     position: relative;
-    top: 6px;
+    top: 2px;
     background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff);
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
     transition: 200ms;
+    width: calc(90% - 10px);
+    float: right;
+    overflow: hidden;
+    padding-right: 10px;
 }
 
 .email_carrier_span.active{
     background: unset;
     -webkit-background-clip: unset;
     -webkit-text-fill-color: unset;
+    overflow: unset;
+    overflow-wrap: break-word;
 }
 
 .email_carrier input{
@@ -908,7 +924,7 @@
 }
 
 .inf_carrier_container{
-    width: calc(30% - 61px);
+    width: calc(35% - 61px);
     float: right;
     padding: 20px;
     border-left: 1px solid #E6E6E6;

static/js/find_route.js

@@ -7,12 +7,18 @@ function show_inf_carrier (el) {
     let btn_open_chat = form[3]
 
     ph_1.parentElement.children[1].classList.toggle("active");
-    ph_2.parentElement.children[1].classList.toggle("active");
+    try {
-    em_2.parentElement.children[1].classList.toggle("active");
+        ph_2.parentElement.children[1].classList.toggle("active");
-    if (el.innerHTML === "Скрыть контакт"){
+    } catch {
-        el.innerHTML = "Открыть контакт"
+        // p
-    } else{
-        el.innerHTML = "Скрыть контакт"
     }
+
+    em_2.parentElement.children[1].classList.toggle("active");
     btn_open_chat.classList.toggle("active")
+    if (el.style.display === "none"){
+        el.style.display = ""
+    } else {
+        el.style.display = "none"
+    }
+
 }

static/js/user_profile.js

@@ -1,7 +1,7 @@
 function writeMessage(){
     $.ajax({
         headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
-        url: '/ru/user_account/new_msg_to_user/',
+        url: '/ru/user_account/chats/',
         type: "POST",
         // async: true,
         cache: false,

templates/widgets/w_carrier_card.html

@@ -27,27 +27,26 @@
         <div class="title_container_inf_carrier">Контакты отправителия:</div>
         <div>
             <img src="{% static "/delete_later/Avatar.png" %}">
-            <span class="name_carrier">Иванов Иван</span>
+            <span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
         </div>
         <form>
             <div class="inf_carrier">
-                <a class="phones_carrier" href="tel:+ 6 (666) 666-66-66">
+                <a class="phones_carrier" href="tel:{{ route.phone }}">
-                    <img src="{% static "/img/svg/phone.svg" %}"/>
+                    <img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
-                    <span class="phones_carrier_span">+ 6 (666) 666-66-66</span>
+                    <span class="phones_carrier_span">{{ route.phone }}</span>
-                    <input name="phone_1" value="+6 29 123123123">
+                    <input name="phone_1" value="{{ route.phone }}">
                 </a>
-                <a class="phones_carrier" href="tel:+ 6 (666) 666-66-66">
+                <a class="email_carrier" href="mailto:{{ route.owner.email }}">
-                    <img src="{% static "/img/svg/phone.svg" %}">
+                    <img class="inf_carrier_icon" src="{% static "/img/svg/email.svg" %}">
-                    <span class="phones_carrier_span">+ 6 (666) 666-66-66</span>
+                    <span class="email_carrier_span">{{ route.owner.email }}</span>
-                    <input name="phone_2" value="+6 29 123123123">
+                    <input name="email_1" value="{{ route.owner.email }}">
-                </a>
-                <a class="email_carrier" href="mailto:ivanship@gmail.com">
-                    <img src="{% static "/img/svg/email.svg" %}">
-                    <span class="email_carrier_span">ivanship@gmail.com</span>
-                    <input name="email_1" value="+6 29 123123123">
                 </a>
             </div>
-            <button class="open_chat_carrier" onclick="show_inf_carrier(this)">Открыть чат</button>
+            <button class="open_chat_carrier" onclick="show_inf_carrier(this)">
+                <img src="{% static "img/svg/Logo.svg" %}" width="55px" style="position:relative;top: 4px;">
+                <img src="{% static "/img/svg/email.svg" %}" width="25px" style="position:relative;left: 3px;">
+{#                Открыть чат#}
+            </button>
             <button class="open_inf_carrier" onclick="show_inf_carrier(this)">Открыть контакт</button>
         </form>