From 1b37a8900d3b00eb9694842501abd97380277a3e Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Wed, 22 Nov 2023 11:32:27 +0100 Subject: [PATCH 01/17] fix clean param --- landing_page/mainpage/static/robots.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landing_page/mainpage/static/robots.txt b/landing_page/mainpage/static/robots.txt index 3865dbe..979a6b5 100644 --- a/landing_page/mainpage/static/robots.txt +++ b/landing_page/mainpage/static/robots.txt @@ -3,4 +3,4 @@ Disallow: /admin/ Disallow: /success/ Disallow: /lessons/ Sitemap: http://learn.python.ru/sitemap.xml -Clean-param: utm ref source trk 1* 2* 3* 4* 5* 6* 7* 8* 9* +Clean-param: utm ref source trk From f7d4771b4906f58949055b55932ed93fc5e68178 Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Wed, 22 Nov 2023 11:37:05 +0100 Subject: [PATCH 02/17] fix clean param --- landing_page/mainpage/static/robots.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landing_page/mainpage/static/robots.txt b/landing_page/mainpage/static/robots.txt index 979a6b5..918dd50 100644 --- a/landing_page/mainpage/static/robots.txt +++ b/landing_page/mainpage/static/robots.txt @@ -3,4 +3,4 @@ Disallow: /admin/ Disallow: /success/ Disallow: /lessons/ Sitemap: http://learn.python.ru/sitemap.xml -Clean-param: utm ref source trk +Clean-param: utm&ref&source&trk From 704e6a63b6b539fd3a1a1c6dded6893a0bffdc02 Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Thu, 23 Nov 2023 11:30:32 +0100 Subject: [PATCH 03/17] add chat --- Makefile | 2 ++ landing_page/landing_page/settings.py | 2 ++ landing_page/mainpage/templates/mainpage/index.html | 9 ++++++++- landing_page/mainpage/views.py | 2 ++ requirements.txt | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index de5cc2e..09bc7fb 100644 --- a/Makefile +++ b/Makefile @@ -12,3 +12,5 @@ run: cd landing_page; DEBUG=1 python manage.py runserver shell: cd landing_page; DEBUG=1 python manage.py shell +migrate: + cd landing_page; DEBUG=1 python manage.py migrate diff --git a/landing_page/landing_page/settings.py b/landing_page/landing_page/settings.py index 29285c7..c1506d8 100644 --- a/landing_page/landing_page/settings.py +++ b/landing_page/landing_page/settings.py @@ -23,6 +23,7 @@ 'django.contrib.sitemaps', 'memoize', + 'waffle', ] MIDDLEWARE = [ @@ -33,6 +34,7 @@ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'waffle.middleware.WaffleMiddleware', ] ROOT_URLCONF = 'landing_page.urls' diff --git a/landing_page/mainpage/templates/mainpage/index.html b/landing_page/mainpage/templates/mainpage/index.html index 943711e..c5e4143 100644 --- a/landing_page/mainpage/templates/mainpage/index.html +++ b/landing_page/mainpage/templates/mainpage/index.html @@ -267,8 +267,14 @@

онлайн курс

{% include 'mainpage/include/index_faq.html' %} + {% if should_show_chat %} +
+ {% endif %} {% include 'mainpage/include/index_footer.html' %} - {% include 'mainpage/include/index_register_popup.html' with enrollment=enrollment %} @@ -291,5 +297,6 @@

онлайн курс

