From b2b953ffa14d58c48bbb9449433f8bf780051508 Mon Sep 17 00:00:00 2001
From: mmrbnjd <mehdi.rabienzhad@gmail.com>
Date: Mon, 15 Apr 2024 23:09:11 +0330
Subject: [PATCH] ...

---
 Back/Back.csproj                           |   2 +-
 Back/Controllers/VerificationController.cs |  10 +-
 Shared/DTOs/VerificationCodeDto.cs         |   8 ++
 TaxPayerFull/Layout/TaxTools.razor         |   2 +
 TaxPayerFull/Pages/Verification.razor      | 145 ++++++++++++---------
 TaxPayerFull/Program.cs                    |   4 +-
 6 files changed, 105 insertions(+), 66 deletions(-)

diff --git a/Back/Back.csproj b/Back/Back.csproj
index 38e11a4..ac6c0cd 100644
--- a/Back/Back.csproj
+++ b/Back/Back.csproj
@@ -34,7 +34,7 @@
 
   <ItemGroup>
     <Reference Include="Service">
-      <HintPath>..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll</HintPath>
+      <HintPath>..\..\Dlls\Service.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/Back/Controllers/VerificationController.cs b/Back/Controllers/VerificationController.cs
index c05bc14..d19b02a 100644
--- a/Back/Controllers/VerificationController.cs
+++ b/Back/Controllers/VerificationController.cs
@@ -29,10 +29,18 @@ namespace Back.Controllers
                 return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList());
 
             return Ok(new VerificationCodeDto { 
+                ID = ID,
+                Code="",
             prm= _getVerificationValidation.verificationCode.prm,
             Type= _getVerificationValidation.verificationCode.Type,
             val= _getVerificationValidation.verificationCode.val
-            });
+            });;
+        }
+        [HttpPost("Submit")]
+        [AllowAnonymous]
+        public async Task<ActionResult<bool>> Submit(VerificationCodeDto item)
+        {
+            return Ok(false);
         }
     }
 }
diff --git a/Shared/DTOs/VerificationCodeDto.cs b/Shared/DTOs/VerificationCodeDto.cs
index b6376d2..c20fb18 100644
--- a/Shared/DTOs/VerificationCodeDto.cs
+++ b/Shared/DTOs/VerificationCodeDto.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -8,8 +9,15 @@ namespace Shared.DTOs
 {
     public class VerificationCodeDto
     {
+        [Required(ErrorMessage ="ID نمیتواند خالی باشد")]
+        public int ID { get; set; }
+        [Required(ErrorMessage = "کد نمیتواند خالی باشد")]
+        public string Code { get; set; }
+        [Required(ErrorMessage = "prm نمیتواند خالی باشد")]
         public string prm { get; set; }
+        [Required(ErrorMessage = "val نمیتواند خالی باشد")]
         public string val { get; set; }
+        [Required(ErrorMessage = "Type نمیتواند خالی باشد")]
         public string Type { get; set; }
     }
 }
diff --git a/TaxPayerFull/Layout/TaxTools.razor b/TaxPayerFull/Layout/TaxTools.razor
index 07bfc83..53d8869 100644
--- a/TaxPayerFull/Layout/TaxTools.razor
+++ b/TaxPayerFull/Layout/TaxTools.razor
@@ -118,6 +118,8 @@
 
         editContext = new EditContext(modelTaxTools);
         messageStore = new(editContext);
+
+        base.OnInitialized();
     }
 
     // private void HandleValidationRequested(object? sender,
diff --git a/TaxPayerFull/Pages/Verification.razor b/TaxPayerFull/Pages/Verification.razor
index ec6a725..e976143 100644
--- a/TaxPayerFull/Pages/Verification.razor
+++ b/TaxPayerFull/Pages/Verification.razor
@@ -8,34 +8,30 @@
     <!-- tp-banner-area-start -->
     <div class="signin-banner-area signin-banner-main-wrap d-flex align-items-center">
         <div class="signin-banner-left-box signin-banner-bg p-relative">
