Merge remote-tracking branch 'origin/dev' into dev

robots.txt

@@ -1,4 +1,5 @@
 User-agent: *
 Disallow: /
+Disallow: */admin/*
 
 Host: dev.tripwb.com

static/css/styles.css

@@ -1219,7 +1219,7 @@ section.login {
     margin-bottom: 120px;
 }
 
-section.login>h1 {
+section.login>h1, div.recovery_pas>h1 {
     color: #272424;
     text-align: center;
     /* Heading 1 */
@@ -1231,7 +1231,7 @@ section.login>h1 {
     margin-bottom: 40px;
 }
 
-section.login>form {
+section.login>form, div.recovery_pas>form {
         max-width: 420px;
         margin: auto;
         text-align: center;
@@ -3366,16 +3366,20 @@ details[open] summary ~ *{
 
 /*END news articles all*/
 
-.login_form.hide{
+.login.hide{
     display: none;
 }
-.password_recovery{
+.recovery_pas{
     display: none;
 }
-.password_recovery.show{
+.recovery_pas.show{
     display: block;
 }
 
+.recovery.hide{
+    display: none;
+}
+
 
 
 

static/js/authorization.js

@@ -9,6 +9,7 @@ function SendLoginForm(el){
         let msr = sessionStorage.getItem('mailingSubscribeRequired')
         formData.set('mailingSubscribeRequired',msr)
     }
+    document.getElementsByClassName('recovery')[0].classList.add('hide')
 
 
 
@@ -25,20 +26,21 @@ function SendLoginForm(el){
         success: function(data){
 
 
-            location.href = data.redirect_url//`/profile/page/dashboard/`
-            window.sessionStorage.removeItem('mailingSubscribeRequired')
-            window.sessionStorage.removeItem('email')
-
-
-
-
 
+            if(url === '/user_account/login/'){
+                location.href = data.redirect_url//`/profile/page/dashboard/`
+                window.sessionStorage.removeItem('mailingSubscribeRequired')
+                window.sessionStorage.removeItem('email')
+            } else if(url === '/user_account/password_recovery/'){
+                 document.getElementById('password_recovery').innerHTML = data.message
 
+            }
 
 
         },
         error: function (data, exception){
             document.querySelector(".login").innerHTML = data.responseJSON.html
+            document.getElementsByClassName('recovery')[0].classList.remove('hide')
         }
     });
 }

static/js/registration.js

@@ -30,6 +30,28 @@ function SendRegistrationForm(el, user_id){
             window.sessionStorage.removeItem('mailingSubscribeRequired')
             window.sessionStorage.removeItem('email')
 
+                        fbq('track', 'Contact');
+
+
+            ttq.identify({
+                "email": "<hashed_email_address>", // string. The email of the customer if available. It must be hashed with SHA-256 on the client side.
+                "phone_number": "<hashed_phone_number>", // string. The phone number of the customer if available. It must be hashed with SHA-256 on the client side.
+                "external_id": "<hashed_extenal_id>" // string. Any unique identifier, such as loyalty membership IDs, user IDs, and external cookie IDs.It must be hashed with SHA-256 on the client side.
+            });
+
+            ttq.track('CompleteRegistration', {
+                "contents": [
+                    {
+                        "content_id": "<content_identifier>", // string. ID of the product. Example: "1077218".
+                        "content_type": "<content_type>", // string. Either product or product_group.
+                        "content_name": "<content_name>" // string. The name of the page or product. Example: "shirt".
+                    }
+                ],
+                "value": "<content_value>", // number. Value of the order or items sold. Example: 100.
+                "currency": "<content_currency>" // string. The 4217 currency code. Example: "USD".
+            });
+
+
 
             if(typeof ym === 'function'){
                 ym(97070898,'reachGoal','Registration')
@@ -38,7 +60,6 @@ function SendRegistrationForm(el, user_id){
               console.log('Скрипт Яндекс.Метрики не найден. Статистика не будет отправлена.');
             }
 
-
         },
         error: function (data, exception){
             document.querySelector(".register").innerHTML = data.responseJSON.html

static/js/user_profile.js

@@ -605,8 +605,17 @@ function sendRoute(el, routeID = null){
                 inline:'start'
             });
 
+            let currentUrl = window.location.pathname;
+            let newUrl = '';
 
+            if(currentUrl.includes('/create_route_for_customer')){
+                newUrl = currentUrl.replace('/create_route_for_customer', '/my_routes');
 
+            }else if(currentUrl.includes('/create_route_for_mover')){
+                newUrl = currentUrl.replace('/create_route_for_mover', '/my_routes');
+            }
+
+            window.history.replaceState(null, '', newUrl);
 
 
 
@@ -1396,8 +1405,8 @@ function showTabBtn(el) {
 }
 
 function showForm(){
-   let hide_form = document.getElementsByClassName('login_form')
-   let show_form = document.getElementsByClassName('password_recovery')
+   let hide_form = document.getElementsByClassName('login')
+   let show_form = document.getElementsByClassName('recovery_pas')
     hide_form[0].classList.add('hide')
     show_form[0].classList.add('show')
 }

templates/blocks/b_footer.html

@@ -20,8 +20,9 @@
                     <a href="https://instagram.com/trip_with_bonus" target="_blank"><img class="svg" src="/static/img/svg/Instagram.svg"></a>
                     <a href="https://www.facebook.com/share/p/tckdLFiyXm9r2925/?mibextid=WC7FNe" target="_blank"><img class="svg" src="/static/img/svg/facebook.svg"></a>
                     <a href="https://vk.com/club226251027" target="_blank"><img class="svg" src="/static/img/svg/vk.svg"></a>
-                    <a href="https://www.tiktok.com/@.tripwithbonus?_t=8njaU5JVCBK&_r=1" target="_blank"><img class="svg" src="/static/img/svg/tiktok.svg"></a>
+                    <a href="https://www.tiktok.com/@tripwithbonus?_t=8qHingfQWNq" target="_blank"><img class="svg" src="/static/img/svg/tiktok.svg"></a>
                     <a href="https://youtube.com/@twb-bonus?si=k_YFiY86vBdvvHFN" target="_blank"><img class="svg" src="/static/img/svg/Youtube.svg"></a>
+                    <a href="https://t.me/+XA6A8Ls7fYw2Yzli" target="_blank"><img class="svg" src="/static/img/svg/Telegram.svg"></a>
                 </div>
           </div>
             <div class="second-column">

templates/forms/f_login.html

@@ -1,13 +1,14 @@
 {% load i18n %}
 {% load socialaccount %}
 
-{% trans "Логин" as p_login %}
+{% trans "E-mail" as p_login %}
 {% trans "Пароль" as p_password %}
 
 <section class="login">
-    <h1>{% translate "Войдите в профиль" %}</h1>
+<h1>{% translate "Войдите в профиль" %}</h1>
 
     <form class="login_form" name="login_form" method="post">
+
         {% csrf_token %}
         <div>
            {% if form.errors.all__ %}
@@ -55,23 +56,29 @@
 
 
 
-    <form class="password_recovery" name="password_recovery" method="post">
+
+</section>
+
+<div class="recovery_pas">
+    <h1>{% translate "Введите Ваш Email" %}</h1>
+    <form class="password_recovery" id="password_recovery" name="password_recovery" method="post">
         {% csrf_token %}
 
             <div class="inputs_l">
             <input
                     name="email"
                     type="text"
-                    placeholder="{{ p_login }}"
+                    placeholder={% translate "Email" %}
                     {% if form.data.username %} value="{{ form.data.username }}"{% endif %}
                     id="login_email_input"
             >
             {% if form.username and form.errors.username %}
            <span>{{ form.errors.username }}</span>
                  {% endif %}
+{#            <div class="agree_text_l">{% translate  %}</div>#}
           </div>
-          <div class="button_register "><button class="recovery" onclick="SendLoginForm(this)">{% translate "Восстановить" %}</button></div>
+          <div class="button_register "><button class="recovery" onclick="SendLoginForm(this)">{% translate "Отправить ссылку для сброса пароля" %}</button></div>
 
 
     </form>
-</section>
+</div>

templates/forms/f_password_recovery.html

@@ -4,7 +4,7 @@
 {% trans "Подтвердить пароль *" as p_con_password  %}
 
 <section class="register" id="confirm_password">
-    <h1>{% translate "Восстановление пароля" %}</h1>
+    <h1>{% translate "Изменение пароля" %}</h1>
 
 
     <form

templates/forms/f_registration.html

@@ -115,9 +115,9 @@
                 </div>
           <div class="button_register">
                <button type="submit" id="registration" onclick="SendRegistrationForm(this)"> {% translate "Зарегистрироваться" %} </button>
-              <div class="info_text_wrapper">
-                  <div class="info_text">{% trans 'На Вашу почту отправлено письмо для подтверждения регистрации. Если не получили письмо, то проверьте папку СПАМ' %}</div>
-              </div>
+                <div class="info_text_wrapper">
+                    <div class="info_text">{% trans 'На Вашу почту отправлено письмо для подтверждения регистрации. Если не получили письмо, то проверьте папку СПАМ' %}</div>
+                </div>
           </div>
 
     </form>

templates/mail/m_confirm_email.html

@@ -6,7 +6,8 @@
 >
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+                      <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
         </div>
         <p style="font-weight:700; font-size:25px; text-align:center;
             padding:0; line-height:1em; text-transform: uppercase; color: #ff613a;

templates/mail/m_found_matched_routes.html

@@ -4,7 +4,8 @@
     padding:10px; background-color: #F8F8F8;">
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
+            <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
         </div>
         <p style="font-weight:700; font-size:25px; text-align:center;
             padding:0; line-height:1em; text-transform: uppercase; color: #ff613a;

templates/mail/m_registration.html

@@ -6,7 +6,8 @@
 >
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
+            <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
         </div>
         <p style="font-weight:700; font-size:25px; text-align:center;
             padding:0; line-height:1em; text-transform: uppercase; color: #ff613a;

templates/mail/m_request_offer.html

@@ -4,7 +4,8 @@
 >
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
+            <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
         </div>
         <p style="font-weight:700; font-size:25px; text-align:center;
             padding:0; line-height:1em; text-transform: uppercase; color: #ff613a;

templates/mail/m_user_subscribes_that_is_going_to_finish.html

@@ -4,7 +4,8 @@
     padding:10px; background-color: #F8F8F8;">
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
+            <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
         </div>
 
         <p style="font-weight:700; font-size:25px; text-align:center;

templates/tb_base.html

@@ -137,7 +137,21 @@ function gtag_report_conversion(url) {
 {#    <script src="{% static "js/range_calendar.js" %}"></script>#}
     <script src="{% static "js/range_calendar.js" %}"></script>
 
-    <link rel="icon" href="{% static 'favicon.svg' %}" sizes="any" type="image/svg+xml">
+    <link rel="icon" href="{% static 'favicon/favicon.svg' %}" sizes="any" type="image/svg+xml">
+    <link rel="apple-touch-icon" sizes="57x57" href={% static 'favicon/apple-icon-57x57.png'%} >
+    <link rel="apple-touch-icon" sizes="60x60" href={% static "favicon/apple-icon-60x60.png"%}>
+    <link rel="apple-touch-icon" sizes="72x72" href={% static "favicon/apple-icon-72x72.png"%}>
+    <link rel="apple-touch-icon" sizes="76x76" href={% static "favicon/apple-icon-76x76.png"%}>
+    <link rel="apple-touch-icon" sizes="114x114" href={% static "favicon/apple-icon-114x114.png"%}>
+    <link rel="apple-touch-icon" sizes="120x120" href={% static "favicon/apple-icon-120x120.png"%}>
+    <link rel="apple-touch-icon" sizes="144x144" href={% static "favicon/apple-icon-144x144.png"%}>
+    <link rel="apple-touch-icon" sizes="152x152" href={% static "favicon/apple-icon-152x152.png"%}>
+    <link rel="apple-touch-icon" sizes="180x180" href={% static "favicon/apple-icon-180x180.png"%}>
+    <link rel="icon" type="image/png" sizes="192x192"  href={% static "favicon/android-icon-192x192.png"%}>
+    <link rel="icon" type="image/png" sizes="32x32" href={% static "favicon/favicon-32x32.png"%}>
+    <link rel="icon" type="image/png" sizes="96x96" href={% static "favicon/favicon-96x96.png"%}>
+    <link rel="icon" type="image/png" sizes="16x16" href={% static "favicon/favicon-16x16.png"%}>
+
 
     {% block meta %}
     {% endblock %}
@@ -148,37 +162,37 @@ function gtag_report_conversion(url) {
 
 <body{% if page_type == 'routes' %} onscroll="scroll_ev(event,this)"{% endif %}>
 
-    <div class="popup_wrapper">
-
-        {% if not user.is_authenticated %}
-            <div class="popup_content">
-                <div class="popup_cross" onclick="setCokie(182,'popup_show','false')">
-                    <img src="/static/img/svg/cross_popup.svg" alt="">
-                </div>
-                <div class="popup_img"><img src="/static/img/svg/close_gift.svg" alt=""></div>
-                <div class="popup_title">{% translate "Попробуй бесплатно" %}</div>
-                <div class="popup_text">{% blocktranslate %} Зарегистрируйся сейчас и получи бонус <br> <span id="poup_text_bold">3 месяца бесплатного пользования!</span> {% endblocktranslate %}</div>
-                <button class="confirm_profile_btn" onclick="setCokie(182,'popup_show','false', '{% url "registration_page" %}')">{% translate "Зарегистрироваться" %}</button>
-            </div>
-
-        {% endif %}
-
-        {% if user.is_authenticated %}
-            <div class="popup_content">
-                <div class="popup_cross" onclick="setCokie(182,'first_authorization','true')">
-                    <img src="/static/img/svg/cross_popup.svg" alt="">
-                </div>
-                <div class="popup_img">
-                    <img src="/static/img/svg/open_gift.svg" alt="">
-                </div>
-                <div class="popup_title">{% translate "Добро пожаловать!" %}</div>
-                <div class="popup_text">{% blocktranslate %} Команда Trip With Bonus <br> поздравляет вас с регистрацией и дарит <br> <span id="poup_text_bold">3 месяца бесплатного пользования сервисом</span> {% endblocktranslate %}</div>
-                <button class="confirm_profile_btn" onclick="setCokie(182,'first_authorization','true')">{% translate "Забрать подарок" %}</button>
-                <div  id="authenticated_img"></div>
-            </div>
-
-        {% endif %}
-    </div>
+{#    <div class="popup_wrapper">#}
+{##}
+{#        {% if not user.is_authenticated %}#}
+{#            <div class="popup_content">#}
+{#                <div class="popup_cross" onclick="setCokie(182,'popup_show','false')">#}
+{#                    <img src="/static/img/svg/cross_popup.svg" alt="">#}
+{#                </div>#}
+{#                <div class="popup_img"><img src="/static/img/svg/close_gift.svg" alt=""></div>#}
+{#                <div class="popup_title">{% translate "Попробуй бесплатно" %}</div>#}
+{#                <div class="popup_text">{% blocktranslate %} Зарегистрируйся сейчас и получи бонус <br> <span id="poup_text_bold">3 месяца бесплатного пользования!</span> {% endblocktranslate %}</div>#}
+{#                <button class="confirm_profile_btn" onclick="setCokie(182,'popup_show','false', '{% url "registration_page" %}')">{% translate "Зарегистрироваться" %}</button>#}
+{#            </div>#}
+{##}
+{#        {% endif %}#}
+{##}
+{#        {% if user.is_authenticated %}#}
+{#            <div class="popup_content">#}
+{#                <div class="popup_cross" onclick="setCokie(182,'first_authorization','true')">#}
+{#                    <img src="/static/img/svg/cross_popup.svg" alt="">#}
+{#                </div>#}
+{#                <div class="popup_img">#}
+{#                    <img src="/static/img/svg/open_gift.svg" alt="">#}
+{#                </div>#}
+{#                <div class="popup_title">{% translate "Добро пожаловать!" %}</div>#}
+{#                <div class="popup_text">{% blocktranslate %} Команда Trip With Bonus <br> поздравляет вас с регистрацией и дарит <br> <span id="poup_text_bold">3 месяца бесплатного пользования сервисом</span> {% endblocktranslate %}</div>#}
+{#                <button class="confirm_profile_btn" onclick="setCokie(182,'first_authorization','true')">{% translate "Забрать подарок" %}</button>#}
+{#                <div  id="authenticated_img"></div>#}
+{#            </div>#}
+{##}
+{#        {% endif %}#}
+{#    </div>#}
 
     <div class="cookie_block">
         <div class="container_content_cookie_block">

templates/widgets/w_chat_right_panel_tickets.html

@@ -9,7 +9,8 @@
         <span class="user_name_messenger">{{ item.owner.last_name }} {{ item.owner.first_name }}</span>
         <span class="last-message-messenger-user-tab">{{ item.name }}</span>
     </div>
-    {% if item.unread_msgs_count %}
+{#    {% if item.unread_msgs_count %}#}
+    {% if unanswered_msgs_count > 0 %}
         <div class="right-part-tab-user">
             <div class="cost-messages-in-user-tab-messenger">
 {#                <span>{{ item.unread_msgs_count }}</span>#}