Merge pull request #219 from Badgerati/Issue-209

Fix for login submit missing spinner
Badgerati · Nov 21, 2021 · 945b3cf · 945b3cf
2 parents 6c65927 + 488f3f7
commit 945b3cf
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/src/Templates/Public/scripts/default.js b/src/Templates/Public/scripts/default.js
@@ -1158,7 +1158,7 @@ function loadTable(tableId, opts) {
         }
 
         data += form.serialize();
-        url = form.attr('method');
+        url = form.attr('action');
     }
 
     // invoke and load table content
@@ -1286,7 +1286,7 @@ function loadChart(chartId) {
         }
 
         data += form.serialize();
-        url = form.attr('method');
+        url = form.attr('action');
     }
 
     sendAjaxReq(url, data, chart, true);
@@ -1461,6 +1461,7 @@ function buildElements(elements) {
 }
 
 function bindFormSubmits() {
+    // general forms
     $("form.pode-form").off('submit').on('submit', function(e) {
         e.preventDefault();
         e.stopPropagation();
@@ -1470,7 +1471,20 @@ function bindFormSubmits() {
 
         // submit the form
         var inputs = serializeInputs(form);
-        sendAjaxReq(form.attr('method'), inputs.data, form, true, null, inputs.opts);
+        sendAjaxReq(form.attr('action'), inputs.data, form, true, null, inputs.opts);
+    });
+
+    // login form
+    $("form.form-signin").off('submit').on('submit', function(e) {
+        // get the form
+        var form = $(e.target);
+
+        // show the spinner
+        showSpinner(form);
+        $('.alert').remove();
+
+        // remove validation errors
+        removeValidationErrors(form);
     });
 }
 

diff --git a/src/Templates/Views/elements/form.pode b/src/Templates/Views/elements/form.pode
@@ -2,7 +2,7 @@ $(if (![string]::IsNullOrWhiteSpace($data.Message)) {
     "<p class='card-text'>$($data.Message)</p>"
 })
 
-<form id="$($data.ID)" name="$($data.Name)" class="pode-form $($data.CssClasses)" style="$($data.CssStyles)" action="POST" method="/components/form/$($data.ID)" pode-object="$($data.ObjectType)">
+<form id="$($data.ID)" name="$($data.Name)" class="pode-form $($data.CssClasses)" style="$($data.CssStyles)" method="POST" action="/components/form/$($data.ID)" pode-object="$($data.ObjectType)">
     $(Use-PodeWebPartialView -Path 'shared/_load' -Data @{ Content = $data.Content })
     <button class="btn btn-inbuilt-theme" type="submit">
         <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true" style="display: none"></span>

diff --git a/src/Templates/Views/login.pode b/src/Templates/Views/login.pode
@@ -26,14 +26,21 @@
 
                 if ($data.Flash['auth-error']) {
                     "<div class='alert alert-danger' role='alert'>
-                        $($data.Flash['auth-error'])
+                        <span class='mdi mdi-alert-circle'></span>
+                        <strong>$($data.Flash['auth-error'])</strong>
                     </div>"
                 }
 
-                "<button class='btn btn-lg btn-inbuilt-theme btn-block' type='submit'>Sign in</button>"
+                "<button class='btn btn-lg btn-inbuilt-theme btn-block' type='submit'>
+                    <span class='spinner-border spinner-border-sm' role='status' aria-hidden='true' style='display: none'></span>
+                    Sign in
+                </button>"
             }
             else {
-                "<button class='btn btn-lg btn-inbuilt-theme btn-block' type='submit'>Sign in using OAuth2 ($($data.Auth.Name))</button>"
+                "<button class='btn btn-lg btn-inbuilt-theme btn-block' type='submit'>
+                    <span class='spinner-border spinner-border-sm' role='status' aria-hidden='true' style='display: none'></span>
+                    Sign in using OAuth2 ($($data.Auth.Name))
+                </button>"
             })
 
             $(if (![string]::IsNullOrWhiteSpace($data.Copyright)) {