Merge branch 'master' into feature/hello_platim

# Conflicts:
#	landing_page/mainpage/templates/mainpage/include/index_hero.html
#	landing_page/mainpage/templates/mainpage/index.html

Author: Melevir

landing_page/mainpage/models.py

@@ -1,6 +1,5 @@
 from django.db import models
 from django.utils.timezone import now
-from mainpage.utils.typing import ensured
 
 
 class Curators(models.Model):
@@ -69,8 +68,8 @@ class Enrollment(models.Model):
     late_price_date_from = models.DateField()
 
     @staticmethod
-    def get_enrollment_with_active_registration() -> "Enrollment":
-        return ensured(Enrollment.objects.filter(end_registration_date__gte=now()).first())
+    def get_enrollment_with_active_registration() -> "Enrollment | None":
+        return Enrollment.objects.filter(end_registration_date__gte=now()).first()
 
     def __str__(self) -> str:
         return f"Enrollment ({self.start_date} - {self.end_date})"

landing_page/mainpage/templates/mainpage/include/index_menu.html

@@ -71,6 +71,7 @@
                 <li class="nav-item">
                     <a class="nav-link scroll-to" href="#contact">Контакты</a>
                 </li>
+                {% if enrollment %}
                 <li class="nav-item d-none d-lg-block">
                     {% if enrollment.platim_url %}
                         <a class="custom-btn btn" href="{{ enrollment.platim_url }}" target="_blank">
@@ -82,6 +83,7 @@
                         </a>
                     {% endif %}
                 </li>
+                {% endif %}
             </ul>
         </nav>
 

landing_page/mainpage/views.py

@@ -11,7 +11,10 @@ def index(request: HttpRequest) -> HttpResponse:
     context = {
         'enrollment': enrollment,
         'projects': GraduateProjects.objects.all(),
-        'registration_closes_date_formatted': enrollment.end_registration_date.strftime('%b %d, %Y %H:%M:%S'),
+        'registration_closes_date_formatted': (
+            enrollment.end_registration_date.strftime('%b %d, %Y %H:%M:%S')
+            if enrollment else ""
+        ),
         'student_videos': [
             {
                 'title': 'Путь джуна — из геодезиста в Support Engineer',