Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Adam:ccd197d43df19595507dbdfcebb23354e2490ecc
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:cf847e246cf4fc1a016b622f97f2573be267bbc6
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

No commits in common. "ccd197d43df19595507dbdfcebb23354e2490ecc" and "cf847e246cf4fc1a016b622f97f2573be267bbc6" have entirely different histories.
ccd197d43d ... cf847e246c

5 changed files with 82 additions and 82 deletions
Show Stats Expand all files Collapse all files

12
TIAMSharedUI/Pages/Components/LoginStep1.razor
View File

@ -1,12 +1,12 @@
@using TIAMWebApp.Shared.Application.Models.PageModels;
<EditForm Model="@LoginModel" OnValidSubmit="GoToNextStep">
@* <DataAnnotationsValidator /> *@
<EditForm Model="@loginModel" OnValidSubmit="GoToNextStep">
<DataAnnotationsValidator />
<div class="form-field d-flex align-items-center">
<DxMaskedInput @bind-Value="@LoginModel.Email"
<DxMaskedInput @bind-Value="@loginModel.Email"
Id="Email"
CssClass="cw-320"
Mask="@EmailMask"
@ -18,7 +18,7 @@
</div>
<ValidationMessage For="@(() => LoginModel.Email)" />
<ValidationMessage For="@(() => loginModel.Email)" />
<button class="btn btn-primary mt-3" type="submit">
<span class="@spinnerClass"></span>
@ -31,7 +31,7 @@
@code {
[Parameter]
public LoginModel LoginModel { get; set; }
public LoginModel loginModel { get; set; }
//[Parameter]
//public string Email { get; set; }
@ -56,7 +56,7 @@
spinnerClass = "spinner-border spinner-border-sm";
await Task.Delay(500);
spinnerClass = "";
await LoginModelChanged.InvokeAsync(LoginModel);
await LoginModelChanged.InvokeAsync(loginModel);
await onLoginNext.InvokeAsync();
}

18
TIAMSharedUI/Pages/Login.razor
View File

@ -27,15 +27,15 @@
</div>
<form class="p-3 mt-3">
<div>
@switch (_currentStep)
@switch (currentStep)
{
case 1:
<LoginStep1 @bind-LoginModel="_loginModel" onLoginNext="GoToNextStep" />
<LoginStep1 @bind-LoginModel="loginModel" onLoginNext="GoToNextStep" />
;
break;
case 2:
<LoginStep3 @bind-LoginModel="_loginModel" onSubmit="SubmitLogin" onPrev="GoToPreviousStep" />
<LoginStep3 @bind-LoginModel="loginModel" onSubmit="SubmitLogin" onPrev="GoToPreviousStep" />
;
break;
}
@ -43,15 +43,16 @@
</form>
<p>@_currentStep</p>
<p>@currentStep</p>
@{
if (!_loggedIn)
if (!loggedIn)
{
<div>
<p>@localizer["LoginEmail"]: @_loginModel.Email</p>
<p>@localizer["LoginEmail"]: @loginModel.Email</p>
<p>@_loginModel.Password</p>
<p>@loginModel.Password</p>
</div>
}
}
@ -75,8 +76,7 @@
</div>
@code {
//LoginModel _loginModel = new LoginModel("test@tiam.hu", "test1234");
LoginModel _loginModel = new LoginModel("", "");
LoginModel loginModel = new LoginModel("test@tiam.hu", "test1234");
}

14
TIAMSharedUI/Pages/Login.razor.cs
View File

@ -43,25 +43,25 @@ namespace TIAMSharedUI.Pages
//[Display(Name = "LoginTitleText", ResourceType = typeof(MyResources))]
public string TitleText { get; set; } = "dda,mnd,amn,a";
private int _currentStep = 1;
bool _loggedIn = false;
private int currentStep = 1;
bool loggedIn = false;
private void GoToNextStep()
{
_currentStep++;
currentStep++;
}
private void GoToPreviousStep()
{
_currentStep--;
currentStep--;
}
private async void SubmitLogin()
{
_currentStep = 1;
BrowserConsoleLogWriter.Info("Login started: " + "Email: " + _loginModel.Email + ", Password: " + _loginModel.Password);
var response = await userDataService.AuthenticateUser(_loginModel);
currentStep = 1;
BrowserConsoleLogWriter.Info("Login started: " + "Email: " + loginModel.Email + ", Password: " + loginModel.Password);
var response = await userDataService.AuthenticateUser(loginModel);
//var response = await UserDataservice.TestUserApi(30);
BrowserConsoleLogWriter.Info("Login started");
BrowserConsoleLogWriter.Info(response);

22
TIAMSharedUI/Pages/User/MyServiceProviders.razor
View File

@ -41,7 +41,7 @@
<CompanyGrid @ref="_gridCompany"
Logger="_logger"
SignalRClient="AdminSignalRClient"
ContextIds="_contextIds.Cast<object>().ToArray()"
ContextIds="contextIds.Cast<object>().ToArray()"
GetAllMessageTag="SignalRTags.GetCompaniesByContextId"
PageSize="12"
ValidationEnabled="false"
@ -81,16 +81,16 @@
@code {
private LoggerClient<MyServiceProviders> _logger = null!;
private LoggerClient<MyServiceProviders> _logger;
private CompanyGrid _gridCompany = null!;
private CompanyGrid _gridCompany;
public ServiceProviderWizardModel MyModel = new ServiceProviderWizardModel();
public ServiceProviderWizardModel myModel = new ServiceProviderWizardModel();
bool EulaAccepted { get; set; }
bool EulaVisible { get; set; }
private Guid[] _contextIds = new Guid[0];
private Guid[] contextIds = new Guid[0];
void CancelCreateClick()
{
@ -103,16 +103,16 @@
}
void EulaPopupClosing(PopupClosingEventArgs args)
{
MyModel = new ServiceProviderWizardModel();
myModel = new ServiceProviderWizardModel();
}
//-----------------------------------------------------------------------------------
public async Task SubmitForm(object result)
public async Task SubmitForm(object Result)
{
//await WizardProcessor.ProcessWizardAsync(Result.GetType(), Result);
_logger.Info($"Submitted nested form: {result.GetType().FullName}");
_logger.Info($"Submitted nested form: {Result.GetType().FullName}");
}
@ -131,9 +131,9 @@
{
_logger = new LoggerClient<MyServiceProviders>(LogWriters.ToArray());
var myId = SessionService.User!.UserId;
_contextIds = new Guid[1];
_contextIds[0] = myId;
var myId = SessionService.User.UserId;
contextIds = new Guid[1];
contextIds[0] = myId;
// ServiceProviderDataService.GetPropertiesByOwnerIdAsync(myId, companyPropertiesByOwner =>
// {
// _logger.DetailConditional($"companyPropertiesByOwner count: {companyPropertiesByOwner?.Count.ToString() ?? "NULL"}");

4
TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor
View File

@ -66,11 +66,11 @@
private MessageGrid _messageGrid = null!;
private LoggerClient<MessageDetailGridComponent> _logger = null!;
private LoggerClient<MessageGridComponent> _logger = null!;
protected override void OnInitialized()
{
_logger = new LoggerClient<MessageDetailGridComponent>(LogWriters.ToArray());
_logger = new LoggerClient<MessageGridComponent>(LogWriters.ToArray());
}
private void CustomizeElement(GridCustomizeElementEventArgs e)