From ca05de3d7db1f1088c0206a894a7b9069395fb55 Mon Sep 17 00:00:00 2001 From: SBD Date: Fri, 24 Jan 2025 21:43:03 +0300 Subject: [PATCH] 0.0.131 search routes --- RoutesApp/js_views.py | 2 +- static/v2/css/blocks/b_filter_routes.css | 1 + .../v2/css/pages/p_search_route_results.css | 3 +- static/v2/css/widgets/w_route_card.css | 18 +- static/v2/icons/widgets/w_route_card/chat.png | Bin 0 -> 13155 bytes static/v2/js/blocks/b_search_routes.js | 3 + static/v2/js/twb.js | 3 + static/v2/js/widgets/w_route_card.js | 11 + templates/v2/blocks/b_my_routes.html | 2 +- .../v2/blocks/b_search_routes_result.html | 6 + .../route_card_actions_container.html | 39 ++++ .../w_route_card/route_card_info_data.html | 50 ++++ .../route_card_info_data_for_search.html | 54 +++++ .../w_route_card/route_card_route_data.html | 129 +++++++++++ .../v2/pages/p_search_route_results.html | 6 +- .../v2/widgets/w_customer_route_card.html | 214 ------------------ templates/v2/widgets/w_route_card.html | 8 + .../v2/widgets/w_route_card_for_search.html | 8 + 18 files changed, 336 insertions(+), 221 deletions(-) create mode 100644 static/v2/icons/widgets/w_route_card/chat.png create mode 100644 templates/v2/blocks/b_search_routes_result.html create mode 100644 templates/v2/content_widgets/w_route_card/route_card_actions_container.html create mode 100644 templates/v2/content_widgets/w_route_card/route_card_info_data.html create mode 100644 templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html create mode 100644 templates/v2/content_widgets/w_route_card/route_card_route_data.html delete mode 100644 templates/v2/widgets/w_customer_route_card.html create mode 100644 templates/v2/widgets/w_route_card.html create mode 100644 templates/v2/widgets/w_route_card_for_search.html diff --git a/RoutesApp/js_views.py b/RoutesApp/js_views.py index a1ea0ed..5920984 100644 --- a/RoutesApp/js_views.py +++ b/RoutesApp/js_views.py @@ -279,7 +279,7 @@ def find_routes_ajax(request): if routes_Dict['routes']: - html = render_to_string('blocks/b_search_routes.html', routes_Dict, request=request) + html = render_to_string('v2/blocks/b_search_routes_result.html', routes_Dict, request=request) else: html = render_to_string('templates_js_translate/not_found_find_routes.html', routes_Dict, request=request) diff --git a/static/v2/css/blocks/b_filter_routes.css b/static/v2/css/blocks/b_filter_routes.css index 1b4f274..c4ca702 100644 --- a/static/v2/css/blocks/b_filter_routes.css +++ b/static/v2/css/blocks/b_filter_routes.css @@ -5,6 +5,7 @@ background: #FFFFFF; border-radius: 10px; + height: fit-content; .title{ font-size: var(--form-title-font-size); font-weight: 700; diff --git a/static/v2/css/pages/p_search_route_results.css b/static/v2/css/pages/p_search_route_results.css index fa12574..5b5469b 100644 --- a/static/v2/css/pages/p_search_route_results.css +++ b/static/v2/css/pages/p_search_route_results.css @@ -10,5 +10,6 @@ .routes_content_part{ margin-top: 50px; display: grid; - grid-template-columns: 30% calc(100% - 30%); + grid-template-columns: 30% calc(100% - 30% - 41px); + gap: 41px; } \ No newline at end of file diff --git a/static/v2/css/widgets/w_route_card.css b/static/v2/css/widgets/w_route_card.css index 68645c3..ec993d1 100644 --- a/static/v2/css/widgets/w_route_card.css +++ b/static/v2/css/widgets/w_route_card.css @@ -392,7 +392,7 @@ justify-content: center; text-align: unset; } - &:not(&.inactive){ + &:not(&.inactive) and &:not(&.unhovered){ &:hover{ background: var(--route-btn-hover-bg); .route_btn_title{color: var(--route-btn-hover-text-color);} @@ -455,4 +455,20 @@ font-size: var(--route-number-font-size); margin-top: var(--route-number-margin-top); } + .respond_route_cont{ + display: grid; + grid-template-columns: calc(100% - 47px) 37px; + gap: 10px; + } + .chat_btn{ + padding: 6.5px; + background: #FF613A; + border-radius: 10px; + img{ + display: block; + height: 24px; + width: 24px; + filter: invert(1); + } + } } \ No newline at end of file diff --git a/static/v2/icons/widgets/w_route_card/chat.png b/static/v2/icons/widgets/w_route_card/chat.png new file mode 100644 index 0000000000000000000000000000000000000000..8ed8e98d2971b10faf8bc09656eeba047275c6ab GIT binary patch literal 13155 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 literal 0 HcmV?d00001 diff --git a/static/v2/js/blocks/b_search_routes.js b/static/v2/js/blocks/b_search_routes.js index f17586a..480b3cc 100644 --- a/static/v2/js/blocks/b_search_routes.js +++ b/static/v2/js/blocks/b_search_routes.js @@ -9,7 +9,10 @@ function searchRoutes (form) { data: formData, data_type: 'formData', success: function (res) { + if (!res.html) return; + let $parent = $('.routes_search_results')[0] + $parent.innerHTML = res.html; } }) diff --git a/static/v2/js/twb.js b/static/v2/js/twb.js index e69de29..c521678 100644 --- a/static/v2/js/twb.js +++ b/static/v2/js/twb.js @@ -0,0 +1,3 @@ +function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); +} \ No newline at end of file diff --git a/static/v2/js/widgets/w_route_card.js b/static/v2/js/widgets/w_route_card.js index be77276..d36c366 100644 --- a/static/v2/js/widgets/w_route_card.js +++ b/static/v2/js/widgets/w_route_card.js @@ -114,4 +114,15 @@ function highlightRoute(el) { }); request.ajaxRequest() +} + +function respondBtnClickEvent(el) { + if (!el) return; + let $parent = el.closest(".route_card_owner_info") + let $responde_cont = $parent.querySelector(".respond_route_cont") + + $(el).fadeOut(500); + sleep(500).then(() => { + $($responde_cont).fadeIn(500); + }) } \ No newline at end of file diff --git a/templates/v2/blocks/b_my_routes.html b/templates/v2/blocks/b_my_routes.html index eb2fedd..446dd7b 100644 --- a/templates/v2/blocks/b_my_routes.html +++ b/templates/v2/blocks/b_my_routes.html @@ -3,6 +3,6 @@
{% for route in routes %} - {% include 'v2/widgets/w_customer_route_card.html' with route=route %} + {% include 'v2/widgets/w_route_card.html' with route=route %} {% endfor %}
\ No newline at end of file diff --git a/templates/v2/blocks/b_search_routes_result.html b/templates/v2/blocks/b_search_routes_result.html new file mode 100644 index 0000000..bb3d718 --- /dev/null +++ b/templates/v2/blocks/b_search_routes_result.html @@ -0,0 +1,6 @@ +{% load static %} +{% load i18n %} + +{% for route in routes %} + {% include "v2/widgets/w_route_card_for_search.html" %} +{% endfor %} \ No newline at end of file diff --git a/templates/v2/content_widgets/w_route_card/route_card_actions_container.html b/templates/v2/content_widgets/w_route_card/route_card_actions_container.html new file mode 100644 index 0000000..4ebf928 --- /dev/null +++ b/templates/v2/content_widgets/w_route_card/route_card_actions_container.html @@ -0,0 +1,39 @@ +{% load static %} +{% load i18n %} + +
+
{% trans "Удалить" %}
+
+
+
{% trans "Поднять" %}
+
Осталось поднятий: {{ remains_route_rising_count }}
+
+
+
{% trans "Выделить цветом" %}
+
Осталось выделений: {{ remains_route_highlight_count }}
+
+
+
{% trans "Редактировать" %}
+
+
+
+
+ +
{{ route.phone }}
+
+
+
+
{% trans "Редактировать" %}
+
+
+
+
{% trans "Поднять" %}
+
Осталось поднятий: {{ remains_route_rising_count }}
+
+
+
{% trans "Выделить цветом" %}
+
Осталось выделений: {{ remains_route_highlight_count }}
+
+
+
{% trans "Удалить" %}
+
\ No newline at end of file diff --git a/templates/v2/content_widgets/w_route_card/route_card_info_data.html b/templates/v2/content_widgets/w_route_card/route_card_info_data.html new file mode 100644 index 0000000..c308ad6 --- /dev/null +++ b/templates/v2/content_widgets/w_route_card/route_card_info_data.html @@ -0,0 +1,50 @@ +{% load static %} +{% load i18n %} + +
+ + +
+
+
{{ route.owner }}
+
+
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
+
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
+
+
+ +
{{ route.phone }}
+
+
+
+ {% if route.comment %} + {{ route.comment|linebreaksbr }} + {% else %} + {% trans "Комментарий отсутствует" %} + {% endif %} +
+
{% trans "Объявление №" %} {{ route.id }}
+
+
+ + +
+
+
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
+
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
+
+
+ +
{{ route.phone }}
+
+
+
{{ route.owner }}
+
+ {% if route.comment %} + {{ route.comment|linebreaksbr }} + {% else %} + {% trans "Комментарий отсутствует" %} + {% endif %} +
+
{% trans "Объявление №" %} {{ route.id }}
+
\ No newline at end of file diff --git a/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html b/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html new file mode 100644 index 0000000..47ca631 --- /dev/null +++ b/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html @@ -0,0 +1,54 @@ +{% load static %} +{% load i18n %} + +
+ + +
+
+
{{ route.owner }}
+
+
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
+
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
+
+ +
+
{% trans "Откликнуться" %}
+
+
+
+ {% if route.comment %} + {{ route.comment|linebreaksbr }} + {% else %} + {% trans "Комментарий отсутствует" %} + {% endif %} +
+
{% trans "Объявление №" %} {{ route.id }}
+
+
+ + +
+
+
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
+
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
+
+
+
{{ route.owner }}
+
+ {% if route.comment %} + {{ route.comment|linebreaksbr }} + {% else %} + {% trans "Комментарий отсутствует" %} + {% endif %} +
+
{% trans "Объявление №" %} {{ route.id }}
+
\ No newline at end of file diff --git a/templates/v2/content_widgets/w_route_card/route_card_route_data.html b/templates/v2/content_widgets/w_route_card/route_card_route_data.html new file mode 100644 index 0000000..4a4f645 --- /dev/null +++ b/templates/v2/content_widgets/w_route_card/route_card_route_data.html @@ -0,0 +1,129 @@ +{% load static %} +{% load i18n %} + +
+
+
{% trans "Забрать из:" %}
+
+
+ +
{{ route.from_city.country.code }}
+
+
+ {{ route.from_city.name }}/{{ route.from_city.country.name }} +
+
+ {% if route.owner_type == 'mover' %} +
+ {% trans "Отправка:" %} +
{{ route.departure_DT|date:'d F Y' }}
+
+ {% endif %} +
+
+
+
{{ route.get_type_transport_display }}
+ {% if route.type_transport == '' %} + + + {% elif route.type_transport == 'road' %} + + {% elif route.type_transport == 'avia' %} + + {% endif %} +
+
+
+
+
+
+
+ {% if route.owner_type == 'customer' %} +
+ {% trans "Дата доставки:" %} +
{{ route.arrival_DT|date:'d F Y' }}
+
+ {% endif %} +
+
+
{% trans "Доставить в:" %}
+
+
+ +
{{ route.to_city.country.code }}
+
+
+ {{ route.to_city.name }}/{{ route.to_city.country.name }} +
+
+ {% if route.owner_type == 'mover' %} +
+ {% trans "Прибытие:" %} +
{{ route.arrival_DT|date:'d F Y' }}
+
+ {% endif %} +
+
+
+
+
+
+
+
+
+
+
+
{% trans "Забрать из:" %}
+
+
+ +
{{ route.from_city.country.code }}
+
+
+ {{ route.from_city.name }}/{{ route.from_city.country.name }} +
+
+
+
+
+
{{ route.get_type_transport_display }}
+ {% if route.type_transport == '' %} + + + {% elif route.type_transport == 'road' %} + + {% elif route.type_transport == 'avia' %} + + {% endif %} +
+
+ {% if route.owner_type == 'customer' %} +
+ {% trans "Дата доставки:" %} +
{{ route.arrival_DT|date:'d F Y' }}
+
+ {% else %} +
+ {% trans "Отправка:" %} +
{{ route.departure_DT|date:'d F Y' }}
+
+
+ {% trans "Прибытие:" %} +
{{ route.arrival_DT|date:'d F Y' }}
+
+ {% endif %} +
+
+
{% trans "Доставить в:" %}
+
+
+ +
{{ route.to_city.country.code }}
+
+
+ {{ route.to_city.name }}/{{ route.to_city.country.name }} +
+
+
+
+
\ No newline at end of file diff --git a/templates/v2/pages/p_search_route_results.html b/templates/v2/pages/p_search_route_results.html index 42ab478..12c3505 100644 --- a/templates/v2/pages/p_search_route_results.html +++ b/templates/v2/pages/p_search_route_results.html @@ -7,10 +7,12 @@ + + {% endblock %} {% block content %} @@ -18,8 +20,6 @@ {% include 'v2/blocks/b_search_routes.html' %}
{% include "v2/blocks/b_filter_routes.html" %} -
- -
+
{% endblock %} \ No newline at end of file diff --git a/templates/v2/widgets/w_customer_route_card.html b/templates/v2/widgets/w_customer_route_card.html deleted file mode 100644 index e04943a..0000000 --- a/templates/v2/widgets/w_customer_route_card.html +++ /dev/null @@ -1,214 +0,0 @@ -{% load i18n %} -{% load static %} - -
-
- - -
-
-
{{ route.owner }}
-
-
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
-
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
-
-
- -
{{ route.phone }}
-
-
-
- {% if route.comment %} - {{ route.comment|linebreaksbr }} - {% else %} - {% trans "Комментарий отсутствует" %} - {% endif %} -
-
{% trans "Объявление №" %} {{ route.id }}
-
-
- - -
-
-
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
-
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
-
-
- -
{{ route.phone }}
-
-
-
{{ route.owner }}
-
- {% if route.comment %} - {{ route.comment|linebreaksbr }} - {% else %} - {% trans "Комментарий отсутствует" %} - {% endif %} -
-
{% trans "Объявление №" %} {{ route.id }}
-
-
-
-
{% trans "Забрать из:" %}
-
-
- -
{{ route.from_city.country.code }}
-
-
- {{ route.from_city.name }}/{{ route.from_city.country.name }} -
-
- {% if route.owner_type == 'mover' %} -
- {% trans "Отправка:" %} -
{{ route.departure_DT|date:'d F Y' }}
-
- {% endif %} -
-
-
-
{{ route.get_type_transport_display }}
- {% if route.type_transport == '' %} - - - {% elif route.type_transport == 'road' %} - - {% elif route.type_transport == 'avia' %} - - {% endif %} -
-
-
-
-
-
-
- {% if route.owner_type == 'customer' %} -
- {% trans "Дата доставки:" %} -
{{ route.arrival_DT|date:'d F Y' }}
-
- {% endif %} -
-
-
{% trans "Доставить в:" %}
-
-
- -
{{ route.to_city.country.code }}
-
-
- {{ route.to_city.name }}/{{ route.to_city.country.name }} -
-
- {% if route.owner_type == 'mover' %} -
- {% trans "Прибытие:" %} -
{{ route.arrival_DT|date:'d F Y' }}
-
- {% endif %} -
-
-
-
-
-
-
-
-
-
-
-
{% trans "Забрать из:" %}
-
-
- -
{{ route.from_city.country.code }}
-
-
- {{ route.from_city.name }}/{{ route.from_city.country.name }} -
-
-
-
-
-
{{ route.get_type_transport_display }}
- {% if route.type_transport == '' %} - - - {% elif route.type_transport == 'road' %} - - {% elif route.type_transport == 'avia' %} - - {% endif %} -
-
- {% if route.owner_type == 'customer' %} -
- {% trans "Дата доставки:" %} -
{{ route.arrival_DT|date:'d F Y' }}
-
- {% else %} -
- {% trans "Отправка:" %} -
{{ route.departure_DT|date:'d F Y' }}
-
-
- {% trans "Прибытие:" %} -
{{ route.arrival_DT|date:'d F Y' }}
-
- {% endif %} -
-
-
{% trans "Доставить в:" %}
-
-
- -
{{ route.to_city.country.code }}
-
-
- {{ route.to_city.name }}/{{ route.to_city.country.name }} -
-
-
-
-
-
-
{% trans "Удалить" %}
-
-
-
{% trans "Поднять" %}
-
Осталось поднятий: {{ remains_route_rising_count }}
-
-
-
{% trans "Выделить цветом" %}
-
Осталось выделений: {{ remains_route_highlight_count }}
-
-
-
{% trans "Редактировать" %}
-
-
-
-
- -
{{ route.phone }}
-
-
-
-
{% trans "Редактировать" %}
-
-
-
-
{% trans "Поднять" %}
-
Осталось поднятий: {{ remains_route_rising_count }}
-
-
-
{% trans "Выделить цветом" %}
-
Осталось выделений: {{ remains_route_highlight_count }}
-
-
-
{% trans "Удалить" %}
-
-
\ No newline at end of file diff --git a/templates/v2/widgets/w_route_card.html b/templates/v2/widgets/w_route_card.html new file mode 100644 index 0000000..28ed12d --- /dev/null +++ b/templates/v2/widgets/w_route_card.html @@ -0,0 +1,8 @@ +{% load i18n %} +{% load static %} + +
+ {% include 'v2/content_widgets/w_route_card/route_card_info_data.html' %} + {% include 'v2/content_widgets/w_route_card/route_card_route_data.html' %} + {% include 'v2/content_widgets/w_route_card/route_card_actions_container.html' %} +
\ No newline at end of file diff --git a/templates/v2/widgets/w_route_card_for_search.html b/templates/v2/widgets/w_route_card_for_search.html new file mode 100644 index 0000000..12322ac --- /dev/null +++ b/templates/v2/widgets/w_route_card_for_search.html @@ -0,0 +1,8 @@ +{% load i18n %} +{% load static %} + +
+ {% include 'v2/content_widgets/w_route_card/route_card_info_data_for_search.html' %} + {% include 'v2/content_widgets/w_route_card/route_card_route_data.html' %} + +
\ No newline at end of file