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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SDE
2023-08-06 17:14:03 +03:00
parent ba068613fa 1b0e29aba8
commit a06e9c3435
30 changed files with 765 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
templates/blocks/b_user_profile.html
View File

@@ -31,20 +31,10 @@
</div>
</div>
<div class="info_profile">
<h1>Добро пожаловать: <span>{{ user.first_name }} {{ user.last_name }}</span> <span>({{ user.username }})</span></h1>
<div class="profile_prof"><img class="avatar_profile" src="{{ user.user_profile.avatar }}" alt="">
<div>
<div>Статус: {{ user.user_profile.get_account_type_display }}</div>
{# <div>#}
{# <select name="" id="">#}
{# <option>Перевозчик</option>#}
{# <option>Отправитель</option>#}
{# </select></div>#}
</div>
</div>
<div>Если хотите отправить посылку - зарегистрируйтесь, как отправитель</div>
<div>Если у Вас возникнут вопросы Вы можете связаться с нами: <a href="mailto:support@twb.com">support@twb.com</a></div>
<div>У Вас <a href="#">три</a> новых сообщения. <a href="#">Посмотреть</a></div>
<div>Хотите получать уведомление о появлении посылок? <a href="#">Заполните форму</a></div>
{% if not page %}
{% include "blocks/profile/b_profile_first_page.html" %}
{% elif page == 'chat' %}
{% include "blocks/profile/b_chats.html" %}
{% endif %}
</div>
</section>

87
templates/blocks/profile/b_chats.html Normal file
View File

@@ -0,0 +1,87 @@
{% load static %}
<div class="title-profile-cont">
<h1>Написать сообщение</h1>
</div>
{#<div class="container-messenger">#}
{# <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">Сергейко Сергей</span>#}
{# </div>#}
{# <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/info.svg" %}">#}
{# </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 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/info.svg" %}">
</div>
</div>
<div class="container-messages">
{% if not messages %}
{% 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 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>

4
templates/blocks/profile/b_create_ticket.html
View File

@@ -46,4 +46,6 @@
{# <input class="create-ticket-file" type="file" value="">#}
</div>
</form>
</form>
<div></div>

38
templates/blocks/profile/b_new_msg_to_user.html
View File

@@ -1,38 +0,0 @@
{% load static %}
<div class="title-profile-cont">
<h1>Написать сообщение</h1>
</div>
<div class="container-messenger">
<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">Сергейко Сергей</span>
</div>
<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/info.svg" %}">
</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>

15
templates/blocks/profile/b_profile_first_page.html Normal file
View File

@@ -0,0 +1,15 @@
<h1>Добро пожаловать: <span>{{ user.first_name }} {{ user.last_name }}</span> <span>({{ user.username }})</span></h1>
<div class="profile_prof"><img class="avatar_profile" src="{{ user.user_profile.avatar }}" alt="">
<div>
<div>Статус: {{ user.user_profile.get_account_type_display }}</div>
{# <div>#}
{# <select name="" id="">#}
{# <option>Перевозчик</option>#}
{# <option>Отправитель</option>#}
{# </select></div>#}
</div>
</div>
<div>Если хотите отправить посылку - зарегистрируйтесь, как отправитель</div>
<div>Если у Вас возникнут вопросы Вы можете связаться с нами: <a href="mailto:support@twb.com">support@twb.com</a></div>
<div>У Вас <a href="#">три</a> новых сообщения. <a href="#">Посмотреть</a></div>
<div>Хотите получать уведомление о появлении посылок? <a href="#">Заполните форму</a></div>

30
templates/pages/p_results_find_route.html Normal file
View File

@@ -0,0 +1,30 @@
{% extends "tb_base.html" %}
{% load static %}
{% block meta %}
<script src='{% static "js/find_route.js" %}'> </script>
{% endblock %}
{% block content %}
<div class="cut-width">
<div class="text-align-center">
<h1 class="title_page">Поиск перевозчика</h1>
</div>
<div class="container_form_search_carrier">
</div>
<div class="block-find-route">
<div class="block-filters-find-route">
</div>
<div class="block-finded-routes">
{% for route in routes %}
{% include "widgets/w_carrier_card.html" %}
{% endfor %}
</div>
<div class="clear_both"></div>
</div>
</div>
{% endblock %}

31
templates/small_INCLUDES/carrier_card/inf_about_moving.html Normal file
View File

@@ -0,0 +1,31 @@
{% load static %}
<div class="container_inf_about_moving">
<div class="line_inf_about_moving">
<div class="carrier_inf_moving left">
<div>Отправка:</div>
<div class="from-to-city-text">{% if route.arrival_DT %}{{ route.arrival_DT }}{% else %}Неизвестно{% endif %}</div>
</div>
<img class="arrow_inf_about_moving" src="{% static "/img/svg/arrow.svg" %}">
<div class="carrier_inf_moving right">
<div>Прибытие:</div>
<div class="from-to-city-text">{% if route.departure_DT %}{{ route.departure_DT }}{% else %}Неизвестно{% endif %}</div>
</div>
<div class="clear_both"></div>
</div>
<div class="line_inf_about_moving second">
<div class="carrier_inf_moving left">
<div>Откуда заберёт:</div>
<div class="from-to-city-text">{% if route.from_place == 'airport' %}{{ route.from_airport }}{% else %}{{ route.get_from_place_display }}{% endif %}</div>
</div>
<img class="arrow_inf_about_moving" src="{% static "/img/svg/arrow.svg" %}">
<div class="carrier_inf_moving right">
<div>Куда доставит:</div>
<div class="from-to-city-text">{% if route.to_place == 'airport' %}{{ route.to_airport }}{% else %}{{ route.get_to_place_display }}{% endif %}</div>
</div>
<div class="clear_both"></div>
</div>
</div>

6
templates/tb_base.html
View File

@@ -8,17 +8,19 @@
<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(boris).css' %}">
<link rel="stylesheet" href="{% static 'css/styles(boris).css' %}" >
{% block meta %}
{% endblock %}
</head>
<body>
<div class="wrapper">
{% include 'blocks/b_header.html' %}
{% block content %}

56
templates/widgets/w_carrier_card.html Normal file
View File

@@ -0,0 +1,56 @@
{% load static %}
<div class="carrier-card">
<div class="left-part-carrier-card">
<div class="first-line-card-carrier">
<div class="carrier-title">
Перевозчик:
</div>
<div class="type_transportation_carrier">
{{ route.get_type_transport_display }}
</div>
<div class="clear_both"></div>
</div>
<div class="from-to-country-container-carrier">
<div class="from-to-country-text left fl-left txt-al-right">
{% if route.from_country %}{{ route.from_country }}{% else %}Неизвестно{% endif %} / {% if route.from_city %}{{ route.from_city }}{% else %}Неизвестно{% endif %}
</div>
<div class="splitter-from-to-country"></div>
<div class="from-to-country-text right fl-right txt-al-left">
{% if route.to_country %}{{ route.to_country }}{% else %}Неизвестно{% endif %} / {% if route.to_city %}{{ route.to_city }}{% else %}Неизвестно{% endif %}
</div>
</div>
{% include "small_INCLUDES/carrier_card/inf_about_moving.html" %}
</div>
{# <div class="splliter-left-right-part-carrier-card"></div>#}
<div class="inf_carrier_container">
<div class="title_container_inf_carrier">Контакты отправителия:</div>
<div>
<img src="{% static "/delete_later/Avatar.png" %}">
<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:{{ route.phone }}">
<img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
<span class="phones_carrier_span">{{ route.phone }}</span>
<input name="phone_1" value="{{ route.phone }}">
</a>
<a class="email_carrier" href="mailto:{{ route.owner.email }}">
<img class="inf_carrier_icon" src="{% static "/img/svg/email.svg" %}">
<span class="email_carrier_span">{{ route.owner.email }}</span>
<input name="email_1" value="{{ route.owner.email }}">
</a>
</div>
<button class="open_chat_carrier" onclick="open_chat({{ route.owner_id }})">
<img src="{% static "img/svg/Logo.svg" %}" width="30px" style="position:relative;top: 6px;">
<span style="position: relative;top: 2px;">Написать</span>
{# <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>
</div>
<div class="clear_both"></div>
</div>