Issue script preload 2

src/Web/Grand.Web/Validators/Customer/LoginValidator.cs

@@ -16,10 +16,15 @@ public LoginValidator(
         {
             if (!customerSettings.UsernamesEnabled)
             {
-                //login by email
                 RuleFor(x => x.Email).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.Email.Required"));
+                RuleFor(x => x.Password).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));
                 RuleFor(x => x.Email).EmailAddress().WithMessage(translationService.GetResource("Common.WrongEmail"));
             }
+            else
+            {
+                RuleFor(x => x.Username).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.UserName.Required"));
+                RuleFor(x => x.Password).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));
+            }
         }
     }
 }

src/Web/Grand.Web/Views/Account/AddressAdd.cshtml

@@ -12,19 +12,21 @@
     @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Addresses })
 }
 <vc:widget widget-zone="customer-address-add-before" additional-data="@Model"></vc:widget>
-<form asp-route="CustomerAddressAdd" method="post" v-on:submit.prevent="validateBeforeSubmit($event)">
-    <div class="page account-page address-edit-page pl-lg-3 mb-3 pt-lg-0 pt-3">
-        <h1 class="generalTitle h2">@Loc["Account.CustomerAddresses.AddNew"]</h1>
-        <div asp-validation-summary="All" class="message-error"></div>
-        @{
-            var dataDictAddress = new ViewDataDictionary(ViewData);
-            dataDictAddress.TemplateInfo.HtmlFieldPrefix = "Address";
-            <partial name="_CreateOrUpdateAddress" model="Model.Address" view-data="dataDictAddress" />
-        }
-        <vc:widget widget-zone="customer-address-add-form" additional-data="@Model"></vc:widget>
-        <div class="buttons generalMarginSupporter mt-1 mb-1">
-            <input type="submit" class="btn btn-info save-address-button" value="@Loc["Common.Save"]" />
+<validation-observer v-slot="{ handleSubmit }">
+    <form asp-route="CustomerAddressAdd" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
+        <div class="page account-page address-edit-page pl-lg-3 mb-3 pt-lg-0 pt-3">
+            <h1 class="generalTitle h2">@Loc["Account.CustomerAddresses.AddNew"]</h1>
+            <div asp-validation-summary="All" class="message-error"></div>
+            @{
+                var dataDictAddress = new ViewDataDictionary(ViewData);
+                dataDictAddress.TemplateInfo.HtmlFieldPrefix = "Address";
+                <partial name="_CreateOrUpdateAddress" model="Model.Address" view-data="dataDictAddress" />
+            }
+            <vc:widget widget-zone="customer-address-add-form" additional-data="@Model"></vc:widget>
+            <div class="buttons generalMarginSupporter mt-1 mb-1">
+                <input type="submit" class="btn btn-info save-address-button" value="@Loc["Common.Save"]" />
+            </div>
         </div>
-    </div>
-</form>
+    </form>
+</validation-observer>
 <vc:widget widget-zone="customer-address-add-after" additional-data="@Model"></vc:widget>

src/Web/Grand.Web/Views/Account/AddressEdit.cshtml

@@ -12,19 +12,21 @@
     @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Addresses })
 }
 <vc:widget widget-zone="customer-address-edit-before" additional-data="@Model"></vc:widget>
-<form asp-route="CustomerAddressEdit" method="post" v-on:submit.prevent="validateBeforeSubmit($event)">
-    <div class="page account-page address-edit-page pl-lg-3 mb-3 pt-lg-0 pt-3">
-        <h1 class="h2 generalTitle">@Loc["Account.CustomerAddresses.Edit"]</h1>
-        <div asp-validation-summary="All" class="message-error"></div>
-        @{
-            var dataDictAddress = new ViewDataDictionary(ViewData);
-            dataDictAddress.TemplateInfo.HtmlFieldPrefix = "Address";
-            <partial name="_CreateOrUpdateAddress" model="Model.Address" view-data="dataDictAddress" />
-        }
-        <vc:widget widget-zone="customer-address-edit-form" additional-data="@Model"></vc:widget>
-        <div class="buttons generalMarginSupporter">
-            <input type="submit" class="btn btn-info save-address-button" value="@Loc["Common.Save"]" />
+<validation-observer v-slot="{ handleSubmit }">
+    <form asp-route="CustomerAddressEdit" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
+        <div class="page account-page address-edit-page pl-lg-3 mb-3 pt-lg-0 pt-3">
+            <h1 class="h2 generalTitle">@Loc["Account.CustomerAddresses.Edit"]</h1>
+            <div asp-validation-summary="All" class="message-error"></div>
+            @{
+                var dataDictAddress = new ViewDataDictionary(ViewData);
+                dataDictAddress.TemplateInfo.HtmlFieldPrefix = "Address";
+                <partial name="_CreateOrUpdateAddress" model="Model.Address" view-data="dataDictAddress" />
+            }
+            <vc:widget widget-zone="customer-address-edit-form" additional-data="@Model"></vc:widget>
+            <div class="buttons generalMarginSupporter">
+                <input type="submit" class="btn btn-info save-address-button" value="@Loc["Common.Save"]" />
+            </div>
         </div>
