Merge remote-tracking branch 'origin/main'

2023-11-06 13:00:47 +03:00
parent 2cef14d2d8 b7b6750ad2
commit 6ea03098b2
7 changed files with 184 additions and 19 deletions
--- a/static/css/mobile_styles.css
+++ b/static/css/mobile_styles.css
@@ -531,6 +531,9 @@
        filter: brightness(0) saturate(100%) invert(0%) sepia(100%) saturate(21%) hue-rotate(344deg) brightness(105%) contrast(106%);
        padding-left: 10px;
    }
+    .menu_buttons.open .block_overlay{
+        display: block;
+    }

     .text_f_curtain{
         display: inline-block;
@@ -548,6 +551,16 @@
        font-size: 12px;
        line-height: 13px;
    }
+
+    .block_overlay{
+        height: 100vh;
+        width: 100vw;
+        background: rgba(39, 53, 62, 0.7);
+        backdrop-filter: blur(15px);
+        z-index: 100;
+        position: fixed;
+        top: 86px;
+    }
    #customer>a, #mover>a{
        left: 5%;
    }
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -33,7 +33,8 @@
    backdrop-filter: blur(15px);
    z-index: 100;
    position: fixed;
-    top: 46px;
+    top: 86px;
+    display: none;
 }

 .block_overlay.hidden{
@@ -2179,5 +2180,140 @@
    transition: 200ms;
    position: absolute;
    width: 320px;
+    opacity: 0;
+}
+
+/* for curtain right*/
+
+.menu_buttons{
+    /*background: #FFFFFF;*/
+    /*height: 100vh;*/
+    z-index: 99;
+    top: 87px;
+    overflow: auto;
+    transition: 200ms;
+    width: 320px;
+
+}
+
+.menu_buttons.right.close{
+    right: -320px;
+    transition: 200ms;
+    position: absolute;
+    width: 320px;
+    float: right;
+}
+
+.menu_buttons.left.close{
+    left: -320px;
+    transition: 200ms;
+    position: absolute;
+    width: 320px;
+}
+.menu_buttons.right.open{
+    right: 0;
+    transition: 200ms;
+    position: unset;
+    display: block;
+    padding-top: 10px;
+    width: 320px;
+}
+
+.menu_buttons.left.open{
+    left: 0;
+    transition: 200ms;
+    position: fixed;
+    padding-top: 10px;
+}
+.handler_menu.left.close{
+    background: #FF613A;
+    color: #FFFFFF;
+    left: -49px;
+}
+.handler_menu.right.close{
+    background: #FF613A;
+    color: #FFFFFF;
+    right: -49px;
+}
+.menu_buttons.left.open .handler_menu{
+    background: #FFFFFF;
+    color: #000000;
+    left: 272px;
+}
+.menu_buttons.right.open .handler_menu{
+    background: #FFFFFF;
+    color: #000000;
+    right: 272px;
+
+}
+.menu_buttons.close .handler_menu{
+    background: #FF613A;
+    color: #FFFFFF;
+}
+.menu_buttons.right .handler_menu{
+    transform: rotate(270deg);
+    right: -49px;
+    width: 91px;
+    height: 18px;
+    /*display: block;*/
+    position: fixed;
+    text-align: center;
+    top: 39%;
+    border-radius: 10px 10px 0 0;
+    padding: 7px 18px 7px 18px;
    display: none;
+}
+.menu_buttons.left .handler_menu{
+    transform: rotate(90deg);
+    width: 91px;
+    height: 18px;
+    display: block;
+    position: fixed;
+    left: -48px;
+    text-align: center;
+    top: 39%;
+    border-radius: 10px 10px 0 0;
+    padding: 7px 18px 7px 18px;
+}
+
+.btns_f_curtain{
+    width: 7px;
+    transition: 200ms;
+    display: block;
+
+}
+.btns_f_curtain.left{
+    float: left;
+}
+.btns_f_curtain.right{
+    float: right;
+}
+.menu_buttons.close .btns_f_curtain{
+    transition: 200ms;
+    transform: rotate(270deg);
+    filter: brightness(0) saturate(100%) invert(100%) sepia(2%) saturate(0%) hue-rotate(162deg) brightness(104%) contrast(103%);
+    padding-right: 10px;
+}
+.menu_buttons.open .btns_f_curtain{
+    transition: 200ms;
+    transform: rotate(90deg);
+    filter: brightness(0) saturate(100%) invert(0%) sepia(100%) saturate(21%) hue-rotate(344deg) brightness(105%) contrast(106%);
+    padding-left: 10px;
+}
+
+ .text_f_curtain{
+     display: inline-block;
+ }
+
+.menu_profile{
+    width: 320px;
+    text-align: -webkit-center;
+}
+
+.menu_profile>div{
+    width: 274px;
+}
+.menu_profile>div>a{
+    font-size: 12px;
+    line-height: 13px;
 }
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -1098,7 +1098,8 @@ section.login>form>div>div:nth-child(5)>a {
 section.profile {
    padding: 60px 40px 0;
    margin-bottom: 120px;
-
+    width: 60%;
+    float: left;
 }


@@ -1195,8 +1196,8 @@ h2.title_new_route{
 }

 .info_profile{
-    width: calc(69% - 40px);
-    float: right;
+    width: 100%;
+    display: block;
 }

 .info_profile>h1 {
--- a/static/js/user_profile_2.js
+++ b/static/js/user_profile_2.js
@@ -55,7 +55,10 @@ function select_tab_profile (el,url,owner_type=null) {


            middleWareJS()
-            closeCurtain()
+            let user_type = getInfoAboutUser()
+            if (user_type === 'mobile') {
+                closeCurtain()
+            }

        },
        error: function (data){
@@ -65,6 +68,16 @@ function select_tab_profile (el,url,owner_type=null) {
    });
 }

+function getInfoAboutUser (){
+    let user_type = ''
+    if (screen.width < 1024){
+        user_type = 'mobile'
+    } else {
+        user_type = 'dectop'
+    }
+    return user_type
+}
+
 function createTicketShow () {
    $.ajax({
        headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
--- a/templates/blocks/b_header.html
+++ b/templates/blocks/b_header.html
@@ -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 #}
--- a/templates/blocks/b_user_profile.html
+++ b/templates/blocks/b_user_profile.html
@@ -11,9 +11,9 @@
 {#            <div class="clear_both"></div>#}
 {#        </div>#}
 {#    </div>#}
-    <div class="dectop_var_f_btns_temp">
-        {% include "blocks/profile/b_buttons_menu_profile.html" %}
-    </div>
+{#    <div class="dectop_var_f_btns_temp">#}
+{#        {% include "blocks/profile/b_buttons_menu_profile.html" %}#}
+{#    </div>#}
 {##}
    <div class="info_profile">
        {% if not page_html %}
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -68,7 +68,7 @@
        </div>
        {% block content %}
        {% endblock %}
-        <div class="menu_buttons curtain right close" data-name="Пользователи">
+        <div class="menu_buttons curtain right open" data-name="Пользователи">
            {% include "blocks/profile/b_buttons_menu_profile.html" %}
            <div class="handler_menu close" onclick="open_curtain(null,'right')">
                <img class="btns_f_curtain close left" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
@@ -77,6 +77,7 @@
                <div class="clear_both"></div>
            </div>
        </div>
+        <div class="clear_both"></div>
    </div>

 </div>