mmr/Hushian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
mmrbnjd
2025-07-12 21:33:44 +03:30
parent d397f70b9a
commit 8a6ff3da67
32 changed files with 320 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
Presentation/HushianWebApp/Pages/Auth/Login.razor
View File

@@ -1,6 +1,6 @@
@page "/Login"
@using Common.Enums
@using Common.Models.Identity
@using Common.Models.Auth.CompanySide
@using HushianWebApp.Components
@using HushianWebApp.Service
@layout BeforeLayout
@@ -11,7 +11,7 @@
<ConfirmDialog @ref="dialog" />
<div class="header-form">
<img src="/before/assets/images/Hushian-logo.svg" width="133" alt="Hushian" class="lg:hidden mb-3">
<img src="/before/assets/images/Hushian-logo.svg" width="133" alt="Hushian" class="lg:hidden mb-3">
<span>ورود</span>
<span>به هوشیان</span>
@@ -59,7 +59,7 @@
</div>
<div class=" space-y-5 flex flex-col items-center">
<NavLink class="btn btn-outline w-full mb-4 lg:mb-0" href="Register">
ثبت نام
ثبت نام
</NavLink>
</div>
@@ -77,27 +77,32 @@
@functions {
async Task onClick()
{
if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(Password)) return;
Loading = true;
var msg = await auth.login(new AuthRequest(username, Password));
if (msg == "PhoneNumberNotConfirmed")
{
var confirmation = await dialog.ShowAsync(
title: "احراز کاربری",
message1: "کاربری/ موبایل شما فعال نشده برای ورود باید احراز کنید",
message2: "انجام بدیم؟");
if (!confirmation)
var msg = await auth.login(new AuthRequestFromCompanySide()
{
Loading = false;
return;
}
await verification();
}
else if (msg == "ok")
Username = username,
Password = Password
});
// if (msg == "PhoneNumberNotConfirmed")
// {
// var confirmation = await dialog.ShowAsync(
// title: "احراز کاربری",
// message1: "کاربری/ موبایل شما فعال نشده برای ورود باید احراز کنید",
// message2: "انجام بدیم؟");
// if (!confirmation)
// {
// Loading = false;
// return;
// }
// await verification();
// }
// else
if (msg == "ok")
{
navigationManager.NavigateTo("/");
}
@@ -106,19 +111,19 @@
Loading = false;
}
async Task verification()
{
var parameters = new Dictionary<string, object>();
parameters.Add("type", VerificationCodeType.PhoneNumberConfirmed);
parameters.Add("sendValue", username);
parameters.Add("ID", 0);
parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create<VerificationCodeType>(this, CallBackVer));
parameters.Add("Title", "کاربری/ موبایل شما فعال نشده برای ورود باید احراز کنید");
await modal.ShowAsync<Verification>(title: "احراز", parameters: parameters);
}
async Task CallBackVer(VerificationCodeType type)
{
await modal.HideAsync();
}
// async Task verification()
// {
// var parameters = new Dictionary<string, object>();
// parameters.Add("type", VerificationCodeType.PhoneNumberConfirmed);
// parameters.Add("sendValue", username);
// parameters.Add("ID", 0);
// parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create<VerificationCodeType>(this, CallBackVer));
// parameters.Add("Title", "کاربری/ موبایل شما فعال نشده برای ورود باید احراز کنید");
// await modal.ShowAsync<Verification>(title: "احراز", parameters: parameters);
// }
// async Task CallBackVer(VerificationCodeType type)
// {
// await modal.HideAsync();
// }
}

19
Presentation/HushianWebApp/Pages/Auth/Register.razor
View File

@@ -159,22 +159,11 @@
}
//-------------------
Loading = true;
var ID = await companyService.RegisterCompany(new Hushian.Application.Dtos.RegistrationDto()
var ID = await companyService.RegisterCompany(new Common.Dtos.Company.RegisterCompanyDto()
{
Company = new()
{
Fullname = FullName,
Info = "" ,
WebSite = WebSite
},
User = new()
{
Email = Email,
FullName = FullName,
PhoneNumber = PhoneNumber,
UserName = PhoneNumber,
PassWord = Password
}
FullName = FullName,
Mobile = PhoneNumber,
Password = Password
});
Loading = false;
if (ID > 0)