From fcadaf855f6cf6bd9cc360036d855a24bbea169d Mon Sep 17 00:00:00 2001
From: Greg Burri <greg.burri@gmail.com>
Date: Wed, 7 May 2025 13:38:01 +0200
Subject: [PATCH] Little changes on forms presentation

---
 backend/scss/main.scss              | 46 +++++------------------------
 backend/src/data/db/user.rs         |  1 -
 backend/src/services/user.rs        |  4 +--
 backend/templates/profile.html      |  4 +--
 backend/templates/sign_in_form.html |  2 ++
 backend/templates/toast.html        |  2 +-
 6 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/backend/scss/main.scss b/backend/scss/main.scss
index db60a61..473af2f 100644
--- a/backend/scss/main.scss
+++ b/backend/scss/main.scss
@@ -27,7 +27,7 @@ body {
     margin: 0px;
 
     .user-message {
-        font-weight: bold;
+        font-weight: 600;
         color: consts.$color-highlight;
     }
 
@@ -256,46 +256,16 @@ body {
         form {
             display: grid;
             grid-template-columns: auto 1fr;
-            gap: 3px;
-
-            input,
-            button {
-                border-width: 1px;
-            }
-        }
-
-        #sign-up form {
-            display: grid;
-            grid-template-columns: auto 1fr auto;
-
-            input[type="submit"] {
-                grid-column: 2
-            }
-        }
-
-        #sign-in form {
-            input[type="submit"] {
-                grid-column: 2
-            }
-        }
-
-        #ask-reset-password form {
-            grid-template-columns: auto 1fr auto;
-
-            input[type="submit"] {
-                grid-column: 2
-            }
-        }
-
-        #reset-password form {
-            grid-template-columns: auto 1fr auto;
-
-            input[type="submit"] {
-                grid-column: 2
-            }
+            gap: calc(consts.$margin / 2);
+            align-items: center;
         }
 
+        #sign-up form,
+        #sign-in form,
+        #ask-reset-password form,
+        #reset-password form,
         #user-edit form {
+            // <label> <input> <user message>.
             grid-template-columns: auto 1fr auto;
 
             input[type="submit"] {
diff --git a/backend/src/data/db/user.rs b/backend/src/data/db/user.rs
index 316636a..e7ff366 100644
--- a/backend/src/data/db/user.rs
+++ b/backend/src/data/db/user.rs
@@ -8,7 +8,6 @@ use crate::{
     consts,
     data::model,
     hash::{hash, verify_password},
-    services::user,
 };
 
 #[derive(Debug, Display)]
diff --git a/backend/src/services/user.rs b/backend/src/services/user.rs
index b8055cf..89a51c5 100644
--- a/backend/src/services/user.rs
+++ b/backend/src/services/user.rs
@@ -112,6 +112,7 @@ pub async fn sign_up_post(
                 email: form_data.email.clone(),
                 message_email: match error {
                     SignUpError::InvalidEmail => context.tr.t(Sentence::InvalidEmail),
+                    SignUpError::UserAlreadyExists => context.tr.t(Sentence::EmailAlreadyTaken),
                     _ => "",
                 },
                 message_password: match error {
@@ -120,8 +121,7 @@ pub async fn sign_up_post(
                     _ => "",
                 },
                 message: match error {
-                    SignUpError::UserAlreadyExists => context.tr.t(Sentence::EmailAlreadyTaken),
-                    // The error is not shown to the user (it is logged above).
+                    // The error details is not shown to the user (it is logged above).
                     SignUpError::DatabaseError(_) => context.tr.t(Sentence::DatabaseError),
                     SignUpError::UnableToSendEmail(_) => context.tr.t(Sentence::UnableToSendEmail),
                     _ => "",
diff --git a/backend/templates/profile.html b/backend/templates/profile.html
index 46011c0..fa074fb 100644
--- a/backend/templates/profile.html
+++ b/backend/templates/profile.html
@@ -28,11 +28,11 @@
 
         <label for="input-password-1">{{ context.tr.tp(Sentence::ProfileNewPassword, [Box::new(common::consts::MIN_PASSWORD_SIZE)]) }}</label>
         <input id="input-password-1" type="password" name="password_1" autocomplete="new-password">
-        <span></span>
+        <span class="user-message">{{ message_password }}</span>
 
         <label for="input-password-2">{{ context.tr.t(Sentence::ReEnterPassword) }}</label>
         <input id="input-password-2" type="password" name="password_2" autocomplete="new-password">
-        <span class="user-message">{{ message_password }}</span>
+        <span></span>
 
         <label for="input-servings">{{ context.tr.t(Sentence::ProfileDefaultServings) }}</label>
         <input
diff --git a/backend/templates/sign_in_form.html b/backend/templates/sign_in_form.html
index 6dc6244..f6cdaaf 100644
--- a/backend/templates/sign_in_form.html
+++ b/backend/templates/sign_in_form.html
@@ -10,9 +10,11 @@
         <label for="input-email">{{ context.tr.t(Sentence::EmailAddress) }}</label>
         <input id="input-email" type="email" name="email" value="{{ email }}"
             autocapitalize="none" autocomplete="email" autofocus="autofocus">
+        <span></span>
 
         <label for="input-password">{{ context.tr.t(Sentence::Password) }}</label>
         <input id="input-password" type="password" name="password" autocomplete="current-password">
+        <span></span>
 
         <input type="submit" value="{{ context.tr.t(Sentence::SignInMenu) }}">
     </form>
diff --git a/backend/templates/toast.html b/backend/templates/toast.html
index 9724e18..bb5b2f6 100644
--- a/backend/templates/toast.html
+++ b/backend/templates/toast.html
@@ -2,7 +2,7 @@
 <div id="toasts">
     <div class="toast">
         <img class="icon" width="24" height="24" alt="icon" src="">
-        <div class="content"></div>
+        <div class="content user-message"></div>
         <span class="close button">✖</span>
     </div>
 </div>
\ No newline at end of file