Merge branch 'improvements' into 'master'

Fix signup

See merge request animath/si/plateforme-corres2math!6

apps/participation/templates/participation/chat.html

@@ -1,16 +1,39 @@
 {% extends "base.html" %}
 
-{% block extracss %}
-    <style>
-    iframe {
-        width: 100%;
-        height: 100vh;
-        margin: 0;
-        padding: 0;
-    }
-    </style>
-{% endblock %}
+{% load i18n %}
 
-{% block fullcontent %}
-    <iframe frameborder="0" src="https://element.correspondances-maths.fr/#/room/#faq:correspondances-maths.fr"></iframe>
+{% block content %}
+    <div class="alert alert-warning">
+    {% blocktrans trimmed %}
+        The chat is located on the dedicated Matrix server:
+    {% endblocktrans %}
+    </div>
+
+    <div class="alert text-center">
+    <a class="btn btn-success" href="https://element.correspondances-maths.fr/#/room/#faq:correspondances-maths.fr" target="_blank">
+        <i class="fas fa-server"></i> {% trans "Access to the Matrix server" %}
+    </a>
+    </div>
+
+    <div class="alert alert-info">
+    <p>
+    {% blocktrans trimmed %}
+        To connect to the server, you can select "Log in", then use your credentials of this platform to connect
+        with the central authentication server, then you must trust the connection between the Matrix account and the
+        platform. Finally, you will be able to access to the chat platform.
+    {% endblocktrans %}
+    </p>
+
+    <p>
+    {% blocktrans trimmed %}
+        You will be invited in some basic rooms. You must confirm the invitations to join channels.
+    {% endblocktrans %}
+    </p>
+
+    <p>
+    {% blocktrans trimmed %}
+        If you have any trouble, don't hesitate to contact us :)
+    {% endblocktrans %}
+    </p>
+    </div>
 {% endblock %}

apps/registration/forms.py

@@ -22,6 +22,15 @@ class SignupForm(UserCreationForm):
         ],
     )
 
+    def clean_email(self):
+        """
+        Ensure that the email address is unique.
+        """
+        email = self.data["email"]
+        if User.objects.filter(email=email).exists():
+            self.add_error("email", _("This email address is already used."))
+        return email
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["first_name"].required = True

apps/registration/tests.py

@@ -119,6 +119,20 @@ class TestRegistration(TestCase):
         self.assertRedirects(response, reverse("registration:email_validation_sent"), 302, 200)
         self.assertTrue(User.objects.filter(email="toto@example.com").exists())
 
+        # Email is already used
+        response = self.client.post(reverse("registration:signup"), data=dict(
+            last_name="Toto",
+            first_name="Toto",
+            email="toto@example.com",
+            password1="azertyuiopazertyuiop",
+            password2="azertyuiopazertyuiop",
+            role="participant",
+            student_class=12,
+            school="God",
+            give_contact_to_animath=False,
+        ))
+        self.assertEqual(response.status_code, 200)
+
         response = self.client.get(reverse("registration:email_validation_sent"))
         self.assertEqual(response.status_code, 200)