diff --git a/Back/Program.cs b/Back/Program.cs index 39c33e8..7a3cfd0 100644 --- a/Back/Program.cs +++ b/Back/Program.cs @@ -93,7 +93,8 @@ builder.Services.AddCors(options => { policy.WithOrigins("https://localhost:7224", "http://localhost:5107" , "http://195.88.208.142", "http://moadiran.ir" - , "https://195.88.208.142", "https://moadiran.ir") + , "https://195.88.208.142", "https://moadiran.ir" + , "https://195.88.208.142:440", "https://moadiran.ir:440") .AllowAnyHeader() .WithHeaders(HeaderNames.ContentType) .AllowAnyMethod(); diff --git a/TaxPayerFull/Layout/Lheaderbottom.razor b/TaxPayerFull/Layout/Lheaderbottom.razor index 8a3b132..daaa647 100644 --- a/TaxPayerFull/Layout/Lheaderbottom.razor +++ b/TaxPayerFull/Layout/Lheaderbottom.razor @@ -4,8 +4,10 @@
diff --git a/TaxPayerFull/Layout/MainLayout.razor b/TaxPayerFull/Layout/MainLayout.razor index 7e2fc29..17eff42 100644 --- a/TaxPayerFull/Layout/MainLayout.razor +++ b/TaxPayerFull/Layout/MainLayout.razor @@ -34,10 +34,6 @@ @code{ public string description { get; set; } = "سامانه ای برای مدیریت صورتحساب های فروش با الگوی سازمان امورمالیاتی کشور و ارسال صورت حساب به سامانه مودیان"; - protected override async Task OnInitializedAsync() - { - await fv.SetUlr("Main"); - await base.OnInitializedAsync(); - } + } diff --git a/TaxPayerFull/Layout/PanelLayout.razor b/TaxPayerFull/Layout/PanelLayout.razor index 537b6d8..eab2ef2 100644 --- a/TaxPayerFull/Layout/PanelLayout.razor +++ b/TaxPayerFull/Layout/PanelLayout.razor @@ -198,18 +198,25 @@ @code { public int countnot = 0; private Modal modal = default!; - // public DashBoardDTO? dashBoard { get; set; } + // public DashBoardDTO? dashBoard { get; set; } + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if(firstRender) + await fv.SetUlr("Panel"); + await base.OnAfterRenderAsync(firstRender); + } protected override async Task OnInitializedAsync() { - await fv.SetUlr("Panel"); - if (!await localserv.OnlineUser()) - nav.NavigateTo("/"); + if (await localserv.OnlineUser()) + { + await fv.LoadDashBoard(); + if (fv.dashBoard != null) + countnot = fv.dashBoard.Notifications.Count(); + await base.OnInitializedAsync(); + } - await fv.LoadDashBoard(); - if (fv.dashBoard != null) - countnot = fv.dashBoard.Notifications.Count(); - await base.OnInitializedAsync(); + } } @functions { @@ -238,6 +245,6 @@ _hc.DefaultRequestHeaders.Clear(); await Storage.RemoveItem("token"); userinfo.Token = ""; - nav.NavigateTo("/"); + nav.NavigateTo("/Sign-in"); } } \ No newline at end of file diff --git a/TaxPayerFull/Pages/Home.razor b/TaxPayerFull/Pages/Home.razor index 2fca1b4..c0c86cd 100644 --- a/TaxPayerFull/Pages/Home.razor +++ b/TaxPayerFull/Pages/Home.razor @@ -1,6 +1,6 @@ @inject Services.localService servlocal; -@page "/" - +@inject NavigationManager nav +@page "/Home" مُؤدیٰران (مدیریت صورتحساب ها) @using Front.CUSComponent @@ -439,13 +439,3 @@ -@code { - private Modal modal = default!; - public async Task load(int ID) - { - // var parameters = new Dictionary(); - // await modal.ShowAsync(title: "صحبت مدیر", parameters: parameters); - - - } - } \ No newline at end of file diff --git a/TaxPayerFull/Pages/Register.razor b/TaxPayerFull/Pages/Register.razor index b9a5b86..57722ae 100644 --- a/TaxPayerFull/Pages/Register.razor +++ b/TaxPayerFull/Pages/Register.razor @@ -4,7 +4,7 @@ @inject HttpClient _hc @inject NavigationManager nav @inject localService localserv; -ثبت نام +مودیران / ثبت نام
diff --git a/TaxPayerFull/Pages/Sign-in.razor b/TaxPayerFull/Pages/Sign-in.razor index 72dd784..ab2a1cd 100644 --- a/TaxPayerFull/Pages/Sign-in.razor +++ b/TaxPayerFull/Pages/Sign-in.razor @@ -7,7 +7,7 @@ @inject localService localserv; @inject HttpClient _hc @inject NavigationManager nav -ورود +مودیران / ورود
diff --git a/TaxPayerFull/Pages/UserPanel/Panel.razor b/TaxPayerFull/Pages/UserPanel/Panel.razor index 46ec90e..f7dd3bd 100644 --- a/TaxPayerFull/Pages/UserPanel/Panel.razor +++ b/TaxPayerFull/Pages/UserPanel/Panel.razor @@ -1,4 +1,5 @@ @page "/Panel" +@page "/" @using Front.Services @using Shared @using Shared.DTOs @@ -8,7 +9,7 @@ @inject HttpClientController hc; @inject Fixedvalues fv; -کاربری +مودیران / کاربری
@@ -406,19 +407,21 @@ protected override async Task OnInitializedAsync() { - if (!await localserv.OnlineUser()) - nav.NavigateTo("/"); - await fv.LoadDashBoard(); - if (fv.dashBoard != null) - foreach (var war in fv.dashBoard.Warning) - ShowMessage((ToastType)Enum.Parse(typeof(ToastType), war.Status.ToString()), war.Message); + if (await localserv.OnlineUser()) + { + await fv.LoadDashBoard(); + if (fv.dashBoard != null) + foreach (var war in fv.dashBoard.Warning) + ShowMessage((ToastType)Enum.Parse(typeof(ToastType), war.Status.ToString()), war.Message); - delaymessage = messages.Count * 5000; - //var rsp = await hc.Get("User/GetDashBoard"); - // if (rsp.IsSuccessStatusCode) - // { - // dashBoard = await rsp.Content.ReadFromJsonAsync(); - // } + delaymessage = messages.Count * 5000; + + + } + else + { + nav.NavigateTo("/Sign-in"); + } await base.OnInitializedAsync(); } } diff --git a/TaxPayerFull/Pages/Verification.razor b/TaxPayerFull/Pages/Verification.razor index 30205ee..494f132 100644 --- a/TaxPayerFull/Pages/Verification.razor +++ b/TaxPayerFull/Pages/Verification.razor @@ -3,7 +3,7 @@ @inject HttpClient _hc @inject NavigationManager nav @inject UserAuthenticationDTO userinfo -احراز هویت +مودیران / احراز هویت
diff --git a/TaxPayerFull/wwwroot/index.html b/TaxPayerFull/wwwroot/index.html index d163573..eb24ecf 100644 --- a/TaxPayerFull/wwwroot/index.html +++ b/TaxPayerFull/wwwroot/index.html @@ -26,10 +26,9 @@
-
- An unhandled error has occurred. - Reload + خطایی در بارگذاری رخ داده + بارگذاری مجدد 🗙
diff --git a/moadiran/App.razor b/moadiran/App.razor index 6fd3ed1..7d278e7 100644 --- a/moadiran/App.razor +++ b/moadiran/App.razor @@ -6,7 +6,30 @@ Not found -

Sorry, there's nothing at this address.

+
+
+
+ +
+
+
+
+
+ +
+
+

صفحه پیدا نشد

+

صفحه ای که به دنبال آن هستید، یافت نشد

+ + برگشت به صفحه اصلی + + +
+
+
+
+
+
diff --git a/moadiran/Layout/Lheaderbottom.razor b/moadiran/Layout/Lheaderbottom.razor index 31cd4b9..e5c2a30 100644 --- a/moadiran/Layout/Lheaderbottom.razor +++ b/moadiran/Layout/Lheaderbottom.razor @@ -4,8 +4,9 @@
diff --git a/moadiran/Pages/Home.razor b/moadiran/Pages/Home.razor index 6f4ace0..bda8889 100644 --- a/moadiran/Pages/Home.razor +++ b/moadiran/Pages/Home.razor @@ -1,4 +1,4 @@ - +@inject Fixedvalues fv; @page "/" @using moadiran.Layout مُؤدیٰران (مدیریت صورتحساب ها) @@ -46,8 +46,8 @@

مدیریت صورتحساب ها و ارسال به سامانه مودیان

- - + + شروع کنید @@ -211,8 +211,8 @@
- - + + شروع کنید @@ -369,8 +369,8 @@

راه حلی برای مدیریت بهتر صورتحساب ها

- - + + شروع کنید @@ -386,30 +386,15 @@
- - -
- - - - - +
+
- - - - - - - - -
diff --git a/moadiran/Pages/Verification.razor b/moadiran/Pages/Verification.razor new file mode 100644 index 0000000..3d5b5b2 --- /dev/null +++ b/moadiran/Pages/Verification.razor @@ -0,0 +1,211 @@ +@using global::Shared.DTOs +@page "/Verification/{ID:int}" +@inject HttpClient _hc +@inject NavigationManager nav +مودیران / احراز هویت + +
+ + + + + +
+ +@code { + List messages = new List(); + public string hidden { get; set; } + public bool SpinnerVisible { get; set; } = false; + public string valueCode { get; set; } + bool successfull = false; + // alert + AlertColor alertColor = AlertColor.Primary; + IconName alertIconName = IconName.CheckCircleFill; + bool Hidealert = true; + string alertMessage = ""; + private void ShowMessage(ToastType toastType, string Message) => messages.Add(CreateToastMessage(toastType, Message)); + + + [Parameter] + public int ID { get; set; } + + [SupplyParameterFromForm] + public VerificationCodeDto? VerificationCodeModel { get; set; } = new VerificationCodeDto(); + + protected override async Task OnParametersSetAsync() + { + var request = await _hc.GetAsync($"Verification/GetVerification/{ID}"); + if (request.IsSuccessStatusCode) + { + + VerificationCodeModel = await request.Content.ReadFromJsonAsync(); + } + else + { + nav.NavigateTo($"/"); + } + hidden = null; + SpinnerVisible = false; + await base.OnParametersSetAsync(); + } +} + @functions { + + private async Task ReSend() + { + hidden = "hidden"; + SpinnerVisible = !SpinnerVisible; + + var request = await _hc.GetAsync($"Verification/ReSend/{VerificationCodeModel?.ID}"); + if (request.IsSuccessStatusCode) + { + ShowSuccessAlert("کد مجدد ارسال شد"); + } + else + { + var listerror = await request.Content.ReadFromJsonAsync>(); + ShowDangerAlert(listerror[0]); + } + + SpinnerVisible = !SpinnerVisible; + hidden = null; + } + private async Task SubmitVerificationCode() + { + hidden = "hidden"; + SpinnerVisible = !SpinnerVisible; + if (!int.TryParse(valueCode, out int code)) + return; + + VerificationCodeModel.Code = code; + if (VerificationCodeModel.Code < 1000 || VerificationCodeModel.Code > 9000) + { + ShowDangerAlert("کد احراز صحیح نمی باشد"); + } + else + { + var request = await _hc.PostAsJsonAsync($"Verification/Submit", VerificationCodeModel); + if (request.IsSuccessStatusCode) + { + var status = await request.Content.ReadFromJsonAsync(); + if (status) + { + + nav.NavigateTo("/"); + + } + else + { + ShowDangerAlert("خطای سیستمی رخ داده"); + } + + } + else + { + var listerror = await request.Content.ReadFromJsonAsync>(); + ShowDangerAlert(listerror[0]); + } + } + SpinnerVisible = !SpinnerVisible; + hidden = null; + } + private void ShowSuccessAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Success; + alertIconName = IconName.CheckCircleFill; + alertMessage = msg; + } + private void ShowDangerAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Danger; + alertIconName = IconName.ExclamationTriangleFill; + alertMessage = msg; + } + private async Task EndForm() + { + if (!successfull) + await _hc.DeleteAsync($"Verification/Remove/{VerificationCodeModel?.ID}"); + if (VerificationCodeModel.Type == "ChangeUserName") + nav.NavigateTo("/Profile"); + nav.NavigateTo("/"); + } + private ToastMessage CreateToastMessage(ToastType toastType, string Message) + => new ToastMessage + { + Type = toastType, + Message = Message, + }; +} diff --git a/moadiran/Pages/_Layout.cshtml b/moadiran/Pages/_Layout.cshtml index b3dd8cd..ec3cfaf 100644 --- a/moadiran/Pages/_Layout.cshtml +++ b/moadiran/Pages/_Layout.cshtml @@ -1,7 +1,7 @@ @using Microsoft.AspNetCore.Components.Web @namespace moadiran.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@inject Fixedvalues fv; + @@ -31,12 +31,12 @@
- An error has occurred. This application may no longer respond until reloaded. + خطایی در بارگذاری رخ داده An unhandled exception has occurred. See browser dev tools for details. - Reload + بارگذاری مجدد 🗙
diff --git a/moadiran/Shared/MainLayout.razor b/moadiran/Shared/MainLayout.razor index 7390305..886535f 100644 --- a/moadiran/Shared/MainLayout.razor +++ b/moadiran/Shared/MainLayout.razor @@ -34,10 +34,13 @@
@code { public string description { get; set; } = "سامانه ای برای مدیریت صورتحساب های فروش با الگوی سازمان امورمالیاتی کشور و ارسال صورت حساب به سامانه مودیان"; - protected override async Task OnInitializedAsync() + protected override async Task OnAfterRenderAsync(bool firstRender) { + if(firstRender) await fv.SetUlr("Main"); - await base.OnInitializedAsync(); + + await base.OnAfterRenderAsync(firstRender); } + } diff --git a/moadiran/moadiran.csproj b/moadiran/moadiran.csproj index d5a1c7e..ad63d31 100644 --- a/moadiran/moadiran.csproj +++ b/moadiran/moadiran.csproj @@ -12,5 +12,10 @@ + + + true + +