crossorigin="anonymous" referrerpolicy="no-referrer" > + diff --git a/landing_page/mainpage/views.py b/landing_page/mainpage/views.py index 558836c..2096244 100644 --- a/landing_page/mainpage/views.py +++ b/landing_page/mainpage/views.py @@ -2,6 +2,7 @@ from django.http import HttpRequest, HttpResponse from django.shortcuts import render +from waffle import switch_is_active from .models import CourseReview, Curators, Enrollment, EnrollmentType, GraduateProjects @@ -18,6 +19,7 @@ def index(request: HttpRequest) -> HttpResponse: 'curators_list': Curators.objects.filter(is_visible=True), 'today': date.today(), 'reviews': CourseReview.objects.filter(review_for=EnrollmentType.BASE), + 'should_show_chat': switch_is_active('show_tg_chat_widget'), } return render(request, 'mainpage/index.html', context) diff --git a/requirements.txt b/requirements.txt index a56b32c..c080ccb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ Django==4.2.4 Pillow==10.0.0 requests==2.31.0 django-memoize==2.3.1 +django-waffle==4.0.0 From 283805684cd6e88382cf83bebd4338063ea761ed Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Sat, 25 Nov 2023 07:12:50 +0100 Subject: [PATCH 04/17] change x fram options header value --- landing_page/landing_page/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landing_page/landing_page/settings.py b/landing_page/landing_page/settings.py index c1506d8..8c75956 100644 --- a/landing_page/landing_page/settings.py +++ b/landing_page/landing_page/settings.py @@ -9,7 +9,7 @@ ALLOWED_HOSTS = ['*'] CSRF_TRUSTED_ORIGINS = ['https://learn.python.ru'] -X_FRAME_OPTIONS = "ALLOW" +X_FRAME_OPTIONS = "SAMEORIGIN" INSTALLED_APPS = [ 'mainpage.apps.MainpageConfig', From 4d7772bb4213f37adb73d6bc6bb94e5c8ee2e02d Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Mon, 27 Nov 2023 08:36:59 +0100 Subject: [PATCH 05/17] hello calltouch --- .../mainpage/include/common/counters.html | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/landing_page/mainpage/templates/mainpage/include/common/counters.html b/landing_page/mainpage/templates/mainpage/include/common/counters.html index 33e273b..62e3ea0 100644 --- a/landing_page/mainpage/templates/mainpage/include/common/counters.html +++ b/landing_page/mainpage/templates/mainpage/include/common/counters.html @@ -42,3 +42,40 @@ + + + + From e9e678d7cea484395f266cb235cf7ab932039f64 Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Fri, 1 Dec 2023 08:24:18 +0100 Subject: [PATCH 06/17] hello new favicons --- .../mainpage/static/images/favicon_lp_120.png | Bin 0 -> 1651 bytes .../mainpage/static/images/favicon_lp_16.png | Bin 0 -> 377 bytes .../mainpage/static/images/favicon_lpa_120.png | Bin 0 -> 1816 bytes .../mainpage/static/images/favicon_lpa_16.png | Bin 0 -> 379 bytes .../mainpage/templates/mainpage/advanced.html | 2 +- .../mainpage/templates/mainpage/index.html | 2 +- .../mainpage/templates/mainpage/success.html | 2 +- 7 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 landing_page/mainpage/static/images/favicon_lp_120.png create mode 100644 landing_page/mainpage/static/images/favicon_lp_16.png create mode 100644 landing_page/mainpage/static/images/favicon_lpa_120.png create mode 100644 landing_page/mainpage/static/images/favicon_lpa_16.png diff --git a/landing_page/mainpage/static/images/favicon_lp_120.png b/landing_page/mainpage/static/images/favicon_lp_120.png new file mode 100644 index 0000000000000000000000000000000000000000..98e5ab00b04a294bb388bd3984598df6d6f881e9 GIT binary patch literal 1651 zcmbtUdo-!j+bB)KBr(enP3$+XCJa$Z z2tTEzGLl$&n0aLKiXMzGzxm_$&+qi#@1FCypL6d$=RVH8=cXKTbJ(b?sSE(XMw}xS zFXKWPiXe(IjmdgQlhHb|qxX3LSg*bY5Wr$@lQ}`>@eZ~?)obl>nIRu+<7xu{_tV!e zpHct-MFm)$U*}hbY*(wL%*BL*S?@Q*f`YElZ@ybqS?|7H ztMIbx*_!v7(pdzqW1ipgNF^X9V1^lMnF}%bYSQ*YtV8W@l!QLe-Jy$diQGKgBAm3I zj{M7%ssYCY`V(55doKhZ&{TteKU3d*Z>jw9NJ$3-gs5hfhjk)t!B|zDp#h!F)*ie( z&5zh#G7F0!973Wm3HRd~esIp-F|c2OP0T*)9Nz!=LT^86D1dUYX=`*yI^bOL&Z_Kg zokc`@lHOs#wVVwk_L=&WQ6qyvWiLfWxxRIM7eyZc?JDcuvSGE`Jo=njI+_eMci7TTJ$HFmqJfX@PFVQ zr4Dz?c67E)SJ();4Yv*nv(v!=6y~VY{1`YZXW47Ny{0!wWQcL;xq&GNsmUC@Bu`6O zZYq?I4w&}I9)rS5Oj%A4y(R^YSxZcEqAmt&7oS6wrkR?jBZ;EHg4?@kndniCH!fj-V{}kqzNm zYOUMASQG(AbcRpX#l57-MoEu5vM*-3Wo1eNRfD&AV(FC{J^Tl?a-dP9rNf)%#z zrlfQnqB_&CKve0K8rw~cH8KhS)Mp1Pjg!uFlM*H+c*i@XV-eCs4nkaXopeyShIH<0 z&;W#tTO?E>1-$JuA%}w$lQ<$G(i}RNY37q(=W`=;epa6&9?pV|C#S~!0os)@)cSb~ zw?S_yX_fo%EW*n(Gl^bBSJ5!01atSCkGm##b9~>rdx5y;Q-4npnRTvL+j+hvDgj1C z^&`|~*2UOZ^g>52!1vO!tD)hAbvB<&wNGg(7U7qUpsy3pxW+?JSqqk6>6 zvAbDicdhsHv2e8nW4y&1-?@s$?YSs0Z|^ucjnpj6%v6P22`Hw?2e#MGR%N&F4MDAw zjiC+GLwA3sJUl3oZnTN#kC77($0DSqee-ur`C0TP2-)UKa_v#s9irQciP+0KlhY+Z zgZ>tV;~{B8Z&kln{U1ieA==J)gbq0b5{&iyceS?>YpbTw0q7Rc{|&G{OdJ)o!<%DP zud##d@07OvRQWtO@F35bTX-Qg{zcghf@E^u+*}ehN2GXA&@3bQC`4G3#p+^t;RSiK zE43e0Z>IgH4~Ej2%zR8HulNPk`rb3f@$VJN)nl6jK;;v1-q9>8VZ-~yFSZaUH|0UMbXTjk3nzg&3eE8!E0VN ZY83?4R+93JU$0-YadvLlDqFvVe*j-H>8$_& literal 0 HcmV?d00001 diff --git a/landing_page/mainpage/static/images/favicon_lp_16.png b/landing_page/mainpage/static/images/favicon_lp_16.png new file mode 100644 index 0000000000000000000000000000000000000000..eb69d5b48ce83cbbd69a2e4028f37e938eb9b501 GIT binary patch literal 377 zcmV-<0fzpGP)<{Z+6&a= z+ZzG4m{qHzMzv_HsB!|9N7rxBY;yQ@hhYDG0YC_CAQNcE*jW7o Xk1SaZY^lvB00000NkvXXu0mjf_zIR6 literal 0 HcmV?d00001 diff --git a/landing_page/mainpage/static/images/favicon_lpa_120.png b/landing_page/mainpage/static/images/favicon_lpa_120.png new file mode 100644 index 0000000000000000000000000000000000000000..e1f001fca6f98c6698c616f1678e18814f1d48af GIT binary patch literal 1816 zcmZ`)X*e5*7EO$zwH9TbX{Ed>Qnf}*h+2!-q7o5AY$Zjlq12k^S;kg_4i(f=(juW+ z5yV!aYF}DvXG&tL<_%+KjQ)H-=6>I~=ey^-KhC*-ZmONFx$q^KO8@{s7-3;*f6kHL zA;5RuVfUfq=X5dH!ifj~2ugeh5I`>a@mvHF?ahq=wZm7}&j((Dk&O`mP@g4u;&A~0 z;G-c-jnI+6t+{tWk`7n-|F_5;YAn@giPrFi|BSb=W}!38QkR1F3Fh_G!-YnxwMR^@4tFRo?=()_oq60J zcwG2+Cyu*6tH5*a;h&1MDzLx!$E0+Gg#BI3NOeNQ@HhW)s1yEK70QUn@hLvJKi{Dp z9u+UcWk|38tGQ^drlY7s-JGg(3U`)HFIkA9*<6_wTVklq>C+0@W%h(yM)TwJm|RHa zvx|XL$fCNAS2aGRKx)T$5yEdb6IoY0{)?;r!G0LcjI%oCB1?59?i|n@k@iWSk`>)` zH;(u){V<9+%;w{R1pf&-#Z;pNb$Rh%b?@tTcam3retc1?uc@E*yo?ks-DxB?`ho8g za0N83%4BjH zi^@cB0zg!%Mn+BLOf%Q6v@W+2tEK4Ou4oT8xne|0QUAP(SqsxIIOa`9PF>M)003oc zWw(AGkR%l#?>*kl$LwQ5Q(ujJ%U{R0GwILt9alJKwqMa(xt26HE3a+4<+Y+i#Y#iw zozA4moy>??o4%=UUCQOGA_sGuP6_ce`Mo3Wnh(@pZ0>NnRU5xTVl`u5m;m4Vr8P3K z9QP)y!KkjMh!C^v`Vo8j?ZM(~FaD*tb6;q&_J!MdcvZa6f}PB)|7-otbliw#ufcfF zWpLRC&`=W;iW^jsD3Zw9l^?)64xyFi&u-J#lyi?oE~ju*I6@>cZ1nnx8fTf;tehCzwz0lP$E7exEW2}TiG3b zmhSfk&9Z(uyjkgrDH+UqtSlH8BkhUjq z$)8v)HZe7jYZIT8wb*%mYH#1`br5PK>P%QuL+9O&(+-rBBf|_B50~wMbOdZ~h znO?Y+du$0dFNTjuyMR=BhO^0JO8?5n%9=L2@=3_@Pwp;ocTR&+TA`1ue<7R^#zm!4 zTB2ys`s*&617--~7gvybBSDr3UDJ?gJ>JyOn>X0ImVAry7c*b?4sc6)94&1*^OUjq zLy>=MWk~5nMSxG?Mp(W5w4PWDRfk;+g7T%SARQnRNjVUbj9v&V{p@9BwGjqf?Mc1!x5fE^3BCbC|m% zs~k={w5hGVMvP_>PpRFEtyAXaf@JoOLEVzB2}qRdt5FI(OAGsXKmM`f!oZEL=}WZ1 zvpCLB#-rDP9{-tNejZpY=v}xynA{IrRs55x%`WD4EE3Whkx%U^AvSimp*ogr{|#au zo|}FX{>48ff6$4FdmO<~u8ZePAy8ooASZROoK1Myb^uP8zoWeAuoQ%uP*C6bir~WA041ged3@zQyP!3uqIM_?#{w=(;KSwq@BUhG; zz$&U#(FK%N%=S{Bvxf=kH&t*)+=mb*SLB#}E7FNUGVr9%6Y3C|oEkhXKs?;w=bJ>~ zft}Q*h-egsan=RWa$cQnDfjM~F4ihENSSGme{i}}&c8nDyuO2V uo_L?UMyIlu|0wM>-);W*Paom`bcZ9*QGA9^3ID;}?>geHt!b^Xd&1vh^``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBIRQ@>$B+ufw|;xQ4+jYBul95m_f;>fuIqJb z_B-1DLtNs>-Ca9gy;+nm;9e@i;_i4cr8FQgT`-nK@QnhCOGen#J2Nk{McrC>q3D7^y`?2i8S*8#( z1E+<0vmE(%95i5juid)4K6hp0FTdr=>lGJBYJLB=i`76qe2&Qdr3Vrfk~P0Xa|t** z6*!;x9JbE=mMqKG3HLVDJlSihv?2Sd@NIq7pZxLqr&ccxpD>?i`=+};-!!`OXrB?e z-7)*G=lqQC|CskxC7-LEU2@4u-v0P0lcG$c&l|-v{Z8oI - + Learn Python Advanced - продвинутые курсы Python онлайн {% include 'mainpage/include/common/counters.html' %} diff --git a/landing_page/mainpage/templates/mainpage/index.html b/landing_page/mainpage/templates/mainpage/index.html index c5e4143..cb6cb58 100644 --- a/landing_page/mainpage/templates/mainpage/index.html +++ b/landing_page/mainpage/templates/mainpage/index.html @@ -23,7 +23,7 @@ - + Learn Python - курсы Python онлайн {% include 'mainpage/include/common/counters.html' %} diff --git a/landing_page/mainpage/templates/mainpage/success.html b/landing_page/mainpage/templates/mainpage/success.html index 86a7c20..fc44c1e 100644 --- a/landing_page/mainpage/templates/mainpage/success.html +++ b/landing_page/mainpage/templates/mainpage/success.html @@ -22,7 +22,7 @@ - + Learn Python - Курсы Python онлайн {% include 'mainpage/include/common/counters.html' %} From dfe262fe46561996c9a125b0d0cc7fa1151a1dc5 Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Mon, 4 Dec 2023 06:41:28 +0100 Subject: [PATCH 07/17] add advanced promo --- landing_page/mainpage/static/css/style.css | 5 +++++ landing_page/mainpage/static/robots.txt | 2 +- .../mainpage/templates/mainpage/include/index_modules.html | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/landing_page/mainpage/static/css/style.css b/landing_page/mainpage/static/css/style.css index 801879a..0334c79 100644 --- a/landing_page/mainpage/static/css/style.css +++ b/landing_page/mainpage/static/css/style.css @@ -4762,3 +4762,8 @@ ul.installment-plan li:before { text-transform: none; } +.advanced-promo { + background: #252526; + color: #ffffff; + padding: 15px; +} diff --git a/landing_page/mainpage/static/robots.txt b/landing_page/mainpage/static/robots.txt index 918dd50..8c3094d 100644 --- a/landing_page/mainpage/static/robots.txt +++ b/landing_page/mainpage/static/robots.txt @@ -3,4 +3,4 @@ Disallow: /admin/ Disallow: /success/ Disallow: /lessons/ Sitemap: http://learn.python.ru/sitemap.xml -Clean-param: utm&ref&source&trk +Clean-param: utm&ref&source&trk&&5030bbc2 diff --git a/landing_page/mainpage/templates/mainpage/include/index_modules.html b/landing_page/mainpage/templates/mainpage/include/index_modules.html index 501e27b..424478f 100644 --- a/landing_page/mainpage/templates/mainpage/include/index_modules.html +++ b/landing_page/mainpage/templates/mainpage/include/index_modules.html @@ -137,6 +137,11 @@

Программа

+

+ Ещё у нас есть + продвинутый курс + для тех, кто уже освоил эту программу. +

From a4dfc8fd8e9ca1e6a79beaac749317862fe9b289 Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Mon, 4 Dec 2023 06:53:56 +0100 Subject: [PATCH 08/17] add reviews for advanced --- landing_page/mainpage/models.py | 3 +++ landing_page/mainpage/templates/mainpage/advanced.html | 4 ++++ .../templates/mainpage/include/advanced/index_menu.html | 8 +------- .../mainpage/include/{ => common}/index_reviews.html | 0 landing_page/mainpage/templates/mainpage/index.html | 4 +++- landing_page/mainpage/views.py | 1 + 6 files changed, 12 insertions(+), 8 deletions(-) rename landing_page/mainpage/templates/mainpage/include/{ => common}/index_reviews.html (100%) diff --git a/landing_page/mainpage/models.py b/landing_page/mainpage/models.py index 416a892..b34a9ee 100644 --- a/landing_page/mainpage/models.py +++ b/landing_page/mainpage/models.py @@ -96,3 +96,6 @@ class CourseReview(models.Model): review_for = models.CharField(max_length=10, choices=EnrollmentType.get_choices(), null=True, blank=True) reviewer_name = models.CharField(max_length=254, null=True, blank=True) reviewed_at = models.DateField() + + def __str__(self) -> str: + return f'{self.title} ({self.review_for})' diff --git a/landing_page/mainpage/templates/mainpage/advanced.html b/landing_page/mainpage/templates/mainpage/advanced.html index 570adfa..e50837b 100644 --- a/landing_page/mainpage/templates/mainpage/advanced.html +++ b/landing_page/mainpage/templates/mainpage/advanced.html @@ -231,6 +231,10 @@

онлайн курс

+ {% if reviews %} + {% include 'mainpage/include/common/index_reviews.html' with reviews=reviews %} + {% endif %} + {% if enrollment.platim_url %} {% include 'mainpage/include/index_how_to_pay_by_platim.html' %} {% else %} diff --git a/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html b/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html index a21c536..bebf06a 100644 --- a/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html +++ b/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html @@ -52,17 +52,11 @@
  • Стоимость
    • -
  • - Как оплатить -
  • Отзывы
  • - - FAQ - FAQ - + Как оплатить
  • Контакты diff --git a/landing_page/mainpage/templates/mainpage/include/index_reviews.html b/landing_page/mainpage/templates/mainpage/include/common/index_reviews.html similarity index 100% rename from landing_page/mainpage/templates/mainpage/include/index_reviews.html rename to landing_page/mainpage/templates/mainpage/include/common/index_reviews.html diff --git a/landing_page/mainpage/templates/mainpage/index.html b/landing_page/mainpage/templates/mainpage/index.html index cb6cb58..41e37c3 100644 --- a/landing_page/mainpage/templates/mainpage/index.html +++ b/landing_page/mainpage/templates/mainpage/index.html @@ -263,7 +263,9 @@

    онлайн курс

    {% include 'mainpage/include/index_how_to_pay.html' %} {% endif %} - {% include 'mainpage/include/index_reviews.html' with reviews=reviews %} + {% if reviews %} + {% include 'mainpage/include/common/index_reviews.html' with reviews=reviews %} + {% endif %} {% include 'mainpage/include/index_faq.html' %} diff --git a/landing_page/mainpage/views.py b/landing_page/mainpage/views.py index 2096244..3ba82a5 100644 --- a/landing_page/mainpage/views.py +++ b/landing_page/mainpage/views.py @@ -32,6 +32,7 @@ def advanced_handle(request: HttpRequest) -> HttpResponse: context={ 'today': date.today(), 'enrollment': enrollment, + 'reviews': CourseReview.objects.filter(review_for=EnrollmentType.ADVANCED), 'registration_closes_date_formatted': ( enrollment.end_registration_date.strftime('%b %d, %Y %H:%M:%S') if enrollment else "" From 061ae86453896cbc00dab482787b58770d622bd3 Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Mon, 18 Dec 2023 11:42:01 +0100 Subject: [PATCH 09/17] add calltouch clean param --- landing_page/mainpage/static/robots.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landing_page/mainpage/static/robots.txt b/landing_page/mainpage/static/robots.txt index 8c3094d..6ec9f59 100644 --- a/landing_page/mainpage/static/robots.txt +++ b/landing_page/mainpage/static/robots.txt @@ -3,4 +3,4 @@ Disallow: /admin/ Disallow: /success/ Disallow: /lessons/ Sitemap: http://learn.python.ru/sitemap.xml -Clean-param: utm&ref&source&trk&&5030bbc2 +Clean-param: utm&ref&source&trk&&5030bbc2&calltouch_tm From 1c61f110a074d6543b8806f2f9f3993e740dab7a Mon Sep 17 00:00:00 2001 From: Ilya Lebedev Date: Tue, 16 Jan 2024 07:00:24 +0100 Subject: [PATCH 10/17] add etext clean param --- landing_page/mainpage/static/robots.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landing_page/mainpage/static/robots.txt b/landing_page/mainpage/static/robots.txt index 6ec9f59..a68ba7b 100644 --- a/landing_page/mainpage/static/robots.txt +++ b/landing_page/mainpage/static/robots.txt @@ -3,4 +3,4 @@ Disallow: /admin/ Disallow: /success/ Disallow: /lessons/ Sitemap: http://learn.python.ru/sitemap.xml -Clean-param: utm&ref&source&trk&&5030bbc2&calltouch_tm +Clean-param: utm&ref&source&trk&&5030bbc2&calltouch_tm&etext From 1a095c6b92ea32dd84de715ff4603550660c4d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D1=8C=D1=8F=20=D0=A8=D0=BF=D0=B0=D0=BA?= Date: Thu, 14 Mar 2024 07:41:49 +0300 Subject: [PATCH 11/17] Add yandex metrica goals --- landing_page/mainpage/static/js/yandex_map.js | 4 +-- .../mainpage/templates/mainpage/advanced.html | 25 ++--------------- .../mainpage/include/advanced/index_hero.html | 20 ++----------- .../mainpage/include/advanced/index_menu.html | 22 ++++++++++++--- .../advanced/track_code_infrastructure.html | 2 ++ .../include/advanced/track_django.html | 2 ++ .../advanced/track_programming_practice.html | 2 ++ .../include/advanced/track_unittests.html | 2 ++ .../include/buttons/order_button.html | 16 +++++++++++ .../include/buttons/track_order_button.html | 23 +++++++++++++++ .../mainpage/include/common/counters.html | 20 +++++++++++++ .../mainpage/include/index_hero.html | 25 ++++------------- .../mainpage/include/index_menu.html | 22 ++++++++++++--- .../mainpage/include/index_modules.html | 16 ++++++++--- .../mainpage/include/track_bots.html | 2 ++ .../templates/mainpage/include/track_ds.html | 2 ++ .../mainpage/include/track_main.html | 2 ++ .../templates/mainpage/include/track_web.html | 4 ++- .../mainpage/templates/mainpage/index.html | 28 ++++--------------- landing_page/mainpage/utils/utm_parser.py | 12 ++++++++ landing_page/mainpage/views.py | 3 ++ 21 files changed, 157 insertions(+), 97 deletions(-) create mode 100644 landing_page/mainpage/templates/mainpage/include/buttons/order_button.html create mode 100644 landing_page/mainpage/templates/mainpage/include/buttons/track_order_button.html create mode 100644 landing_page/mainpage/utils/utm_parser.py diff --git a/landing_page/mainpage/static/js/yandex_map.js b/landing_page/mainpage/static/js/yandex_map.js index c7cbb53..b81eb15 100644 --- a/landing_page/mainpage/static/js/yandex_map.js +++ b/landing_page/mainpage/static/js/yandex_map.js @@ -90,7 +90,7 @@ jQuery(function() { + data-target="#overlay">${today > early_date ? 'Регистрация закрыта' : 'Записаться на курс'}

    Обычная регистрация

    @@ -100,7 +100,7 @@ jQuery(function() { + data-target="#overlay">${today < basic_date ? `С ${format_date_with_year(basic_date)}` : 'Записаться на курс'}
    ` diff --git a/landing_page/mainpage/templates/mainpage/advanced.html b/landing_page/mainpage/templates/mainpage/advanced.html index e50837b..665cdee 100644 --- a/landing_page/mainpage/templates/mainpage/advanced.html +++ b/landing_page/mainpage/templates/mainpage/advanced.html @@ -150,7 +150,7 @@

    онлайн курс

    Ранняя регистрация
    До - {{ enrollment.early_price.date_to | date:"j E" }}
    + {{ enrollment.early_price_date_to | date:"j E" }}
    {{ enrollment.early_price_rub }} р. @@ -164,16 +164,7 @@

    онлайн курс

    {% if today <= enrollment.early_price_date_to %} - {% if enrollment.platim_url %} - - Купить билет - - {% else %} - - {% endif %} + {% include 'mainpage/include/buttons/order_button.html' with modal_btn='yellow ' order_btn='yellow ' %} {% else %} - {% endif %} + {% include 'mainpage/include/buttons/order_button.html' with order_btn='yellow ' %} {% else %} - {% endif %} + {% include 'mainpage/include/buttons/order_button.html' with modal_btn='yellow ' %} {% else %} - {% endif %} + {% include 'mainpage/include/buttons/order_button.html' %} {% else %} +{% endif %} \ No newline at end of file diff --git a/landing_page/mainpage/templates/mainpage/include/buttons/track_order_button.html b/landing_page/mainpage/templates/mainpage/include/buttons/track_order_button.html new file mode 100644 index 0000000..6d90700 --- /dev/null +++ b/landing_page/mainpage/templates/mainpage/include/buttons/track_order_button.html @@ -0,0 +1,23 @@ +{% if enrollment %} +
    + +{% endif %} \ No newline at end of file diff --git a/landing_page/mainpage/templates/mainpage/include/common/counters.html b/landing_page/mainpage/templates/mainpage/include/common/counters.html index 62e3ea0..e29a695 100644 --- a/landing_page/mainpage/templates/mainpage/include/common/counters.html +++ b/landing_page/mainpage/templates/mainpage/include/common/counters.html @@ -79,3 +79,23 @@ })(window, document, "ct", "p1d0w4kr"); + + + + + + + + + \ No newline at end of file diff --git a/landing_page/mainpage/templates/mainpage/include/index_hero.html b/landing_page/mainpage/templates/mainpage/include/index_hero.html index a560c3c..15cacf7 100644 --- a/landing_page/mainpage/templates/mainpage/include/index_hero.html +++ b/landing_page/mainpage/templates/mainpage/include/index_hero.html @@ -71,17 +71,12 @@

    Учитесь онлайн {% if today <= enrollment.early_price_date_to %} - {% if enrollment.platim_url %} - - Купить билет - - {% else %} - - {% endif %} + {% include 'mainpage/include/buttons/order_button.html' with modal_btn='yellow ' %} {% else %} - {% endif %} @@ -101,15 +96,7 @@

    Учитесь онлайн {% if today >= enrollment.late_price_date_from %} - {% if enrollment.platim_url %} - - Купить билет - - {% else %} - - {% endif %} + {% include 'mainpage/include/buttons/order_button.html' %} {% else %} - {% endif %} + {% include 'mainpage/include/buttons/order_button.html' with modal_btn='yellow ' order_btn='yellow ' %} {% else %} - - {% endif %} + {% include 'mainpage/include/buttons/order_button.html' with order_btn='yellow ' %} {% else %}

    {% if today >= enrollment.late_price_date_from %} - {% include 'mainpage/include/buttons/order_button.html' with order_btn='yellow ' %} + {% include 'mainpage/include/common/buttons/block_order_button.html' with order_btn='yellow ' %} {% else %} - {% endif %} - - -
    -
    -
    -
    Обычная регистрация
    -
    С - {{ enrollment.late_price.date_from | date:"j E" }}
    - {{ enrollment.late_price_rub }} - р. -
    -
    - В - рассрочку - от 4000 р/мес - Есть - рассрочка -
    -
    - {% if today >= enrollment.late_price_date_from %} - {% include 'mainpage/include/common/buttons/block_order_button.html' with order_btn='yellow ' %} - {% else %} - - {% endif %} +
    +
    +
    diff --git a/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html b/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html index f849034..6db6900 100644 --- a/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html +++ b/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html @@ -52,54 +52,7 @@

    Учитесь онлайн

    -
    -
    -
    -
    Ранняя регистрация
    -
    - До {{ enrollment.early_price_date_to | date:"j E" }} -
    - {{ enrollment.early_price_rub }} р. -
    -
    - - В рассрочку от 3500 р/мес - - - Есть рассрочка - -
    -
    - {% if today <= enrollment.early_price_date_to %} - {% include 'mainpage/include/common/buttons/block_order_button.html' with modal_btn='yellow ' %} - {% else %} - - {% endif %} -
    -
    -
    -
    -
    Обычная регистрация
    -
    С {{ enrollment.late_price_date_from | date:"j E" }}
    - {{ enrollment.late_price_rub }} р. -
    -
    - - В рассрочку от 4000 р/мес - - Есть рассрочка -
    -
    - {% if today >= enrollment.late_price_date_from %} - {% include 'mainpage/include/common/buttons/block_order_button.html' %} - {% else %} - - {% endif %} -
    +
    diff --git a/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html b/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html index 90c0d8e..96c56ce 100644 --- a/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html +++ b/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html @@ -16,7 +16,7 @@ {% if enrollment %} - {% include 'mainpage/include/common/buttons/menu_order_button.html' with subclass1=' btn-outline-warning' subclass2=' btn-outline-warning' %} + {% include 'mainpage/include/common/buttons/menu_order_button.html' %} {% endif %}
      @@ -62,7 +62,7 @@ {% if enrollment %}
      - {% include 'mainpage/include/common/buttons/menu_order_button.html' with subclass2=' btn-outline-warning' %} + {% include 'mainpage/include/common/buttons/menu_order_button.html' %}
      {% endif %} diff --git a/landing_page/mainpage/templates/mainpage/include/common/buttons/menu_order_button.html b/landing_page/mainpage/templates/mainpage/include/common/buttons/menu_order_button.html index 4d6f277..e8ba82e 100644 --- a/landing_page/mainpage/templates/mainpage/include/common/buttons/menu_order_button.html +++ b/landing_page/mainpage/templates/mainpage/include/common/buttons/menu_order_button.html @@ -1,16 +1,3 @@ -{% if enrollment.platim_url %} - - Записаться - -{% else %} - - Записаться - -{% endif %} \ No newline at end of file + + Записаться + diff --git a/landing_page/mainpage/templates/mainpage/include/common/buttons/track_order_button.html b/landing_page/mainpage/templates/mainpage/include/common/buttons/track_order_button.html index 6d90700..2fb9d90 100644 --- a/landing_page/mainpage/templates/mainpage/include/common/buttons/track_order_button.html +++ b/landing_page/mainpage/templates/mainpage/include/common/buttons/track_order_button.html @@ -1,23 +1,10 @@ {% if enrollment %}
      {% endif %} \ No newline at end of file diff --git a/landing_page/mainpage/templates/mainpage/include/index_hero.html b/landing_page/mainpage/templates/mainpage/include/index_hero.html index 1f7ca6f..07cf534 100644 --- a/landing_page/mainpage/templates/mainpage/include/index_hero.html +++ b/landing_page/mainpage/templates/mainpage/include/index_hero.html @@ -52,57 +52,7 @@

      Учитесь онлайн

      -
      -
      -
      -
      Ранняя регистрация
      -
      - До {{ enrollment.early_price_date_to | date:"j E" }} -
      - {{ enrollment.early_price_rub }} р. -
      -
      - - В рассрочку от 3500 р/мес - - - Есть рассрочка - -
      -
      - {% if today <= enrollment.early_price_date_to %} - {% include 'mainpage/include/common/buttons/block_order_button.html' with modal_btn='yellow ' %} - {% else %} - - {% endif %} -
      -
      -
      -
      -
      Обычная регистрация
      -
      С {{ enrollment.late_price_date_from | date:"j E" }}
      - {{ enrollment.late_price_rub }} р. -
      -
      - - В рассрочку от 4000 р/мес - - Есть рассрочка -
      -
      - {% if today >= enrollment.late_price_date_from %} - {% include 'mainpage/include/common/buttons/block_order_button.html' %} - {% else %} - - {% endif %} -
      +
      diff --git a/landing_page/mainpage/templates/mainpage/include/index_menu.html b/landing_page/mainpage/templates/mainpage/include/index_menu.html index a0c8272..9a2c913 100644 --- a/landing_page/mainpage/templates/mainpage/include/index_menu.html +++ b/landing_page/mainpage/templates/mainpage/include/index_menu.html @@ -16,7 +16,7 @@ {% if enrollment %} - {% include 'mainpage/include/common/buttons/menu_order_button.html' with subclass1=' btn-outline-warning' subclass2=' btn-outline-warning' %} + {% include 'mainpage/include/common/buttons/menu_order_button.html' %} {% endif %}
        @@ -68,7 +68,7 @@ {% if enrollment %}
        - {% include 'mainpage/include/common/buttons/menu_order_button.html' with subclass2=' btn-outline-warning' %} + {% include 'mainpage/include/common/buttons/menu_order_button.html' %}
        {% endif %} diff --git a/landing_page/mainpage/templates/mainpage/index.html b/landing_page/mainpage/templates/mainpage/index.html index c73cdc2..6a7d628 100644 --- a/landing_page/mainpage/templates/mainpage/index.html +++ b/landing_page/mainpage/templates/mainpage/index.html @@ -169,67 +169,9 @@

        Записаться

        онлайн курс

        -
        -
        -
        -
        -
        Ранняя регистрация
        -
        До - {{ enrollment.early_price_date_to | date:"j E" }}
        - {{ enrollment.early_price_rub }} - р. -
        -
        - В - рассрочку - от 3500 р/мес - Есть - рассрочка -
        -
        - {% if today <= enrollment.early_price_date_to %} - {% include 'mainpage/include/common/buttons/block_order_button.html' with modal_btn='yellow ' order_btn='yellow ' %} - {% else %} - - {% endif %} -
        - -
        -
        -
        -
        Обычная регистрация
        -
        С - {{ enrollment.late_price.date_from | date:"j E" }}
        - {{ enrollment.late_price_rub }} - р. -
        -
        - В - рассрочку - от 4000 р/мес - Есть - рассрочка -
        -
        - {% if today >= enrollment.late_price_date_from %} - {% include 'mainpage/include/common/buttons/block_order_button.html' with order_btn='yellow ' %} - {% else %} - - {% endif %} +
        +
        +
        From 55e11630c41acc4890bec24d80373cd83a73f9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D1=8C=D1=8F=20=D0=A8=D0=BF=D0=B0=D0=BA?= Date: Tue, 2 Apr 2024 01:10:45 +0300 Subject: [PATCH 15/17] remove connection with enrollment in db --- .../mainpage/templates/mainpage/advanced.html | 16 +++++++--------- .../mainpage/include/advanced/index_hero.html | 18 ++++++++---------- .../mainpage/include/advanced/index_menu.html | 8 +------- .../common/buttons/track_order_button.html | 4 +--- .../templates/mainpage/include/index_hero.html | 18 ++++++++---------- .../templates/mainpage/include/index_menu.html | 8 +------- .../mainpage/templates/mainpage/index.html | 16 +++++++--------- 7 files changed, 33 insertions(+), 55 deletions(-) diff --git a/landing_page/mainpage/templates/mainpage/advanced.html b/landing_page/mainpage/templates/mainpage/advanced.html index b5d6248..ef82ac0 100644 --- a/landing_page/mainpage/templates/mainpage/advanced.html +++ b/landing_page/mainpage/templates/mainpage/advanced.html @@ -139,18 +139,16 @@

        Записаться

        - {% if enrollment %} -
        -
        -

        онлайн курс

        -
        -
        - -
        +
        +
        +

        онлайн курс

        +
        +
        +
        - {% endif %} +
        diff --git a/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html b/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html index 6db6900..5355c2b 100644 --- a/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html +++ b/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html @@ -45,19 +45,17 @@

        {% endif %}
        - {% if enrollment %} -
        -
        -
        -
        -

        Учитесь онлайн

        -
        - -
        +
        +
        +
        +
        +

        Учитесь онлайн

        +
        +
        - {% endif %} +
        diff --git a/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html b/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html index 96c56ce..bcf61d8 100644 --- a/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html +++ b/landing_page/mainpage/templates/mainpage/include/advanced/index_menu.html @@ -15,9 +15,7 @@
        - {% if enrollment %} - {% include 'mainpage/include/common/buttons/menu_order_button.html' %} - {% endif %} + {% include 'mainpage/include/common/buttons/menu_order_button.html' %}
        • @@ -53,17 +51,13 @@
        • Контакты
          • - {% if enrollment %}
        • {% include 'mainpage/include/common/buttons/menu_order_button.html' %}
          • - {% endif %}
        - {% if enrollment %}
        {% include 'mainpage/include/common/buttons/menu_order_button.html' %}
        - {% endif %}
        diff --git a/landing_page/mainpage/templates/mainpage/include/common/buttons/track_order_button.html b/landing_page/mainpage/templates/mainpage/include/common/buttons/track_order_button.html index 2fb9d90..b30e915 100644 --- a/landing_page/mainpage/templates/mainpage/include/common/buttons/track_order_button.html +++ b/landing_page/mainpage/templates/mainpage/include/common/buttons/track_order_button.html @@ -1,4 +1,3 @@ -{% if enrollment %}
        -{% endif %} \ No newline at end of file +
      \ No newline at end of file diff --git a/landing_page/mainpage/templates/mainpage/include/index_hero.html b/landing_page/mainpage/templates/mainpage/include/index_hero.html index 07cf534..9b7a3bf 100644 --- a/landing_page/mainpage/templates/mainpage/include/index_hero.html +++ b/landing_page/mainpage/templates/mainpage/include/index_hero.html @@ -45,19 +45,17 @@

      {% endif %} - {% if enrollment %} -
      -
      -
      -
      -

      Учитесь онлайн

      -
      - -
      +
      +
      +
      +
      +

      Учитесь онлайн

      +
      +
      - {% endif %} +
      diff --git a/landing_page/mainpage/templates/mainpage/include/index_menu.html b/landing_page/mainpage/templates/mainpage/include/index_menu.html index 9a2c913..f51b308 100644 --- a/landing_page/mainpage/templates/mainpage/include/index_menu.html +++ b/landing_page/mainpage/templates/mainpage/include/index_menu.html @@ -15,9 +15,7 @@
      - {% if enrollment %} - {% include 'mainpage/include/common/buttons/menu_order_button.html' %} - {% endif %} + {% include 'mainpage/include/common/buttons/menu_order_button.html' %}
      • @@ -59,17 +57,13 @@
      • Контакты
        • - {% if enrollment %}
      • {% include 'mainpage/include/common/buttons/menu_order_button.html' %}
        • - {% endif %}
      - {% if enrollment %}
      {% include 'mainpage/include/common/buttons/menu_order_button.html' %}
      - {% endif %}
      diff --git a/landing_page/mainpage/templates/mainpage/index.html b/landing_page/mainpage/templates/mainpage/index.html index 6a7d628..aa87fb0 100644 --- a/landing_page/mainpage/templates/mainpage/index.html +++ b/landing_page/mainpage/templates/mainpage/index.html @@ -165,18 +165,16 @@

      Записаться

      - {% if enrollment %} -
      -
      -

      онлайн курс

      -
      -
      - -
      +
      +
      +

      онлайн курс

      +
      +
      +
      - {% endif %} +
      From ee184a1e23442ee0de9129a91743f4b35e751a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D1=8C=D1=8F=20=D0=A8=D0=BF=D0=B0=D0=BA?= Date: Tue, 2 Apr 2024 22:58:00 +0300 Subject: [PATCH 16/17] fix widget loading --- .../static/js/widgets/advance_widget.js | 69 ++++++++++++++++++ .../js/widgets/advance_widget_bottom.js | 69 ++++++++++++++++++ .../mainpage/static/js/widgets/widget.js | 71 +++++++++++++++++++ .../static/js/widgets/widget_bottom.js | 71 +++++++++++++++++++ .../mainpage/templates/mainpage/advanced.html | 2 +- .../mainpage/include/advanced/index_hero.html | 4 +- .../mainpage/include/index_hero.html | 4 +- .../mainpage/templates/mainpage/index.html | 12 +--- 8 files changed, 289 insertions(+), 13 deletions(-) create mode 100644 landing_page/mainpage/static/js/widgets/advance_widget.js create mode 100644 landing_page/mainpage/static/js/widgets/advance_widget_bottom.js create mode 100644 landing_page/mainpage/static/js/widgets/widget.js create mode 100644 landing_page/mainpage/static/js/widgets/widget_bottom.js diff --git a/landing_page/mainpage/static/js/widgets/advance_widget.js b/landing_page/mainpage/static/js/widgets/advance_widget.js new file mode 100644 index 0000000..bb35fff --- /dev/null +++ b/landing_page/mainpage/static/js/widgets/advance_widget.js @@ -0,0 +1,69 @@ +document.addEventListener("DOMContentLoaded", function() { + var script = document.getElementById('f5be3bcced9b8d99a4cc095aadcc152acc1c0aa02'); + + var par = script.parentNode; + script.parentNode.style.overflow = 'hidden'; + + var iframe = document.createElement('iframe'); + iframe.src = 'https://learnpythonru.getcourse.ru/pl/lite/widget/widget' + + "?" + window.location.search.substring(1) + + "&id=1151238" + + "&ref=" + encodeURIComponent(document.referrer) + + "&loc=" + encodeURIComponent(document.location.href); + iframe.style.width = '100%'; + iframe.style.height = '0px'; + iframe.style.border = 'none'; + iframe.style.overflow = 'hidden'; + iframe.setAttribute('allowfullscreen', 'allowfullscreen'); + iframe.className = '511'; + iframe.id = 'c6b45c08ef83f13b64a41560165b2147de61cf2a' + '_' + iframe.className; + // name можно получить изнутри iframe + iframe.name = iframe.className; + + var iframeId = iframe.id; + + var gcEmbedOnMessage = function(e) { + var insertedIframe = document.getElementById(iframeId); + if (!insertedIframe) { + return; + } + + if (e.data.uniqName == 'f5be3bcced9b8d99a4cc095aadcc152acc1c0aa0') { + if (e.data.height) { + if (e.data.iframeName) { + if (e.data.iframeName == iframe.name) { + par.style.height = ( e.data.height ) + "px"; + insertedIframe.style.height = (e.data.height) + "px"; + } + } else { + par.style.height = ( e.data.height ) + "px"; + insertedIframe.style.height = (e.data.height) + "px"; + } + } + } + }; + + if (window.addEventListener) { + window.addEventListener("message", gcEmbedOnMessage, false); + } else if (window.attachEvent) { + window.attachEvent('onmessage', gcEmbedOnMessage) + } else { + window['onmessage'] = gcEmbedOnMessage + } + + script.parentNode.insertBefore(iframe, script); + par.removeChild( script ) +}); + +var getLocation = function(href) { + var l = document.createElement("a"); + l.href = href; + return l; +}; + +var currentScript = document.currentScript || (function() { + var scripts = document.getElementsByTagName('script'); + return scripts[scripts.length - 1]; +})(); + +var domain = ( (getLocation( currentScript.src )).hostname ); \ No newline at end of file diff --git a/landing_page/mainpage/static/js/widgets/advance_widget_bottom.js b/landing_page/mainpage/static/js/widgets/advance_widget_bottom.js new file mode 100644 index 0000000..d40b05d --- /dev/null +++ b/landing_page/mainpage/static/js/widgets/advance_widget_bottom.js @@ -0,0 +1,69 @@ +document.addEventListener("DOMContentLoaded", function() { + var script = document.getElementById('f5be3bcced9b8d99a4cc095aadcc152acc1c0aa0'); + + var par = script.parentNode; + script.parentNode.style.overflow = 'hidden'; + + var iframe = document.createElement('iframe'); + iframe.src = 'https://learnpythonru.getcourse.ru/pl/lite/widget/widget' + + "?" + window.location.search.substring(1) + + "&id=1151238" + + "&ref=" + encodeURIComponent(document.referrer) + + "&loc=" + encodeURIComponent(document.location.href); + iframe.style.width = '100%'; + iframe.style.height = '0px'; + iframe.style.border = 'none'; + iframe.style.overflow = 'hidden'; + iframe.setAttribute('allowfullscreen', 'allowfullscreen'); + iframe.className = '51'; + iframe.id = 'c6b45c08ef83f13b64a41560165b2147de61cf2a' + '_' + iframe.className; + // name можно получить изнутри iframe + iframe.name = iframe.className; + + var iframeId = iframe.id; + + var gcEmbedOnMessage = function(e) { + var insertedIframe = document.getElementById(iframeId); + if (!insertedIframe) { + return; + } + + if (e.data.uniqName == 'f5be3bcced9b8d99a4cc095aadcc152acc1c0aa0') { + if (e.data.height) { + if (e.data.iframeName) { + if (e.data.iframeName == iframe.name) { + par.style.height = ( e.data.height ) + "px"; + insertedIframe.style.height = (e.data.height) + "px"; + } + } else { + par.style.height = ( e.data.height ) + "px"; + insertedIframe.style.height = (e.data.height) + "px"; + } + } + } + }; + + if (window.addEventListener) { + window.addEventListener("message", gcEmbedOnMessage, false); + } else if (window.attachEvent) { + window.attachEvent('onmessage', gcEmbedOnMessage) + } else { + window['onmessage'] = gcEmbedOnMessage + } + + script.parentNode.insertBefore(iframe, script); + par.removeChild( script ) +}); + +var getLocation = function(href) { + var l = document.createElement("a"); + l.href = href; + return l; +}; + +var currentScript = document.currentScript || (function() { + var scripts = document.getElementsByTagName('script'); + return scripts[scripts.length - 1]; +})(); + +var domain = ( (getLocation( currentScript.src )).hostname ); \ No newline at end of file diff --git a/landing_page/mainpage/static/js/widgets/widget.js b/landing_page/mainpage/static/js/widgets/widget.js new file mode 100644 index 0000000..cbe5de5 --- /dev/null +++ b/landing_page/mainpage/static/js/widgets/widget.js @@ -0,0 +1,71 @@ +console.log('in file') + +document.addEventListener("DOMContentLoaded", function() { + var script = document.getElementById('3e6321862d90cf3a72c6198927067b35e82b0b822'); + // var script = document.currentScript; + var par = script.parentNode; + script.parentNode.style.overflow = 'hidden'; + + var iframe = document.createElement('iframe'); + iframe.src = 'https://learnpythonru.getcourse.ru/pl/lite/widget/widget' + + "?" + window.location.search.substring(1) + + "&id=1139675" + + "&ref=" + encodeURIComponent(document.referrer) + + "&loc=" + encodeURIComponent(document.location.href); + iframe.style.width = '100%'; + iframe.style.height = '0px'; + iframe.style.border = 'none'; + iframe.style.overflow = 'hidden'; + iframe.setAttribute('allowfullscreen', 'allowfullscreen'); + iframe.className = '941'; + iframe.id = 'cc9d55a8a649fc463bf0a580d1c0567f6542b153' + '_' + iframe.className; + // name можно получить изнутри iframe + iframe.name = iframe.className; + + var iframeId = iframe.id; + + var gcEmbedOnMessage = function(e) { + var insertedIframe = document.getElementById(iframeId); + if (!insertedIframe) { + return; + } + + if (e.data.uniqName == '3e6321862d90cf3a72c6198927067b35e82b0b82') { + if (e.data.height) { + if (e.data.iframeName) { + if (e.data.iframeName == iframe.name) { + par.style.height = ( e.data.height ) + "px"; + insertedIframe.style.height = (e.data.height) + "px"; + } + } else { + par.style.height = ( e.data.height ) + "px"; + insertedIframe.style.height = (e.data.height) + "px"; + } + } + } + }; + + if (window.addEventListener) { + window.addEventListener("message", gcEmbedOnMessage, false); + } else if (window.attachEvent) { + window.attachEvent('onmessage', gcEmbedOnMessage) + } else { + window['onmessage'] = gcEmbedOnMessage + } + + script.parentNode.insertBefore(iframe, script); + par.removeChild( script ) +}); + +var getLocation = function(href) { + var l = document.createElement("a"); + l.href = href; + return l; +}; + +var currentScript = document.currentScript || (function() { + var scripts = document.getElementsByTagName('script'); + return scripts[scripts.length - 1]; +})(); + +var domain = ( (getLocation( currentScript.src )).hostname ); \ No newline at end of file diff --git a/landing_page/mainpage/static/js/widgets/widget_bottom.js b/landing_page/mainpage/static/js/widgets/widget_bottom.js new file mode 100644 index 0000000..49df1eb --- /dev/null +++ b/landing_page/mainpage/static/js/widgets/widget_bottom.js @@ -0,0 +1,71 @@ +console.log('in file') + +document.addEventListener("DOMContentLoaded", function() { + var script = document.getElementById('3e6321862d90cf3a72c6198927067b35e82b0b82'); + // var script = document.currentScript; + var par = script.parentNode; + script.parentNode.style.overflow = 'hidden'; + + var iframe = document.createElement('iframe'); + iframe.src = 'https://learnpythonru.getcourse.ru/pl/lite/widget/widget' + + "?" + window.location.search.substring(1) + + "&id=1139675" + + "&ref=" + encodeURIComponent(document.referrer) + + "&loc=" + encodeURIComponent(document.location.href); + iframe.style.width = '100%'; + iframe.style.height = '0px'; + iframe.style.border = 'none'; + iframe.style.overflow = 'hidden'; + iframe.setAttribute('allowfullscreen', 'allowfullscreen'); + iframe.className = '940'; + iframe.id = 'cc9d55a8a649fc463bf0a580d1c0567f6542b153' + '_' + iframe.className; + // name можно получить изнутри iframe + iframe.name = iframe.className; + + var iframeId = iframe.id; + + var gcEmbedOnMessage = function(e) { + var insertedIframe = document.getElementById(iframeId); + if (!insertedIframe) { + return; + } + + if (e.data.uniqName == '3e6321862d90cf3a72c6198927067b35e82b0b82') { + if (e.data.height) { + if (e.data.iframeName) { + if (e.data.iframeName == iframe.name) { + par.style.height = ( e.data.height ) + "px"; + insertedIframe.style.height = (e.data.height) + "px"; + } + } else { + par.style.height = ( e.data.height ) + "px"; + insertedIframe.style.height = (e.data.height) + "px"; + } + } + } + }; + + if (window.addEventListener) { + window.addEventListener("message", gcEmbedOnMessage, false); + } else if (window.attachEvent) { + window.attachEvent('onmessage', gcEmbedOnMessage) + } else { + window['onmessage'] = gcEmbedOnMessage + } + + script.parentNode.insertBefore(iframe, script); + par.removeChild( script ) +}); + +var getLocation = function(href) { + var l = document.createElement("a"); + l.href = href; + return l; +}; + +var currentScript = document.currentScript || (function() { + var scripts = document.getElementsByTagName('script'); + return scripts[scripts.length - 1]; +})(); + +var domain = ( (getLocation( currentScript.src )).hostname ); \ No newline at end of file diff --git a/landing_page/mainpage/templates/mainpage/advanced.html b/landing_page/mainpage/templates/mainpage/advanced.html index ef82ac0..e16402b 100644 --- a/landing_page/mainpage/templates/mainpage/advanced.html +++ b/landing_page/mainpage/templates/mainpage/advanced.html @@ -144,7 +144,7 @@

      Записаться

      онлайн курс

      - +
      diff --git a/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html b/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html index 5355c2b..a9faddc 100644 --- a/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html +++ b/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html @@ -1,3 +1,5 @@ +{% load static %} +
      @@ -51,7 +53,7 @@

      Учитесь онлайн

      - +

      diff --git a/landing_page/mainpage/templates/mainpage/include/index_hero.html b/landing_page/mainpage/templates/mainpage/include/index_hero.html index 9b7a3bf..903968c 100644 --- a/landing_page/mainpage/templates/mainpage/include/index_hero.html +++ b/landing_page/mainpage/templates/mainpage/include/index_hero.html @@ -1,3 +1,5 @@ +{% load static %} +
      @@ -51,7 +53,7 @@

      Учитесь онлайн

      - +

      diff --git a/landing_page/mainpage/templates/mainpage/index.html b/landing_page/mainpage/templates/mainpage/index.html index aa87fb0..9c203ff 100644 --- a/landing_page/mainpage/templates/mainpage/index.html +++ b/landing_page/mainpage/templates/mainpage/index.html @@ -157,20 +157,12 @@

      Записаться

      -
      -
      -
      - онлайн - оффлайн -
      -
      -
      -

      онлайн курс

      +

      онлайн курс

      - +
      From 6367a4442e08b0424614f8e6b1a706e45cca28bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D1=8C=D1=8F=20=D0=A8=D0=BF=D0=B0=D0=BA?= Date: Tue, 22 Oct 2024 23:00:51 +0300 Subject: [PATCH 17/17] Change python version in index files --- landing_page/mainpage/templates/mainpage/advanced.html | 2 +- .../templates/mainpage/include/advanced/index_hero.html | 2 +- .../mainpage/templates/mainpage/include/index_hero.html | 2 +- landing_page/mainpage/templates/mainpage/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/landing_page/mainpage/templates/mainpage/advanced.html b/landing_page/mainpage/templates/mainpage/advanced.html index 0b7d693..05e7653 100644 --- a/landing_page/mainpage/templates/mainpage/advanced.html +++ b/landing_page/mainpage/templates/mainpage/advanced.html @@ -5,7 +5,7 @@ - + diff --git a/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html b/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html index f849034..4368d8a 100644 --- a/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html +++ b/landing_page/mainpage/templates/mainpage/include/advanced/index_hero.html @@ -6,7 +6,7 @@

      Курс программирования на - Python 3.11 + Python 3.12 для тех, кто уже знаком с веб-разработкой на Python

      diff --git a/landing_page/mainpage/templates/mainpage/include/index_hero.html b/landing_page/mainpage/templates/mainpage/include/index_hero.html index 1f7ca6f..9513f92 100644 --- a/landing_page/mainpage/templates/mainpage/include/index_hero.html +++ b/landing_page/mainpage/templates/mainpage/include/index_hero.html @@ -6,7 +6,7 @@

      Курс программирования на - Python 3.11 + Python 3.12 для любого уровня c упором на практику

      Ближайший набор пройдет только Онлайн

      diff --git a/landing_page/mainpage/templates/mainpage/index.html b/landing_page/mainpage/templates/mainpage/index.html index c73cdc2..46efb71 100644 --- a/landing_page/mainpage/templates/mainpage/index.html +++ b/landing_page/mainpage/templates/mainpage/index.html @@ -5,7 +5,7 @@ - +