diff --git a/robots.txt b/robots.txt index 4bf494c..5224369 100644 --- a/robots.txt +++ b/robots.txt @@ -1,4 +1,5 @@ User-agent: * Disallow: / +Disallow: */admin/* Host: dev.tripwb.com \ No newline at end of file diff --git a/static/css/styles.css b/static/css/styles.css index f1a5a3b..7dae002 100644 --- a/static/css/styles.css +++ b/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; +} + diff --git a/static/favicon/android-icon-144x144.png b/static/favicon/android-icon-144x144.png new file mode 100644 index 0000000..58beae4 Binary files /dev/null and b/static/favicon/android-icon-144x144.png differ diff --git a/static/favicon/android-icon-192x192.png b/static/favicon/android-icon-192x192.png new file mode 100644 index 0000000..03bf678 Binary files /dev/null and b/static/favicon/android-icon-192x192.png differ diff --git a/static/favicon/android-icon-36x36.png b/static/favicon/android-icon-36x36.png new file mode 100644 index 0000000..ba857f2 Binary files /dev/null and b/static/favicon/android-icon-36x36.png differ diff --git a/static/favicon/android-icon-48x48.png b/static/favicon/android-icon-48x48.png new file mode 100644 index 0000000..6004680 Binary files /dev/null and b/static/favicon/android-icon-48x48.png differ diff --git a/static/favicon/android-icon-72x72.png b/static/favicon/android-icon-72x72.png new file mode 100644 index 0000000..4630228 Binary files /dev/null and b/static/favicon/android-icon-72x72.png differ diff --git a/static/favicon/android-icon-96x96.png b/static/favicon/android-icon-96x96.png new file mode 100644 index 0000000..c4cfa9f Binary files /dev/null and b/static/favicon/android-icon-96x96.png differ diff --git a/static/favicon/apple-icon-114x114.png b/static/favicon/apple-icon-114x114.png new file mode 100644 index 0000000..cc364ce Binary files /dev/null and b/static/favicon/apple-icon-114x114.png differ diff --git a/static/favicon/apple-icon-120x120.png b/static/favicon/apple-icon-120x120.png new file mode 100644 index 0000000..9f92ea1 Binary files /dev/null and b/static/favicon/apple-icon-120x120.png differ diff --git a/static/favicon/apple-icon-144x144.png b/static/favicon/apple-icon-144x144.png new file mode 100644 index 0000000..58beae4 Binary files /dev/null and b/static/favicon/apple-icon-144x144.png differ diff --git a/static/favicon/apple-icon-152x152.png b/static/favicon/apple-icon-152x152.png new file mode 100644 index 0000000..7b04f3d Binary files /dev/null and b/static/favicon/apple-icon-152x152.png differ diff --git a/static/favicon/apple-icon-180x180.png b/static/favicon/apple-icon-180x180.png new file mode 100644 index 0000000..071de2b Binary files /dev/null and b/static/favicon/apple-icon-180x180.png differ diff --git a/static/favicon/apple-icon-57x57.png b/static/favicon/apple-icon-57x57.png new file mode 100644 index 0000000..badf6bc Binary files /dev/null and b/static/favicon/apple-icon-57x57.png differ diff --git a/static/favicon/apple-icon-60x60.png b/static/favicon/apple-icon-60x60.png new file mode 100644 index 0000000..9a06ad4 Binary files /dev/null and b/static/favicon/apple-icon-60x60.png differ diff --git a/static/favicon/apple-icon-72x72.png b/static/favicon/apple-icon-72x72.png new file mode 100644 index 0000000..4630228 Binary files /dev/null and b/static/favicon/apple-icon-72x72.png differ diff --git a/static/favicon/apple-icon-76x76.png b/static/favicon/apple-icon-76x76.png new file mode 100644 index 0000000..732d3ac Binary files /dev/null and b/static/favicon/apple-icon-76x76.png differ diff --git a/static/favicon/apple-icon-precomposed.png b/static/favicon/apple-icon-precomposed.png new file mode 100644 index 0000000..77bfbdf Binary files /dev/null and b/static/favicon/apple-icon-precomposed.png differ diff --git a/static/favicon/apple-icon.png b/static/favicon/apple-icon.png new file mode 100644 index 0000000..77bfbdf Binary files /dev/null and b/static/favicon/apple-icon.png differ diff --git a/static/favicon/favicon-16x16.png b/static/favicon/favicon-16x16.png new file mode 100644 index 0000000..c4043c9 Binary files /dev/null and b/static/favicon/favicon-16x16.png differ diff --git a/static/favicon/favicon-32x32.png b/static/favicon/favicon-32x32.png new file mode 100644 index 0000000..d4b1f9b Binary files /dev/null and b/static/favicon/favicon-32x32.png differ diff --git a/static/favicon/favicon-96x96.png b/static/favicon/favicon-96x96.png new file mode 100644 index 0000000..c4cfa9f Binary files /dev/null and b/static/favicon/favicon-96x96.png differ diff --git a/static/favicon/favicon.ico b/static/favicon/favicon.ico new file mode 100644 index 0000000..01f98fe Binary files /dev/null and b/static/favicon/favicon.ico differ diff --git a/static/favicon.svg b/static/favicon/favicon.svg similarity index 100% rename from static/favicon.svg rename to static/favicon/favicon.svg diff --git a/static/favicon/ms-icon-144x144.png b/static/favicon/ms-icon-144x144.png new file mode 100644 index 0000000..58beae4 Binary files /dev/null and b/static/favicon/ms-icon-144x144.png differ diff --git a/static/favicon/ms-icon-150x150.png b/static/favicon/ms-icon-150x150.png new file mode 100644 index 0000000..145802d Binary files /dev/null and b/static/favicon/ms-icon-150x150.png differ diff --git a/static/favicon/ms-icon-310x310.png b/static/favicon/ms-icon-310x310.png new file mode 100644 index 0000000..64e7cb5 Binary files /dev/null and b/static/favicon/ms-icon-310x310.png differ diff --git a/static/favicon/ms-icon-70x70.png b/static/favicon/ms-icon-70x70.png new file mode 100644 index 0000000..0718c7a Binary files /dev/null and b/static/favicon/ms-icon-70x70.png differ diff --git a/static/js/authorization.js b/static/js/authorization.js index da0a6c3..0c59dfe 100644 --- a/static/js/authorization.js +++ b/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') } }); } diff --git a/static/js/registration.js b/static/js/registration.js index 817fd19..05d4c73 100644 --- a/static/js/registration.js +++ b/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": "", // string. The email of the customer if available. It must be hashed with SHA-256 on the client side. + "phone_number": "", // string. The phone number of the customer if available. It must be hashed with SHA-256 on the client side. + "external_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": "", // string. ID of the product. Example: "1077218". + "content_type": "", // string. Either product or product_group. + "content_name": "" // string. The name of the page or product. Example: "shirt". + } + ], + "value": "", // number. Value of the order or items sold. Example: 100. + "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 diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 02fcba0..749c3d4 100644 --- a/static/js/user_profile.js +++ b/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') } diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index a291686..56de7cd 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -20,8 +20,9 @@ - + +
diff --git a/templates/forms/f_login.html b/templates/forms/f_login.html index f035b5f..8bdf909 100644 --- a/templates/forms/f_login.html +++ b/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 %} + +
+

{% translate "Введите Ваш Email" %}

+ {% csrf_token %}
{% if form.username and form.errors.username %} {{ form.errors.username }} {% endif %} +{#
{% translate %}
#}
-
+
- \ No newline at end of file +
\ No newline at end of file diff --git a/templates/forms/f_password_recovery.html b/templates/forms/f_password_recovery.html index 6e19556..7071bef 100644 --- a/templates/forms/f_password_recovery.html +++ b/templates/forms/f_password_recovery.html @@ -4,7 +4,7 @@ {% trans "Подтвердить пароль *" as p_con_password %}
-

{% translate "Восстановление пароля" %}

+

{% translate "Изменение пароля" %}

-
-
{% trans 'На Вашу почту отправлено письмо для подтверждения регистрации. Если не получили письмо, то проверьте папку СПАМ' %}
-
+
+
{% trans 'На Вашу почту отправлено письмо для подтверждения регистрации. Если не получили письмо, то проверьте папку СПАМ' %}
+
diff --git a/templates/mail/m_confirm_email.html b/templates/mail/m_confirm_email.html index a3858c0..38d76c8 100644 --- a/templates/mail/m_confirm_email.html +++ b/templates/mail/m_confirm_email.html @@ -6,7 +6,8 @@ >
- {{ project_name }} + +{# {{ project_name }}#}

- {{ project_name }} +{# {{ project_name }}#} +

- {{ project_name }} +{# {{ project_name }}#} +

- {{ project_name }} +{# {{ project_name }}#} +

- {{ project_name }} +{# {{ project_name }}#} +

#} - + + + + + + + + + + + + + + + {% block meta %} {% endblock %} @@ -148,37 +162,37 @@ function gtag_report_conversion(url) { -

- - {% if not user.is_authenticated %} -
-
- -
-
-
{% translate "Попробуй бесплатно" %}
-
{% blocktranslate %} Зарегистрируйся сейчас и получи бонус
3 месяца бесплатного пользования! {% endblocktranslate %}
- -
- - {% endif %} - - {% if user.is_authenticated %} -
-
- -
-
- -
-
{% translate "Добро пожаловать!" %}
-
{% blocktranslate %} Команда Trip With Bonus
поздравляет вас с регистрацией и дарит
3 месяца бесплатного пользования сервисом {% endblocktranslate %}
- -
-
- - {% endif %} -
+{#
#} +{##} +{# {% if not user.is_authenticated %}#} +{#
#} +{#
#} +{# #} +{#
#} +{#
#} +{#
{% translate "Попробуй бесплатно" %}
#} +{#
{% blocktranslate %} Зарегистрируйся сейчас и получи бонус
3 месяца бесплатного пользования! {% endblocktranslate %}
#} +{# #} +{#
#} +{##} +{# {% endif %}#} +{##} +{# {% if user.is_authenticated %}#} +{#
#} +{#
#} +{# #} +{#
#} +{#
#} +{# #} +{#
#} +{#
{% translate "Добро пожаловать!" %}
#} +{#
{% blocktranslate %} Команда Trip With Bonus
поздравляет вас с регистрацией и дарит
3 месяца бесплатного пользования сервисом {% endblocktranslate %}
#} +{# #} +{#
#} +{#
#} +{##} +{# {% endif %}#} +{#
#}
diff --git a/templates/widgets/w_chat_right_panel_tickets.html b/templates/widgets/w_chat_right_panel_tickets.html index b7869fa..a299757 100644 --- a/templates/widgets/w_chat_right_panel_tickets.html +++ b/templates/widgets/w_chat_right_panel_tickets.html @@ -9,7 +9,8 @@ {{ item.owner.last_name }} {{ item.owner.first_name }} {{ item.name }}
- {% if item.unread_msgs_count %} +{# {% if item.unread_msgs_count %}#} + {% if unanswered_msgs_count > 0 %}
{# {{ item.unread_msgs_count }}#}