sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.0.45

Browse Source
This commit is contained in:
borissedw
2023-08-06 16:57:20 +03:00
parent 8c2043198f
commit 1b0e29aba8
5 changed files with 99 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/css/styles(boris).css
View File

@@ -824,7 +824,7 @@
.phones_carrier_span{ .phones_carrier_span{
position: relative; position: relative;
top: 4px; top: 6px;
background: linear-gradient(99deg, #040404 56%, #9f9f9f 25%, #ffffff); background: linear-gradient(99deg, #040404 56%, #9f9f9f 25%, #ffffff);
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
@@ -860,7 +860,7 @@
.email_carrier_span{ .email_carrier_span{
position: relative; position: relative;
top: 2px; top: 5px;
background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff); background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff);
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;

22
static/js/user_profile(boris).js
View File

@@ -170,7 +170,7 @@ function selectedUserMessenger (el,ticket_id){
}); });
} }
function sendMessage(id_ticket,sender,receiver){ function sendMessage(id_ticket=null,sender,receiver){
event.preventDefault() event.preventDefault()
let text = document.querySelector(".enter-message-inp").value let text = document.querySelector(".enter-message-inp").value
@@ -179,14 +179,24 @@ function sendMessage(id_ticket,sender,receiver){
// //
} }
else { else {
let data = { let data = {}
'ticket_id': id_ticket, if (id_ticket === null){
'sender': sender, data = {
'receiver': receiver, 'sender': sender,
'text': text 'receiver': receiver,
'text': text
}
} else {
data = {
'ticket_id': id_ticket,
'sender': sender,
'receiver': receiver,
'text': text
}
} }
$.ajax({ $.ajax({
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
url: '/ru/messages/send_msg/', url: '/ru/messages/send_msg/',

101
templates/blocks/profile/b_chats.html
View File

@@ -4,35 +4,84 @@
<h1>Написать сообщение</h1> <h1>Написать сообщение</h1>
</div> </div>
<div class="container-messenger"> {#<div class="container-messenger">#}
<div class="block-chat"> {# <div class="block-chat">#}
<div class="container-header-chat"> {# <div class="container-header-chat">#}
<div class="header-chat-left-part"> {# <div class="header-chat-left-part">#}
<img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}"> {# <img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">#}
<span class="chat-username">Сергейко Сергей</span> {# <span class="chat-username">Сергейко Сергей</span>#}
</div> {# </div>#}
<div class="header-chat-right-part"> {# <div class="header-chat-right-part">#}
<img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}"> {# <img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}">#}
<img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}"> {# <img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">#}
</div> {# </div>#}
{# </div>#}
{# <div class="container-messages">#}
{# {% include "widgets/w_message.html" %}#}
{# </div>#}
{# <div class="footer-chat">#}
{# <div class="left-part-block-enter-message">#}
{# <input class="enter-message-inp" placeholder="Отправить сообщение">#}
{# </div>#}
{# <div class="right-part-block-enter-message">#}
{# <button class="attach-file-btn-message" onclick="attachFilemeassge()"></button>#}
{# <button class="send-message"></button>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="block-list-of-users">#}
{# <span class="title-list-of-users">Пользователи</span>#}
{# <div class="insert_users">#}
{# {% include "widgets/w_tab_user.html" %}#}
{# </div>#}
{# </div>#}
{#</div>#}
<div class="block-chat">
<div class="container-header-chat">
<div class="header-chat-left-part">
<img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">
<span class="chat-username">{{ ticket.manager.last_name }} {{ ticket.manager.first_name }}</span>
</div> </div>
<div class="container-messages"> <div class="header-chat-right-part">
{% include "widgets/w_message.html" %} <img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}">
</div> <img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">
<div class="footer-chat">
<div class="left-part-block-enter-message">
<input class="enter-message-inp" placeholder="Отправить сообщение">
</div>
<div class="right-part-block-enter-message">
<button class="attach-file-btn-message" onclick="attachFilemeassge()"></button>
<button class="send-message"></button>
</div>
</div> </div>
</div> </div>
<div class="block-list-of-users">
<span class="title-list-of-users">Пользователи</span> <div class="container-messages">
<div class="insert_users"> {% if not messages %}
{% include "widgets/w_tab_user.html" %} {% with text=ticket.text modifiedDT=ticket.modifiedDT %}
{% include "widgets/w_message.html" %}
{% endwith %}
{% else %}
{% for msg in messages %}
{% with text=msg.text modifiedDT=msg.modifiedDT %}
{% include "widgets/w_message.html" %}
{% endwith %}
{% endfor %}
{% endif %}
</div>
<div class="footer-chat">
<div class="left-part-block-enter-message">
<input class="enter-message-inp" onkeypress="sendMessageEnter(event,{{ ticket.id }},{{ user.id }},{{ ticket.owner.id }})" placeholder="Отправить сообщение">
</div> </div>
<div class="right-part-block-enter-message">
<button class="attach-file-btn-message" onclick="attachFilemeassge()"></button>
<button class="send-message" onclick="sendMessage({{ ticket.id }},{{ user.id }},{{ ticket.owner.id }})"></button>
</div>
</div>
</div>
<div class="block-list-of-users">
<span class="title-list-of-users">Неразобранные тикеты</span>
<div class="insert_users">
{% if tickets_wo_manager %}
{% for item in tickets_wo_manager %}
{% include "widgets/w_tab_user.html" %}
{% endfor %}
{% endif %}
</div> </div>
</div> </div>

4
templates/tb_base.html
View File

@@ -8,9 +8,11 @@
<script src='{% static "js/jquery_v3_6_4.js" %}'> </script> <script src='{% static "js/jquery_v3_6_4.js" %}'> </script>
<link rel="stylesheet" href="{% static 'css/styles.css' %}"> <link rel="stylesheet" href="{% static 'css/styles.css' %}">
<link rel="stylesheet" href="{% static 'css/styles(boris).css' %}"> <link rel="stylesheet" href="{% static 'css/styles(boris).css' %}" >
{% block meta %} {% block meta %}

6
templates/widgets/w_carrier_card.html
View File

@@ -43,9 +43,9 @@
</a> </a>
</div> </div>
<button class="open_chat_carrier" onclick="open_chat({{ route.owner_id }})"> <button class="open_chat_carrier" onclick="open_chat({{ route.owner_id }})">
<img src="{% static "img/svg/Logo.svg" %}" width="30px" style="position:relative;top: 8px;"> <img src="{% static "img/svg/Logo.svg" %}" width="30px" style="position:relative;top: 6px;">
<span style="position: relative;top: 4px;">Написать</span> <span style="position: relative;top: 2px;">Написать</span>
<img src="{% static "/img/svg/email.svg" %}" width="25px" style="position:relative;left: 3px;"> {# <img src="{% static "/img/svg/email.svg" %}" width="25px" style="position:relative;left: 3px;">#}
</button> </button>
<button class="open_inf_carrier" onclick="show_inf_carrier(this)">Открыть контакт</button> <button class="open_inf_carrier" onclick="show_inf_carrier(this)">Открыть контакт</button>
</form> </form>