From 663843ef5dd4d2d5b95a08aec444f174fbf0f3aa Mon Sep 17 00:00:00 2001
From: Raz <razmig@staxriver.com>
Date: Mon, 9 Dec 2024 11:13:19 +0100
Subject: [PATCH] enhance ui online reg

---
 tournaments/static/tournaments/css/style.css  | 24 +++++++++++--
 tournaments/templates/profile.html            |  4 +--
 .../templates/register_tournament.html        | 36 +++++++++++++------
 tournaments/templates/registration/login.html |  2 +-
 .../registration/password_reset_complete.html |  2 +-
 .../registration/password_reset_confirm.html  |  2 +-
 .../registration/password_reset_form.html     |  2 +-
 .../templates/registration/signup.html        |  2 +-
 .../tournaments/tournament_info.html          |  8 +++--
 tournaments/views.py                          | 19 +++++++++-
 10 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css
index a3b5bea..3998cf8 100644
--- a/tournaments/static/tournaments/css/style.css
+++ b/tournaments/static/tournaments/css/style.css
@@ -125,14 +125,19 @@ tr {
 } */
 
 .rounded-button {
-    background-color: #f39200; /* Green background */
-    color: white; /* White text */
+    background-color: #fae7ce; /* Green background */
+    color: #707070; /* White text */
     padding: 15px 32px; /* Some padding */
     font-size: 1em;
     font-weight: 800;
     cursor: pointer; /* Add a mouse pointer on hover */
     border-radius: 16px; /* Rounded corners */
 }