-    </div>
-</form>
+    </form>
+</validation-observer>
 <vc:widget widget-zone="customer-address-edit-after" additional-data="@Model"></vc:widget>

src/Web/Grand.Web/Views/Account/ChangePassword.cshtml

@@ -11,41 +11,58 @@
 {
     @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.ChangePassword })
 }
-<form asp-route="CustomerChangePassword" method="post" v-on:submit.prevent="validateBeforeSubmit($event)">
-    <section class="page account-page change-password-page pl-lg-3 pt-3 pt-lg-0">
-        <h1 class="h2 generalTitle">@Loc["Account.ChangePassword"]</h1>
-        @if (!String.IsNullOrEmpty(Model.Result))
-        {
-            <section class="result alert alert-info">
-                @Model.Result
-            </section>
-        }
-        <div asp-validation-summary="ModelOnly" class="message-error"></div>
+<validation-observer v-slot="{ handleSubmit }">
+    <form asp-route="CustomerChangePassword" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
+        <section class="page account-page change-password-page pl-lg-3 pt-3 pt-lg-0">
+            <h1 class="h2 generalTitle">@Loc["Account.ChangePassword"]</h1>
+            @if (!String.IsNullOrEmpty(Model.Result))
+            {
+                <section class="result alert alert-info">
+                    @Model.Result
+                </section>
+            }
+            <div asp-validation-summary="ModelOnly" class="message-error"></div>
 
-        <fieldset>
-            <div class="form-fields">
-                <fieldset class="form-group">
-                    <label asp-for="OldPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.OldPassword"]:</label>
-                    <input asp-for="OldPassword" class="form-control" v-validate="'required'" />
-                    <span class="field-validation-error">{{veeErrors.first('OldPassword')}}</span>
-                    <span asp-validation-for="OldPassword"></span>
-                </fieldset>
-                <fieldset class="form-group">
-                    <label asp-for="NewPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.NewPassword"]:</label>
-                    <input asp-for="NewPassword" class="form-control" v-validate="'required|min:NewPassword'" ref="newpassword" />
-                    <span class="field-validation-error">{{veeErrors.first('NewPassword')}}</span>
-                    <span asp-validation-for="NewPassword"></span>
-                </fieldset>
-                <fieldset class="form-group">
-                    <label asp-for="ConfirmNewPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.ConfirmNewPassword"]:</label>
-                    <input asp-for="ConfirmNewPassword" class="form-control" v-validate="'required|confirmed:newpassword'" />
-                    <span class="field-validation-error">{{veeErrors.first('ConfirmNewPassword')}}</span>
-                    <span asp-validation-for="ConfirmNewPassword"></span>
-                </fieldset>
+            <fieldset>
+                <div class="form-fields">
+                    <fieldset class="form-group">
+                        <validation-provider tag="div" rules="required" name="OldPassword" v-slot="{ errors }">
+                            <label asp-for="OldPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.OldPassword"]:</label>
+                            <input asp-for="OldPassword" v-model="changepassword.OldPassword" class="form-control username" autofocus="autofocus" />
+                            <span class="field-validation-error">{{ errors[0] }}</span>
+                            <span asp-validation-for="OldPassword"></span>
+                        </validation-provider>
+                    </fieldset>
+                    <fieldset class="form-group">
+                        <validation-provider tag="div" vid="changepassword.NewPassword" rules="required" v-slot="{ errors }">
+                            <label asp-for="NewPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.NewPassword"]:</label>
+                            <input asp-for="NewPassword" v-model="changepassword.NewPassword" class="form-control username" autofocus="autofocus" />
+                            <span class="field-validation-error">{{ errors[0] }}</span>
+                            <span asp-validation-for="NewPassword"></span>
+                        </validation-provider>
+                    </fieldset>
+                    <fieldset class="form-group">
+                        <validation-provider tag="div" vid="changepassword.ConfirmNewPassword" rules="required|confirmed:@@changepassword.NewPassword" v-slot="{ errors }">
+                            <label asp-for="ConfirmNewPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.ConfirmNewPassword"]:</label>
+                            <input asp-for="ConfirmNewPassword" v-model="changepassword.ConfirmNewPassword" class="form-control username" autofocus="autofocus" />
+                            <span class="field-validation-error">{{ errors[0] }}</span>
+                            <span asp-validation-for="ConfirmNewPassword"></span>
+                        </validation-provider>
+                    </fieldset>
+                </div>
+            </fieldset>
+            <div class="text-xs-center">
+                <input type="submit" class="btn btn-info change-password-button" value="@Loc["Account.ChangePassword.Button"]" />
             </div>
