32 Commits

Author SHA1 Message Date
fca75a30aa Merge pull request 'TRI-302 add yandex metrika for landings' (#42) from dev into main
Reviewed-on: #42
2024-12-07 16:23:34 +03:00
a90d7c06a9 TRI-302 add yandex metrika for landings 2024-12-07 16:22:23 +03:00
6e342ca021 Merge pull request '1.8.11 fix stat landings' (#41) from dev into main
Reviewed-on: #41
2024-12-05 14:03:47 +03:00
SDE
4ce12a5428 1.8.11 fix stat landings 2024-12-05 14:02:24 +03:00
d89619fe61 Merge pull request 'TRI-283: fix video2' (#40) from dev into main
Reviewed-on: #40
2024-12-04 15:02:39 +03:00
b0387362b5 Merge pull request 'TRI-283: fix video1' (#39) from dev into main
Reviewed-on: #39
2024-12-04 13:44:40 +03:00
c284c1a784 Merge pull request 'TRI-297 add facebook pixel' (#38) from dev into main
Reviewed-on: #38
2024-12-03 23:37:36 +03:00
a7dd676a76 Merge pull request 'dev' (#37) from dev into main
Reviewed-on: #37
2024-12-03 12:49:46 +03:00
dd4134f2d7 Merge pull request 'TRI-283: reload images' (#36) from dev into main
Reviewed-on: #36
2024-12-02 13:41:34 +03:00
c1398284c7 Merge pull request 'TRI-283: reload images + text edit' (#35) from dev into main
Reviewed-on: #35
2024-11-29 22:24:34 +03:00
a9b4fd95c3 Merge pull request 'dev' (#34) from dev into main
Reviewed-on: #34
2024-11-29 10:21:52 +03:00
0fe7aa189c Merge pull request 'TRI-283: fix nags' (#33) from dev into main
Reviewed-on: #33
2024-11-28 11:57:31 +03:00
9133bfd8fa Merge pull request 'dev' (#32) from dev into main
Reviewed-on: #32
2024-11-27 16:45:02 +03:00
aa1657bd10 Merge pull request 'dev' (#31) from dev into main
Reviewed-on: #31
2024-11-26 22:32:25 +03:00
10411dd714 Merge pull request 'dev' (#30) from dev into main
Reviewed-on: #30
2024-11-18 15:07:50 +03:00
4be3686d2b Merge pull request 'dev' (#29) from dev into main
Reviewed-on: #29
2024-11-14 14:41:27 +03:00
70e1fa2a10 Merge pull request '1.7.19 get_my_routes_ajax log fail' (#28) from dev into main
Reviewed-on: #28
2024-11-12 17:36:48 +03:00
3a14430cd5 Merge pull request 'dev' (#27) from dev into main
Reviewed-on: #27
2024-11-12 16:08:27 +03:00
73621de710 Merge pull request 'dev' (#26) from dev into main
Reviewed-on: #26
2024-11-12 13:10:14 +03:00
5cbae093e9 Merge pull request 'dev' (#25) from dev into main
Reviewed-on: #25
2024-11-11 07:39:53 +03:00
fdaa18c0e6 Merge pull request 'dev' (#24) from dev into main
Reviewed-on: #24
2024-11-06 17:30:10 +03:00
ff6ee93497 Merge pull request 'dev' (#23) from dev into main
Reviewed-on: #23
2024-11-03 23:44:45 +03:00
d62261066f Merge pull request 'dev' (#22) from dev into main
Reviewed-on: #22
2024-10-24 10:40:47 +03:00
2a852cbb51 Merge pull request 'TRI-274 replace password recovery text' (#21) from dev into main
Reviewed-on: #21
2024-10-23 13:35:45 +03:00
f561c32526 Merge pull request 'dev' (#20) from dev into main
Reviewed-on: #20
2024-10-22 17:41:12 +03:00
cd36747b5c Merge pull request 'dev' (#19) from dev into main
Reviewed-on: #19
2024-10-22 16:50:19 +03:00
d020bdf9d0 TRI-262 replace invocation in subscription mail template 2024-10-18 15:44:38 +03:00
cd323ab66c Merge pull request 'TRI-262 replace invocation in subscription mail template' (#18) from dev into main
Reviewed-on: #18
2024-10-18 00:47:14 +03:00
0ac236d2ff Merge pull request 'dev' (#17) from dev into main
Reviewed-on: #17
2024-10-17 18:20:26 +03:00
769a42ec8b Merge pull request 'dev' (#16) from dev into main
Reviewed-on: #16
2024-10-10 14:37:43 +03:00
60ff29b23f Merge pull request 'fix tiktok link' (#15) from dev into main
Reviewed-on: #15
2024-10-05 11:26:01 +03:00
15ff3d37fc Merge pull request 'dev' (#14) from dev into main
Reviewed-on: #14
2024-10-02 13:52:51 +03:00
4 changed files with 48 additions and 3 deletions

View File

@@ -1,6 +1,6 @@
import json
from django.http import HttpResponse, Http404, FileResponse
from django.http import HttpResponse, Http404, FileResponse, HttpResponseRedirect
from django.template import loader, RequestContext
from django.contrib.auth.decorators import login_required
@@ -15,6 +15,7 @@ from django.views.decorators.csrf import csrf_exempt
from webpush import send_user_notification
import json
from datetime import datetime, timedelta
from django.urls import reverse
def generate_routes(request, routes_count):
if (not request.user
@@ -248,6 +249,12 @@ def StaticPageView(request, url):
'route_form': RouteForm(),
'owner_type': 'mover'
})
elif url in ['landing_customer', 'landing_mover']:
raise Http404
# return HttpResponseRedirect(reverse('customer_landing_page'))
# elif url == 'landing_mover':
# return HttpResponseRedirect(reverse('mover_landing_page'))
# elif url == 'works':
# return WorksPage(request)
elif url in ['main']:

View File

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

View File

@@ -29,6 +29,25 @@ src="https://www.facebook.com/tr?id=1123814969330706&ev=PageView&noscript=1"
/></noscript>
<!-- End Meta Pixel Code -->
<!-- Yandex.Metrika counter -->
<script type="text/javascript" >
(function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
m[i].l=1*new Date();
for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
ym(97070898, "init", {
clickmap:true,
trackLinks:true,
accurateTrackBounce:true,
webvisor:true,
ecommerce:"dataLayer"
});
</script>
<noscript><div><img src="https://mc.yandex.ru/watch/97070898" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->
<section class="presentation">
<div class="presentation__top">
<h1 class="presentation__title">

View File

@@ -29,6 +29,25 @@ src="https://www.facebook.com/tr?id=1009253847591455&ev=PageView&noscript=1"
/></noscript>
<!-- End Meta Pixel Code -->
<!-- Yandex.Metrika counter -->
<script type="text/javascript" >
(function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
m[i].l=1*new Date();
for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
ym(97070898, "init", {
clickmap:true,
trackLinks:true,
accurateTrackBounce:true,
webvisor:true,
ecommerce:"dataLayer"
});
</script>
<noscript><div><img src="https://mc.yandex.ru/watch/97070898" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->
<section class="presentation">
<div class="presentation__top">