-           
+            <div class="signin-banner-bottom-shape">
+                <img src="img/login/login-shape-1.png" alt="">
+            </div>
             <div class="signin-banner-left-wrap">
-                <div class="pt-20 pb-20">
-                    <div class="signin-banner-title-box">
-                        <h4>
-                            برای ادامه نیاز است هویت شما تائید شود
-                        </h4>
-                        <h6 style="color:red;">
-                            کد ارسالی را وارد نمایید
-                        </h6>
+                <div class="signin-banner-title-box mb-100">
+                    <br />
+                    <h4 class="signin-banner-title" style="color:black">
+                        لطفا کد ارسالی را وارد نمایید
+                    </h4>
+                </div>
+                <div class="signin-banner-img-box position-relative">
+                    <div class="signin-banner-img signin-img-1 d-none d-md-block z-index-3">
+                        <img src="img/login/login-2.png" alt="">
+                    </div>
+                    <div class="signin-banner-img signin-img-2 d-none d-md-block">
+                        <img src="img/login/login-1.png" alt="">
+                    </div>
+                    <div class="signin-banner-img signin-img-3 d-none d-md-block z-index-5">
+                        <img src="img/login/login-3.png" alt="">
+                    </div>
+                    <div class="signin-banner-img signin-img-4 d-none d-sm-block">
+                        <img src="img/login/login-4.png" alt="">
                     </div>
                 </div>
-                    <div class="signin-banner-img-box position-relative">
-                        <div class="signin-banner-img signin-img-1 d-none d-md-block z-index-3">
-                            <img src="img/login/login-2.png" alt="">
-                        </div>
-                        <div class="signin-banner-img signin-img-2 d-none d-md-block">
-                            <img src="img/login/login-1.png" alt="">
-                        </div>
-                        <div class="signin-banner-img signin-img-3 d-none d-md-block z-index-5">
-                            <img src="img/login/login-3.png" alt="">
-                        </div>
-                        <div class="signin-banner-img signin-img-4 d-none d-sm-block">
-                            <img src="img/login/login-4.png" alt="">
-                        </div>
-                    </div>
-          
-               
             </div>
         </div>
         <div class="signin-banner-from d-flex justify-content-center align-items-center">
@@ -45,22 +41,40 @@
                 </div>
 
                 <div class="signin-banner-from-box">
-                   
-					<EditForm Model="Code" OnSubmit="Submit">
+
+                    <EditForm EditContext="editContext" OnValidSubmit="SubmitVerificationCode">
+                     
+
+                        <DataAnnotationsValidator />
+                      
+
+                           <InputNumber @bind-Value="VerificationCodeModel.ID" id="ID"  />
+                        <InputText @bind-Value="VerificationCodeModel.prm" id="prm" type="text" class="inputText" required="" />
+                        <InputText @bind-Value="VerificationCodeModel.val" id="val" type="text" class="inputText" required="" />
+                        <InputText @bind-Value="VerificationCodeModel.Type" id="Type" type="text" class="inputText" required="" />
+
+
                         <div class="row">
                             <div class="col-12">
                                 <div class="postbox__comment-input mb-30">
-                                    <InputNumber @bind-Value="Code" id="Code" type="text" class="form-control text-center" required="" />
+                                    <InputText @bind-Value="VerificationCodeModel.Code" id="Code" type="text" class="inputText" required="" />
                                     <span class="floating-label">کد تائید</span>
                                 </div>
                             </div>
                             <div class="signin-banner-from-btn mb-20">
-                                <button type="submit" class="signin-btn ">احراز</button>
+                                <button type="submit" class="signin-btn">احراز</button>
                             </div>
                         </div>
+                        <div class="postbox__comment-input mb-35">
+                            <ValidationMessage For="()=>VerificationCodeModel.ID" />
+                            <ValidationMessage For="()=>VerificationCodeModel.Code" />
+                            <ValidationMessage For="()=>VerificationCodeModel.prm" />
+                            <ValidationMessage For="()=>VerificationCodeModel.val" />
+                            <ValidationMessage For="()=>VerificationCodeModel.Type" />
+
+                        </div>
                     </EditForm>
