From 541b3be4197a55c421dbc279f4092ca32faa91ab Mon Sep 17 00:00:00 2001
From: Bagas Aulia Rezki <bagas@fossy.my.id>
Date: Wed, 21 Aug 2024 13:23:44 +0700
Subject: [PATCH] fix: resolve issue where submit button was not clickable on
 forgot password page

---
 .../forgotPassword/forgotPassword.templ       | 49 +++++++++++--------
 view/client/user/user.templ                   |  9 ++++
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/view/client/forgotPassword/forgotPassword.templ b/view/client/forgotPassword/forgotPassword.templ
index f5ec80c..feed80f 100644
--- a/view/client/forgotPassword/forgotPassword.templ
+++ b/view/client/forgotPassword/forgotPassword.templ
@@ -65,26 +65,35 @@ templ NewPasswordForm(title string, err types.Message) {
                   <input type="password" class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-800 dark:text-white" id="confirmPassword" required />
               </div>
               <div class="flex justify-start mt-3 ml-4 p-1">
-                  <ul>
-                      <li class="flex items-center py-1">
-                          <div id="matchSvgContainer" class="rounded-full p-1 fill-current bg-red-200 text-green-700">
-                              <svg id="matchSvgIcon" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                  <path id="matchGoodPath" style="display: none;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
-                                  <path id="matchBadPath" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
-                              </svg>
-                          </div>
-                          <span id="matchStatusText" class="font-medium text-sm ml-3 text-red-700"> Passwords do not match</span>
-                      </li>
-                      <li class="flex items-center py-1">
-                          <div id="lengthSvgContainer" class="rounded-full p-1 fill-current bg-red-200 text-green-700">
-                              <svg id="lengthSvgIcon" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                  <path id="lengthGoodPath" style="display: none;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
-                                  <path id="lengthBadPath" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
-                              </svg>
-                          </div>
-                          <span id="lengthStatusText" class="font-medium text-sm ml-3 text-red-700"> Password length must be at least 8 characters</span>
-                      </li>
-                  </ul>
+                <ul>
+                  <li class="flex items-center py-1">
+                      <div id="matchSvgContainer" class="rounded-full p-1 fill-current bg-red-200 text-green-700">
+                          <svg id="matchSvgIcon" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                              <path id="matchGoodPath" style="display: none;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
+                              <path id="matchBadPath" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                          </svg>
+                      </div>
+                      <span id="matchStatusText" class="font-medium text-sm ml-3 text-red-700"> Passwords do not match</span>
+                  </li>
+                  <li class="flex items-center py-1">
+                      <div id="uppercaseSvgContainer" class="rounded-full p-1 fill-current bg-red-200 text-green-700">
+                          <svg id="uppercaseSvgIcon" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                              <path id="uppercaseGoodPath" style="display: none;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
+                              <path id="uppercaseBadPath" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                          </svg>
+                      </div>
+                      <span id="uppercaseStatusText" class="font-medium text-sm ml-3 text-red-700"> Password must contain at least one uppercase letter</span>
+                  </li>
+                  <li class="flex items-center py-1">
+                      <div id="lengthSvgContainer" class="rounded-full p-1 fill-current bg-red-200 text-green-700">
+                          <svg id="lengthSvgIcon" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                              <path id="lengthGoodPath" style="display: none;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
+                              <path id="lengthBadPath" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                          </svg>
+                      </div>
+                      <span id="lengthStatusText" class="font-medium text-sm ml-3 text-red-700"> Password length must be at least 8 characters</span>
+                  </li>
+                </ul>
               </div>
               <button class="bg-slate-200 inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 bg-primary text-primary-foreground hover:bg-primary/90 h-10 px-4 py-2 w-full" type="submit" id="submit" name="submit" disabled>
                   Submit
diff --git a/view/client/user/user.templ b/view/client/user/user.templ
index 12daab6..f9e1417 100644
--- a/view/client/user/user.templ
+++ b/view/client/user/user.templ
@@ -190,6 +190,15 @@ templ content(message types.Message, title string, user types.User, ListSession
                                             </div>
                                             <span id="matchStatusText" class="font-medium text-sm ml-3 text-red-700"> New Passwords do not match</span>
                                         </li>
+                                        <li class="flex items-center py-1">
+                                            <div id="uppercaseSvgContainer" class="rounded-full p-1 fill-current bg-red-200 text-green-700">
+                                                <svg id="uppercaseSvgIcon" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                    <path id="uppercaseGoodPath" style="display: none;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
+                                                    <path id="uppercaseBadPath" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                                                </svg>
+                                            </div>
+                                            <span id="uppercaseStatusText" class="font-medium text-sm ml-3 text-red-700"> New Password must contain at least one uppercase letter</span>
+                                        </li>
                                         <li class="flex items-center py-1">
                                             <div id="lengthSvgContainer" class="rounded-full p-1 fill-current bg-red-200 text-green-700">
                                                 <svg id="lengthSvgIcon" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">