Merge pull request #755 from MTES-MCT/feat-newsletter-form

Ajout d'une page-formulaire d'inscription à la newsletter

home/models.py

@@ -60,7 +60,7 @@ def get_token(self):
         return "".join(choices(alphabet, k=25))
 
     def get_confirmation_url(self):
-        return get_url_with_domain(reverse("home:nwl-confirmation", kwargs={"token": self.confirm_token}))
+        return get_url_with_domain(reverse("home:nwl-validation", kwargs={"token": self.confirm_token}))
 
     def confirm(self):
         self.confirmation_date = timezone.now()

home/static/home/css/home.css

@@ -2,6 +2,11 @@
     width: 750px;
 }
 
+.newsletter-container .fr-follow .fr-container {
+    height: 25vh;
+    display: flex;
+}
+
 .card {
     background: #ffffff;
     border-radius: 8px;

home/templates/home/newsletter.html

@@ -3,17 +3,12 @@
 {% load static %}
 {% load crispy_forms_tags %}
 
-{% block pagetitle %}Formulaire de contact{% endblock pagetitle %}
+{% block pagetitle %}Inscription à la newsletter{% endblock pagetitle %}
 
 {% block content %}
 <div class="d-flex justify-content-center">
-    <div class="home-container">
-        <h1>Inscrivez-vous à notre newsletter</h1>
-        <form action="" method="post">
-            {% csrf_token %}
-            {{ form|crispy }}
-            <button id="btn-send" class="fr-btn mt-4" type="submit">S'inscrire</button>
-        </form>
+    <div class="newsletter-container">
+        {% include "home/partials/newsletter_form.html" %}
     </div>
 </div>
 {% endblock content %}

home/templates/home/partials/newsletter_form.html

@@ -8,7 +8,7 @@ <h2 class="fr-h5">Abonnez-vous à notre lettre d'information</h2>
             <p class="fr-text--sm">Ne ratez rien de notre actualité.</p>
           </div>
           <div>
-            <form hx-post="{% url 'home:nwl-subscription' %}">
+            <form hx-post="{% url 'home:nwl-confirmation' %}">
               {% csrf_token %}
               <div class="fr-input-group">
                 <label class="fr-label" for="newsletter-email">

home/urls.py

@@ -21,14 +21,14 @@
         name="nwl-subscription",
     ),
     path(
-        "newsletter/confirmation/<slug:token>",
-        views.NewsLetterConfirmationView.as_view(),
+        "newsletter/confirmation",
+        views.NewsletterConfirmationSubscriptionView.as_view(),
         name="nwl-confirmation",
     ),
     path(
-        "emails",
-        views.AllEmailsView.as_view(),
-        name="all-emails",
+        "newsletter/confirmation/<slug:token>",
+        views.NewsletterEmailValidationView.as_view(),
+        name="nwl-validation",
     ),
     path("maintenance", views.MaintenanceView.as_view(), name="maintenance_mode"),
     path("alive/async-workers", views.AliveView.as_view(), name="alive"),

home/views/AccessView.py

@@ -0,0 +1,7 @@
+from django.views.generic import TemplateView
+
+from utils.views_mixins import BreadCrumbMixin
+
+
+class AccessView(BreadCrumbMixin, TemplateView):
+    template_name = "home/accessibilite.html"

home/views/AliveView.py

@@ -0,0 +1,20 @@
+from datetime import timedelta
+from typing import Any
+
+from django.http import HttpRequest, HttpResponse, HttpResponseGone
+from django.utils import timezone
+from django.views.generic import TemplateView
+
+from home.models import AliveTimeStamp
+
+
+class AliveView(TemplateView):
+    template_name = "home/alive.html"
+
+    def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        from_datetime = timezone.now() - timedelta(minutes=35)
+        default_is_alive = AliveTimeStamp.objects.filter(queue_name="default", timestamp__gte=from_datetime).exists()
+        long_is_alive = AliveTimeStamp.objects.filter(queue_name="default", timestamp__gte=from_datetime).exists()
+        if default_is_alive and long_is_alive:
+            return HttpResponse("All good...")
+        return HttpResponseGone("Celery workers are not alive.")

home/views/ContactView.py

@@ -0,0 +1,15 @@
+from django.conf import settings
+from django.views.generic import CreateView
+
+from home.models import ContactForm
+
+
+class ContactView(CreateView):
+    model = ContactForm
+    template_name = "home/contact.html"
+    success_url = "/"
+    fields = ["email", "content"]
+
+    def get_context_data(self, **kwargs):
+        kwargs["crisp_website_id"] = settings.CRISP_WEBSITE_ID
+        return super().get_context_data(**kwargs)

home/views/DownloadView.py

@@ -0,0 +1,17 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.views.generic import TemplateView
+
+from home.forms import NewsletterForm
+from project.models import RNUPackage
+from utils.views_mixins import BreadCrumbMixin
+
+
+class DownloadView(LoginRequiredMixin, BreadCrumbMixin, TemplateView):
+    template_name = "home/download.html"
+
+    def get_context_data(self, **kwargs):
+        kwargs |= {
+            "form": NewsletterForm(),
+            "rnu_packages": RNUPackage.objects.all().order_by("departement_official_id"),
+        }
+        return super().get_context_data(**kwargs)

home/views/HomeRapportLocalView.py

@@ -0,0 +1,12 @@
+from django.views.generic import TemplateView
+
+from home.forms import NewsletterForm
+from utils.views_mixins import BreadCrumbMixin
+
+
+class HomeRapportLocalView(BreadCrumbMixin, TemplateView):
+    template_name = "home/home_rapport_local.html"
+
+    def get_context_data(self, **kwargs):
+        kwargs["form"] = NewsletterForm()
+        return super().get_context_data(**kwargs)

home/views/HomeView.py

@@ -0,0 +1,12 @@
+from django.views.generic import TemplateView
+
+from home.forms import NewsletterForm
+from utils.views_mixins import BreadCrumbMixin
+
+
+class HomeView(BreadCrumbMixin, TemplateView):
+    template_name = "home/home.html"
+
+    def get_context_data(self, **kwargs):
+        kwargs["form"] = NewsletterForm()
+        return super().get_context_data(**kwargs)

home/views/LegalNoticeView.py

@@ -0,0 +1,7 @@
+from django.views.generic import TemplateView
+
+from utils.views_mixins import BreadCrumbMixin
+
+
+class LegalNoticeView(BreadCrumbMixin, TemplateView):
+    template_name = "home/legal_notices.html"