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

0.0.140 routes

Browse Source
This commit is contained in:
SBD
2025-02-01 14:07:30 +03:00
parent 70dd911445
commit 293b7c9f6f
13 changed files with 188 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/css/styles.css
View File

@@ -154,7 +154,7 @@ html, body{
.wrapper_content {
margin: 20px;
max-width: 1720px;
position: relative;
/*position: relative;*/
min-height: 695px;
max-height: 100%;
}

91
static/v2/css/blocks/b_login_modal.css Normal file
View File

@@ -0,0 +1,91 @@
.b_login_modal {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
--modal-width: 690px;
--modal-height: 492px;
--modal-padding: 28px 28.7px 40px 52px;
box-sizing: border-box;
z-index: 10000000;
.b_login_modal_container_content{
position: fixed;
background: #FFFFFF;
box-shadow: 0 3px 14px rgba(74, 58, 255, 0.03), 0 -2px 4px rgba(20, 20, 43, 0.12), 0 12px 44px rgba(20, 20, 43, 0.34);
border-radius: 30px;
width: var(--modal-width);
height: var(--modal-height);
padding: var(--modal-padding);
left: calc(50% - (var(--modal-width) / 2));
top: calc(50% - (var(--modal-height) / 2));
z-index: 1000000000;
box-sizing: border-box;
}
.b_login_modal_content{
position: relative;
text-align: -webkit-center;
}
.xmark{
position: absolute;
top: 0;
right: 0;
width: 16px;
height: 16px;
display: block;
cursor: pointer;
}
.lock_img_container{
position: relative;
background: #E1E1E1;
border-radius: 39px;
margin-top: 8px;
width: 140px;
height: 140px;
img{
width: 130px;
height: 130px;
position: absolute;
top: 5px;
left: 5px;
}
}
.modal_title{
margin-top: 40px;
font-size: 34px;
font-weight: 700;
color: #272424;
}
.modal_description{
margin: 20px 0;
font-size: 20px;
font-weight: 400;
color: #272424;
width: 495px;
overflow-wrap: break-word;
}
.registr_btn{
margin-top: 10px;
font-size: 18px;
font-weight: 600;
color: #27242499;
}
}

27
static/v2/css/service/btns.css Normal file
View File

@@ -0,0 +1,27 @@
.primary_btn{
--background: #FF613A;
--border: none;
--box-shadow: 0px 3px 12px rgba(74, 58, 255, 0.18);
--border-radius: 10px;
--margin: 0;
--padding: 19px 0 21px 0;
--font-size: 18px;
--font-weight: 700;
--color: #FFFFFF;
--text-align: center;
background: var(--background);
border: var(--border);
box-shadow: var(--box-shadow);
border-radius: var(--border-radius);
margin: var(--margin);
padding: var(--padding);
font-size: var(--font-size);
font-weight: var(--font-weight);
color: var(--color);
text-align: var(--text-align);
cursor: pointer;
}

15
static/v2/css/service/modal.css Normal file
View File

@@ -0,0 +1,15 @@
.modal {
display: none;
&.open{
display: block;
}
.overlay{
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: #0000009C;
z-index: 10000000;
}
}

BIN
static/v2/icons/blocks/b_login_modal/lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 76 KiB

4
static/v2/icons/service/modal/xmark.svg Normal file
View File

@@ -0,0 +1,4 @@
<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1.29785 17L17.2979 1" stroke="#272424" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M17.2979 17L1.29785 1" stroke="#272424" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 333 B

6
static/v2/js/service/modal.js Normal file
View File

@@ -0,0 +1,6 @@
function closeModal(el) {
let $parent = el.closest('.modal');
$parent.classList.remove('open');
$("body")[0].style.overflow = "auto";
}

21
static/v2/js/widgets/w_route_card.js
View File

@@ -116,14 +116,19 @@ function highlightRoute(el) {
request.ajaxRequest()
}
function respondBtnClickEvent(el) {
function respondBtnClickEvent(el, authentificated) {
if (!el) return;
let $parent = el.closest(".w_route_card")
let $responde_cont = $parent.querySelector(".respond_route_cont")
if (window.innerWidth < 1160) $responde_cont = $parent.querySelector(".respond_route_cont.mobile")
if (authentificated !== 'False') {
let $parent = el.closest(".w_route_card")
let $responde_cont = $parent.querySelector(".respond_route_cont")
if (window.innerWidth < 1160) $responde_cont = $parent.querySelector(".respond_route_cont.mobile")
$(el).fadeOut(500);
sleep(500).then(() => {
$($responde_cont).fadeIn(500);
})
$(el).fadeOut(500);
sleep(500).then(() => {
$($responde_cont).fadeIn(500);
})
} else {
$(".b_login_modal").addClass('open');
$("body")[0].style.overflow = "hidden";
}
}

3
templates/tb_base.html
View File

@@ -91,6 +91,8 @@ function gtag_report_conversion(url) {
<link rel="stylesheet" href="{% static 'css/styles(boris).css' %}" >
<link rel="stylesheet" href="{% static 'css/mobile_styles.css' %}">
<link rel="stylesheet" href="{% static 'v2/css/widgets/w_additional_info.css' %}">
<link rel="stylesheet" href="{% static 'v2/css/service/modal.css' %}">
<link rel="stylesheet" href="{% static 'v2/css/service/btns.css' %}">
<script src='{% static "js/find_route.js" %}'></script>
<script src="{% static "js/filters_functions_find_route.js" %}"></script>
@@ -100,6 +102,7 @@ function gtag_report_conversion(url) {
<script src="{% static "js/user_profile_2.js" %}"></script>
<script src="{% static "js/ion.rangeSlider.min.js" %}"></script>
<script src="{% static "v2/js/forms.js" %}"></script>
<script src="{% static "v2/js/service/modal.js" %}"></script>
<link rel="stylesheet" href="{% static "css/ion.rangeSlider.min.css" %}">

19
templates/v2/blocks/b_login_modal.html Normal file
View File

@@ -0,0 +1,19 @@
{% load static %}
{% load i18n %}
<link rel="stylesheet" href="{% static "v2/css/blocks/b_login_modal.css" %}">
<div class="b_login_modal modal">
<div class="overlay"></div>
<div class="b_login_modal_container_content">
<div class="b_login_modal_content">
<img onclick="closeModal(this)" class="xmark" src="{% static "v2/icons/service/modal/xmark.svg" %}" alt="">
<div class="lock_img_container">
<img src="{% static "v2/icons/blocks/b_login_modal/lock.png" %}" alt="">
</div>
<div class="modal_title">{% trans "Войдите или зарегистрируйтесь" %}</div>
<div class="modal_description">{% trans "Чтобы увидеть контакты - войдите в свою учетную запись или зарегистрируйтесь" %}</div>
<div class="primary_btn">{% trans "Войти" %}</div>
<div class="registr_btn">{% trans "Зарегестрироватся" %}</div>
</div>
</div>
</div>

2
templates/v2/content_widgets/w_route_card/route_card_actions_container_for_search.html
View File

@@ -10,6 +10,6 @@
<img src="{% static "v2/icons/widgets/w_route_card/chat.png" %}" alt="">
</div>
</div>
<div class="route_btn mobile solid" onclick="respondBtnClickEvent(this)" style="--route-btn-margin: 23px 0 0 0;--route-btn-width: 100%;--route-btn-height: min-content;--route-btn-padding: 7.5px 0;">
<div class="route_btn mobile solid" onclick="respondBtnClickEvent(this, '{{ user.is_authenticated }}')" style="--route-btn-margin: 23px 0 0 0;--route-btn-width: 100%;--route-btn-height: min-content;--route-btn-padding: 7.5px 0;">
<div class="route_btn_title big">{% trans "Откликнуться" %}</div>
</div>

12
templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html
View File

@@ -20,7 +20,7 @@
<img src="{% static "v2/icons/widgets/w_route_card/chat.png" %}" alt="">
</div>
</div>
<div class="route_btn hide_in_mobile solid" onclick="respondBtnClickEvent(this)" style="--route-btn-width: max-content;--route-btn-height: min-content;--route-btn-padding: 7.5px 38.5px;">
<div class="route_btn hide_in_mobile solid" onclick="respondBtnClickEvent(this, '{{ user.is_authenticated }}')" style="--route-btn-width: max-content;--route-btn-height: min-content;--route-btn-padding: 7.5px 38.5px;">
<div class="route_btn_title big">{% trans "Откликнуться" %}</div>
</div>
</div>
@@ -59,10 +59,12 @@
{% trans "Комментарий отсутствует" %}
{% endif %}
</div>
<div class="route_msg_for_unregistered_user">
<img src="{% static "v2/icons/widgets/w_route_card/unregistered.svg" %}" alt="">
<div>{% trans "Текст сообщения доступен только авторизированным пользователям." %}</div>
</div>
{% if not user.if_authenticated %}
<div class="route_msg_for_unregistered_user">
<img src="{% static "v2/icons/widgets/w_route_card/unregistered.svg" %}" alt="">
<div>{% trans "Текст сообщения доступен только авторизированным пользователям." %}</div>
</div>
{% endif %}
</div>
<div class="route_number">{% trans "Объявление №" %} {{ route.id }}</div>
</div>

1
templates/v2/pages/p_search_route_results.html
View File

@@ -19,6 +19,7 @@
{% block content %}
<div class="title">{% trans "Поиск посылки" %}</div>
{% include 'v2/blocks/b_search_routes.html' %}
{% if not user.is_authenticated %}{% include 'v2/blocks/b_login_modal.html' %}{% endif %}
<div class="routes_content_part">
{% include "v2/blocks/b_filter_routes.html" %}
<div class="routes_search_results"></div>