Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-11-06 13:00:47 +03:00
7 changed files with 184 additions and 19 deletions

View File

@@ -60,7 +60,8 @@
{% if user.is_authenticated %}
{# boris changed #}
<div class="cont_header_btn_profile">
<div class="button_profile_header" onclick="show_header_list()" data-user-id="{{ user.id }}">
<div class="button_profile_header" data-user-id="{{ user.id }}">
{# <div class="button_profile_header" onclick="open_curtain(null,'right')" data-user-id="{{ user.id }}">#}
<span class="btn_profile_name">
{{ user.first_name }} {{ user.last_name }}
@@ -74,15 +75,15 @@
<div class="button_profile_header_mobile" onclick="open_curtain(null,'right')">
<img src="/static/img/svg/userMobile.svg" alt="">
</div>
<div class="menu_profile_btn">
{% if user_subscribe %}<div class="subscribe_type_txt"><span class="f-l">Подписка:</span> <span class="f-r">{{ user_subscribe.subscribe.name }}</span><div class="clear_both"></div></div>{% endif %}
<a class="btn_menu_profile" href="{% url "user_profile" %}" >Перейти в профиль</a>
<a class="btn_menu_profile" href="{% url 'profile_page' 'create_route_for_mover' %}">Перевезти посылку</a>
<a class="btn_menu_profile" href="{% url 'profile_page' 'create_route_for_customer' %}">Отправить посылку</a>
<a class="btn_menu_profile" href="{% url 'profile_page' 'my_routes' %}" >Мои объявления</a>
<div class="separator_menu_profile"></div>
<a href="/profile/logout" class="btn_menu_profile">Выйти из профиля</a>
</div>
{# <div class="menu_profile_btn">#}
{# {% if user_subscribe %}<div class="subscribe_type_txt"><span class="f-l">Подписка:</span> <span class="f-r">{{ user_subscribe.subscribe.name }}</span><div class="clear_both"></div></div>{% endif %}#}
{# <a class="btn_menu_profile" href="{% url "user_profile" %}" >Перейти в профиль</a>#}
{# <a class="btn_menu_profile" href="{% url 'profile_page' 'create_route_for_mover' %}">Перевезти посылку</a>#}
{# <a class="btn_menu_profile" href="{% url 'profile_page' 'create_route_for_customer' %}">Отправить посылку</a>#}
{# <a class="btn_menu_profile" href="{% url 'profile_page' 'my_routes' %}" >Мои объявления</a>#}
{# <div class="separator_menu_profile"></div>#}
{# <a href="/profile/logout" class="btn_menu_profile">Выйти из профиля</a>#}
{# </div>#}
</div>
{# end #}