-                 
-               
+
                     <div class="signin-banner-from-register">
                         <NavLink href="Register">کد ارسال نشد؟ <span>ارسال مجدد</span></NavLink>
                     </div>
@@ -73,21 +87,29 @@
 </main>
 
 @code {
+    private EditContext? editContext;
+    private ValidationMessageStore? messageStore;
+
     [Parameter]
     public int ID { get; set; }
 
-	[SupplyParameterFromForm]
-	public int Code { get; set; }
-
-	public VerificationCodeDto Model { get; set; }
+   // [SupplyParameterFromForm]
+    public VerificationCodeDto? VerificationCodeModel { get; set; } = new VerificationCodeDto();
+    protected override void OnInitialized()
+    {
+        editContext = new EditContext(VerificationCodeModel);
+        messageStore = new(editContext);
+        base.OnInitialized();
+    }
+   
     protected override async Task OnParametersSetAsync()
     {
         var request = await _hc.GetAsync($"Verification/GetVerification/{ID}");
         if (request.IsSuccessStatusCode)
         {
-   
-            Model = await request.Content.ReadFromJsonAsync<VerificationCodeDto>();
-          //  nav.NavigateTo($"Verification/{res}");
+
+            VerificationCodeModel = await request.Content.ReadFromJsonAsync<VerificationCodeDto>();
+            //  nav.NavigateTo($"Verification/{res}");
         }
         else
         {
@@ -97,29 +119,28 @@
         await base.OnParametersSetAsync();
     }
 }
-@functions{
+    @functions {
 
-	private void Submit()
-	{
-		
-	}
+    private async Task SubmitVerificationCode()
+    {
+        var request = await _hc.PostAsJsonAsync($"Verification/Submit", VerificationCodeModel);
+        if (request.IsSuccessStatusCode)
+        {
+
+            var status = await request.Content.ReadFromJsonAsync<bool>();
+            if (status)
+            {
+
+            }
+            else
+            {
+
+            }
+            //  nav.NavigateTo($"Verification/{res}");
+        }
+        else
+        {
+            nav.NavigateTo($"/");
+        }
+    }
 }
-<script src="~/js/vendor/jquery-3.2.1.min.js"></script>
-<script src="~/js/vendor/animsition.min.js"></script>
-<script src="~/js/vendor/popper.js"></script>
-<script src="~/js/vendor/bootstrap.min.js"></script>
-<script src="~/js/vendor/select2.min.js"></script>
-<script src="~/js/vendor/moment.min.js"></script>
-<script src="~/js/vendor/daterangepicker.js"></script>
-<script src="~/js/vendor/countdowntime.js"></script>
-<script src="~/js/vendor/main.js"></script>
-
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-23581568-13"></script>
-<script>
-	window.dataLayer = window.dataLayer || [];
-	function gtag() { dataLayer.push(arguments); }
-	gtag('js', new Date());
-
-	gtag('config', 'UA-23581568-13');
-</script>
-<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v84a3a4012de94ce1a686ba8c167c359c1696973893317" integrity="sha512-euoFGowhlaLqXsPWQ48qSkBSCFs3DPRyiwVu3FjR96cMPx+Fr+gpWRhIafcHwqwCqWS42RZhIudOvEI+Ckf6MA==" data-cf-beacon='{"rayId":"846c94483adc6ae1","version":"2023.10.0","token":"cd0b4b3a733644fc843ef0b185f98241"}' crossorigin="anonymous"></script>
diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs
index 27ef188..44acca9 100644
--- a/TaxPayerFull/Program.cs
+++ b/TaxPayerFull/Program.cs
@@ -7,9 +7,9 @@ var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
 
-//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") });
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") });
 
-builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
+//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
 
 CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir");