Merge branch 'master' of gitlab.pirati.cz:/to/majak into feat/uniweb-charts

fc4c336a · Tomáš · d12427ec · 1ac61db0 · fc4c336a · fc4c336a
Commit fc4c336a authored 2 years ago by Tomáš
--- a/main/models.py
+++ b/main/models.py
@@ -2,6 +2,7 @@ from functools import cached_property

 from dateutil.relativedelta import relativedelta
 from django.conf import settings
+from django.contrib import messages
 from django.core.paginator import Paginator
 from django.db import models
 from django.http import HttpResponseRedirect, JsonResponse
@@ -290,6 +291,12 @@ class MainHomePage(
                    settings.PIRATICZ_NEWSLETTER_ID,
                    settings.PIRATICZ_NEWSLETTER_SOURCE,
                )
+
+                messages.success(
+                    request,
+                    "Zkontroluj si prosím schránku, poslali jsme ti potvrzovací email."
+                )
+
                try:
                    page = (
                        Page.objects.filter(id=form.cleaned_data["return_page_id"])
@@ -299,6 +306,12 @@ class MainHomePage(
                    return HttpResponseRedirect(page.full_url)
                except Page.DoesNotExist:
                    return HttpResponseRedirect(self.url)
+
+            messages.error(
+                request,
+                "Tvůj prohlížeč nám odeslal špatná data. Prosím, zkus to znovu."
+            )
+
        return HttpResponseRedirect(self.url)

    @route(r"^feeds/atom/$")

--- a/main/static/main/main.css
+++ b/main/static/main/main.css
--- a/main/templates/main/base.html
+++ b/main/templates/main/base.html
@@ -24,6 +24,8 @@
 </head>

 <body>
+{% include 'main/includes/layout/messages.html' %}
+
 {% include 'main/includes/layout/header.html' %}

 {% block content %}{% endblock content %}

--- a/main/templates/main/includes/layout/messages.html
+++ b/main/templates/main/includes/layout/messages.html
+{% if messages %}
+    <ul class="flex flex-col w-full drop-shadow-lg">
+        {% for message in messages %}
+            <li
+                class="px-5 py-4 text-center relative z-50 {% if message.tags == "debug" %}bg-grey-200{% elif message.tags == "info" %}bg-blue-300 text-white{% elif message.tags == "success" %}bg-green-400 text-white{% elif message.tags == "warning" %}bg-yellow-300{% elif message.tags == "error" %}bg-red-600 text-white{% endif %}"
+            >
+                <i
+                    class="ico--{% if message.tags == "debug" %}cog{% elif message.tags == "info" %}info{% elif message.tags == "success" %}checkmark{% elif message.tags == "warning" %}warning{% elif message.tags == "error" %}cross{% endif %} mr-2"
+                ></i>
+
+                {{ message }}
+            </li>
+        {% endfor %}
+    </ul>
+{% endif %}