From 266cd2f4d2d01f4a2dd0d1ea7ccf851334d110ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?William=20Bouzour=C3=A8ne?= <william@bouzourene.ch>
Date: Sun, 22 Dec 2024 14:02:17 +0100
Subject: [PATCH] Improve welcome page

---
 controllers/welcome.go | 19 +++++++------------
 views/welcome.pug      |  5 +++--
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/controllers/welcome.go b/controllers/welcome.go
index bc4326b..8495506 100644
--- a/controllers/welcome.go
+++ b/controllers/welcome.go
@@ -13,7 +13,7 @@ import (
 type WelcomeValidation struct {
 	Email          string `validate:"required,min=6,max=100,email"`
 	Name           string `validate:"required,min=2,max=100"`
-	Password       string `validate:"required,min=12,max=100"`
+	Password       string `validate:"required,min=10,max=100"`
 	PasswordVerify string `validate:"required,eqfield=Password"`
 }
 
@@ -90,19 +90,14 @@ func WelcomePage(c *fiber.Ctx) error {
 			return c.Redirect(redirectUrl)
 		} else {
 			for _, validErr := range validErrs.(validator.ValidationErrors) {
-				if validErr.Field() == "Email" {
+				switch validErr.Field() {
+				case "Email":
 					formErrors = append(formErrors, "L'adresse email doit être valide.")
-				}
-
-				if validErr.Field() == "Name" {
+				case "Name":
 					formErrors = append(formErrors, "Le nom doit contenir entre 2 et 100 caractères.")
-				}
-
-				if validErr.Field() == "Password" {
-					formErrors = append(formErrors, "Le mot de passe doit contenir entre 12 et 100 caractères.")
-				}
-
-				if validErr.Field() == "PasswordVerify" {
+				case "Password":
+					formErrors = append(formErrors, "Le mot de passe doit contenir entre 10 et 100 caractères.")
+				case "PasswordVerify":
 					formErrors = append(formErrors, "Les mots de passe doivent correspondre.")
 				}
 			}
diff --git a/views/welcome.pug b/views/welcome.pug
index c81b1d5..7c4a836 100644
--- a/views/welcome.pug
+++ b/views/welcome.pug
@@ -6,8 +6,9 @@ include partials/header.pug
 			.card-header
 				| Paramètres du compte
 			.card-body
-				.alert.alert-danger
-					| !{.FormErrors}
+				if .FormErrors
+					.alert.alert-danger
+						| #{.FormErrors}
 				form#login(method="post")
 					.mb-3 
 						label.form-label(for="email") Adresse email