+.rounded-button:hover {
+    background-color: #f39200; /* Same background color on hover */
+    color: white; /* Same text color on hover */
+    text-decoration: none; /* Prevent underline on <a> hover */
+}
 
 .numbers {
     font-feature-settings: "tnum";
@@ -705,3 +710,18 @@ h-margin {
     font-size: x-small;
     vertical-align: super;
 }
+
+.alert {
+    color: red; /* Make the text red */
+    font-weight: bold; /* Optional: Make the text bold */
+}
+
+.destructive-button {
+    background-color: #ff4d4d; /* Red background */
+    color: white; /* White text */
+}
+
+.destructive-button:hover {
+    background-color: #cc0000; /* Darker red on hover */
+    color: white; /* White text on hover */
+}
diff --git a/tournaments/templates/profile.html b/tournaments/templates/profile.html
index ffde179..f2ce22c 100644
--- a/tournaments/templates/profile.html
+++ b/tournaments/templates/profile.html
@@ -17,7 +17,7 @@
         <form method="post">
             {% csrf_token %}
             {{ form.as_p }}
-            <button type="submit" class="button">Sauver les changements</button>
+            <button type="submit" class="rounded-button">Sauver les changements</button>
         </form>
     </div>
     <div class="cell medium-6 large-6 topblock my-block">
@@ -26,7 +26,7 @@
         <form method="post" action="{% url 'password_change' %}">
             {% csrf_token %}
             {{ password_change_form.as_p }}
-            <button type="submit" class="button">Modifier le mot de passe</button>
+            <button type="submit" class="rounded-button">Modifier le mot de passe</button>
         </form>
     </div>
 </div>
diff --git a/tournaments/templates/register_tournament.html b/tournaments/templates/register_tournament.html
index fd723ab..ff7cf89 100644
--- a/tournaments/templates/register_tournament.html
+++ b/tournaments/templates/register_tournament.html
@@ -54,7 +54,11 @@
       <!-- Add Player Form -->
       {% if current_players|length < 2 %}
       <div>
-
+          {% if current_players|length == 1 %}
+          <div class="semibold">
+          Inscrivez votre partenaire
+          </div>
+          {% endif %}
           {% if user_without_licence and tournament.license_is_required %}
           <div class="semibold">
           Une licence est obligatoire pour vous inscrire :
@@ -76,16 +80,27 @@
             {{ add_player_form.last_name.label_tag }}
             {{ add_player_form.last_name }}
             {% if tournament.license_is_required is False %}
-            {{ add_player_form.licence_id.label_tag }}{% if tournament.license_is_required is False %}(facultatif){% endif %}
+            {{ add_player_form.licence_id.label_tag }}
+            {% if tournament.license_is_required is False %}(facultatif){% endif %}
             {{ add_player_form.licence_id }}
             {% endif %}
           {% endif %}
 
-          <button type="submit" name="add_player" class="button">
+          <div class="margin10">
+          {% for message in messages %}
+            <div class="alert alert-{{ message.tags }}">{{ message }}</div>
+          {% endfor %}
+          </div>
+
+          <button type="submit" name="add_player" class="rounded-button">
               {% if user_without_licence %}
-              Ajouter-vous à l'équipe
+                Confirmer
               {% else %}
-              Ajouter un partenaire
+                {% if current_players|length == 0 %}
+                    Confirmer
+                {% else %}
+                    Ajouter un partenaire
+                {% endif %}
               {% endif %}
           </button>
       </div>
@@ -93,14 +108,13 @@
 
       <!-- Show players added to the team only if there are players added -->
       {% if current_players|length >= tournament.minimum_player_per_team %}
-          <button type="submit" name="register_team" class="button">Confirmer l'inscription</button>
+      <div class="margin10">
+      </div>
+      <div>
+          <button type="submit" name="register_team" class="rounded-button">Confirmer l'inscription</button>
+      </div>
       {% endif %}
   </form>
-
-    {% for message in messages %}
-      <div class="alert alert-{{ message.tags }}">{{ message }}</div>
-    {% endfor %}
-
   {% endif %}
 </div>
     </div>
diff --git a/tournaments/templates/registration/login.html b/tournaments/templates/registration/login.html
index ddd1521..c8cf291 100644
--- a/tournaments/templates/registration/login.html
+++ b/tournaments/templates/registration/login.html
@@ -19,7 +19,7 @@
 
             <label for="password">Mot de passe :</label>
             <input type="password" name="password" id="password" required>
-            <button type="submit" class="button">Se connecter</button>
+            <button type="submit" class="rounded-button">Se connecter</button>
 
             <p>
                 <a href="{% url 'password_reset' %}" class="styled-link">Mot de passe oublié ?</a>
diff --git a/tournaments/templates/registration/password_reset_complete.html b/tournaments/templates/registration/password_reset_complete.html
index a701c7b..7aac4d0 100644
--- a/tournaments/templates/registration/password_reset_complete.html
+++ b/tournaments/templates/registration/password_reset_complete.html
@@ -11,7 +11,7 @@
             Votre mot de passe a été réinitialisé avec succès. Vous pouvez maintenant vous connecter avec votre nouveau mot de passe.
         </p>
         <p>
-            <a href="{% url 'login' %}" class="button">Se connecter</a>
+            <a href="{% url 'login' %}" class="rounded-button">Se connecter</a>
         </p>
     </div>
 </div>
diff --git a/tournaments/templates/registration/password_reset_confirm.html b/tournaments/templates/registration/password_reset_confirm.html
index cb0dc0a..0d09311 100644
--- a/tournaments/templates/registration/password_reset_confirm.html
+++ b/tournaments/templates/registration/password_reset_confirm.html
@@ -15,7 +15,7 @@
             <label for="new_password2">Confirmer le nouveau mot de passe :</label>
             <input type="password" name="new_password2" id="new_password2" required>
 
-            <button type="submit" class="button">Réinitialiser le mot de passe</button>
+            <button type="submit" class="rounded-button">Réinitialiser le mot de passe</button>
         </form>
         <p>
             <a href="{% url 'login' %}" class="styled-link">Retour à la connexion</a>
diff --git a/tournaments/templates/registration/password_reset_form.html b/tournaments/templates/registration/password_reset_form.html
index 318f44d..0872462 100644
--- a/tournaments/templates/registration/password_reset_form.html
+++ b/tournaments/templates/registration/password_reset_form.html
@@ -11,7 +11,7 @@
             {% csrf_token %}
             <label for="email">Adresse e-mail :</label>
             <input type="email" name="email" id="email" required>
-            <button type="submit" class="button">Envoyer le lien de réinitialisation</button>
+            <button type="submit" class="rounded-button">Envoyer le lien de réinitialisation</button>
         </form>
         <p>
             <a href="{% url 'login' %}" class="styled-link">Retour à la connexion</a>
diff --git a/tournaments/templates/registration/signup.html b/tournaments/templates/registration/signup.html
index 7cdcee6..40ca09d 100644
--- a/tournaments/templates/registration/signup.html
+++ b/tournaments/templates/registration/signup.html
@@ -14,7 +14,7 @@
         <form method="post">
             {% csrf_token %}
             {{ form.as_p }}
-            <button type="submit" class="button">Créer votre compte</button>
+            <button type="submit" class="rounded-button">Créer votre compte</button>
         </form>
     </div>
 
diff --git a/tournaments/templates/tournaments/tournament_info.html b/tournaments/templates/tournaments/tournament_info.html
index 6c445da..5beae08 100644
--- a/tournaments/templates/tournaments/tournament_info.html
+++ b/tournaments/templates/tournaments/tournament_info.html
@@ -69,7 +69,7 @@
 
                 <p>
                     <div>
-                        <a href="{% url 'register_tournament' tournament.id %}" class="button">S'inscrire</a>
+                        <a href="{% url 'register_tournament' tournament.id %}" class="rounded-button">S'inscrire</a>
                     </div>
                 </p>
                 {% else %}
@@ -116,7 +116,11 @@
 
                     {% if is_captain %}
                     <p>
-                        <a href="{% url 'unregister_tournament' tournament.id %}" class="button danger">Se désinscrire</a>
+                        <a href="{% url 'unregister_tournament' tournament.id %}"
+                           class="rounded-button destructive-button"
+                           onclick="return confirm('Êtes-vous sûr de vouloir vous désinscrire ?');">
+                           Se désinscrire
+                        </a>
                     </p>
                     {% else %}
                     <p>
diff --git a/tournaments/views.py b/tournaments/views.py
index c64c6fb..eddf5c8 100644
--- a/tournaments/views.py
+++ b/tournaments/views.py
@@ -619,7 +619,10 @@ def register_tournament(request, tournament_id):
 
             validator = LicenseValidator(licence_id)
             if validator.validate_license() is False and tournament.license_is_required is True:
-                messages.error(request, f"Le numéro de licence est invalide, la lettre ne correspond pas. {validator.computed_license_key}")
+                if len(licence_id) == 0:
+                    messages.error(request, f"Le numéro de licence est obligatoire.")
+                else:
+                    messages.error(request, f"Le numéro de licence est invalide, la lettre ne correspond pas.")
                 return render(request, 'register_tournament.html', {
                     'team_form': team_form,
                     'add_player_form': add_player_form,
@@ -691,6 +694,20 @@ def register_tournament(request, tournament_id):
                                 request.session['is_woman'] = data['is_woman']
                                 request.session.modified = True  # Ensure session is updated
                             add_player_form.first_tournament = True
+                            if add_player_form.names_is_valid() is False:
+                                if len(request.session.get('team_registration', [])) == 0:
+                                    messages.error(request, "Pour confirmer votre inscription votre prénom et votre nom sont obligatoires.")
+                                else:
+                                    messages.error(request, "Pour rajouter un partenaire, son prénom et son nom sont obligatoires.")
+                                return render(request, 'register_tournament.html', {
+                                    'team_form': team_form,
+                                    'add_player_form': add_player_form,
+                                    'tournament': tournament,
+                                    'registration_successful': registration_successful,
+                                    'current_players': request.session['team_registration'],
+                                    'user_without_licence': user_without_licence
+                                })
+