-        </fieldset>
-        <div class="text-xs-center">
-            <input type="submit" class="btn btn-info change-password-button" value="@Loc["Account.ChangePassword.Button"]" />
-        </div>
-    </section>
-</form>
+        </section>
+    </form>
+</validation-observer>
+<script asp-location="Footer" asp-order="300">
+    var changepassword = new Vue({
+        data: () => ({
+            OldPassword: '',
+            NewPassword: '',
+            ConfirmNewPassword: '',
+        })
+    });
+</script>

src/Web/Grand.Web/Views/Account/DeleteAccount.cshtml

@@ -11,25 +11,36 @@
 {
     @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.DeleteAccount })
 }
-<form asp-route="CustomerDeleteAccount" method="post" autocomplete="off" v-on:submit.prevent="validateBeforeSubmit($event)">
-    <section class="page account-page change-password-page pl-lg-3 pt-3 pt-lg-0">
-        <h1 class="h2 generalTitle">@Loc["Account.DeleteAccount"]</h1>
-        <div asp-validation-summary="ModelOnly" class="message-error"></div>
-        <div class="alert alert-danger" role="alert">
-            @Loc["Account.DeleteAccount.DangerAlert"]
-        </div>
-        <fieldset>
-            <div class="form-fields">
-                <fieldset class="form-group">
-                    <label asp-for="Password" class="col-form-label">@Loc["Account.DeleteAccount.Fields.Password"]:</label>
-                    <input asp-for="Password" class="form-control" v-validate="'required'" />
-                    <span class="field-validation-error">{{veeErrors.first('Password')}}</span>
-                    <span asp-validation-for="Password"></span>
-                </fieldset>
+<validation-observer v-slot="{ handleSubmit }">
+    <form asp-route="CustomerDeleteAccount" method="post" autocomplete="off" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
+        <section class="page account-page change-password-page pl-lg-3 pt-3 pt-lg-0">
+            <h1 class="h2 generalTitle">@Loc["Account.DeleteAccount"]</h1>
+            <div asp-validation-summary="ModelOnly" class="message-error"></div>
+            <div class="alert alert-danger" role="alert">
+                @Loc["Account.DeleteAccount.DangerAlert"]
             </div>
-        </fieldset>
-        <div class="text-xs-center">
-            <input type="submit" class="btn btn-danger change-password-button" value="@Loc["Account.DeleteAccount.Button"]" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); " />
-        </div>
-    </section>
-</form>
+            <fieldset>
+                <div class="form-fields">
+                    <fieldset class="form-group">
+                        <validation-provider tag="div" rules="required" name="Password" v-slot="{ errors }">
+                            <label asp-for="Password" class="col-form-label">@Loc["Account.DeleteAccount.Fields.Password"]:</label>
+                            <input asp-for="Password" v-model="deleteaccount.Password" class="form-control username" autofocus="autofocus" />
+                            <span class="field-validation-error">{{ errors[0] }}</span>
+                            <span asp-validation-for="Password"></span>
+                        </validation-provider>
+                    </fieldset>
+                </div>
+            </fieldset>
+            <div class="text-xs-center">
+                <input type="submit" class="btn btn-danger change-password-button" value="@Loc["Account.DeleteAccount.Button"]" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); " />
+            </div>
+        </section>
+    </form>
+</validation-observer>
+<script asp-location="Footer" asp-order="300">
+    var deleteaccount = new Vue({
+        data: () => ({
+            Password: '',
+        })
+    });
+</script>