main #13

Merged
sysadminix merged 37 commits from main into dev 2024-10-02 13:22:02 +03:00
31 changed files with 73 additions and 36 deletions

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
static/favicon/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

@@ -21,6 +21,27 @@ function SendRegistrationForm(el){
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')
@@ -29,7 +50,6 @@ function SendRegistrationForm(el){
console.log('Скрипт Яндекс.Метрики не найден. Статистика не будет отправлена.');
}
},
error: function (data, exception){
document.querySelector(".register").innerHTML = data.responseJSON.html

View File

@@ -22,6 +22,7 @@
<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://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">

View File

@@ -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">

View File

@@ -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>#}