From 82ad9ff34547c2fe4ab3f99e8adcde776371ea86 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 31 Jan 2024 17:32:24 +0100 Subject: [PATCH] UI changes, transfer, destinations --- .../Pages/Components/AuthComponent.razor | 12 +++- .../Pages/Components/AuthComponent.razor.cs | 6 ++ .../Pages/Components/InputWizard.razor | 44 ++++++------ .../Pages/Components/InputWizard.razor.cs | 68 ++++++++++-------- TIAMSharedUI/Pages/Index.razor | 49 ++++++++++++- TIAMSharedUI/Pages/Login.razor | 2 +- TIAMSharedUI/Pages/Register.razor | 2 +- TIAMSharedUI/Pages/Transfer.razor | 22 +++--- TIAMSharedUI/Pages/TransferFinal.razor | 2 +- TIAMSharedUI/Pages/User/Admin.razor | 6 +- .../Pages/User/Hotels/HotelAdmin.razor | 6 +- .../Pages/User/Hotels/HotelComponent.razor | 10 +-- .../Pages/User/MyServiceProviders.razor | 2 +- .../Pages/User/ProfileComponent.razor | 27 ++----- TIAMSharedUI/Pages/User/ServiceProvider.razor | 24 ++++++- .../Pages/User/SysAdmins/Products.razor | 16 ++--- .../Pages/User/SysAdmins/Products.razor.cs | 10 +-- .../Pages/User/SysAdmins/SysAdmin.razor | 6 +- .../User/SysAdmins/SysAdminComponent.razor | 12 ++-- .../User/SysAdmins/TransferDestinations.razor | 2 +- .../SysAdmins/TransferDestinations.razor.cs | 21 ++++-- .../User/SysAdmins/TransferManagement.razor | 5 +- TIAMSharedUI/Shared/HeroSlider.razor | 25 +++++-- TIAMSharedUI/Shared/SliderItemSelector.razor | 11 ++- TIAMSharedUI/wwwroot/css/TourIAm.css | 44 +++++++++--- TIAMSharedUI/wwwroot/images/Untitled-2.psd | Bin 3156135 -> 2921163 bytes TIAMSharedUI/wwwroot/images/bg.jpg | Bin 195445 -> 133768 bytes .../ServiceProviderAPIController.cs | 2 +- 28 files changed, 275 insertions(+), 161 deletions(-) diff --git a/TIAMSharedUI/Pages/Components/AuthComponent.razor b/TIAMSharedUI/Pages/Components/AuthComponent.razor index 6401a689..7a00f466 100644 --- a/TIAMSharedUI/Pages/Components/AuthComponent.razor +++ b/TIAMSharedUI/Pages/Components/AuthComponent.razor @@ -1,9 +1,15 @@ @using TIAMSharedUI.Shared.Components +@{ + if(IsVisible) + { +
+

AuthComponent:

Logged in: @IsLoggedIn

+ +
+ } +} -
-

AuthComponent:

Logged in: @IsLoggedIn

-
@code { diff --git a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs index 24243fcd..df029ad0 100644 --- a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs +++ b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs @@ -20,6 +20,8 @@ namespace TIAMSharedUI.Pages.Components [CascadingParameter] private PopupMessageBox PopupMessageBox { get; set; } = default!; + public bool IsVisible = true; + protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); @@ -43,5 +45,9 @@ namespace TIAMSharedUI.Pages.Components } + private void ToggleAuthComponent(Microsoft.AspNetCore.Components.Web.MouseEventArgs e) + { + IsVisible = false; + } } } diff --git a/TIAMSharedUI/Pages/Components/InputWizard.razor b/TIAMSharedUI/Pages/Components/InputWizard.razor index 1b36779c..449935d1 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor @@ -1,32 +1,30 @@ @using System.Linq.Expressions @using System.ComponentModel.DataAnnotations +@using BlazorAnimation + + +
+

@localizer.GetString(TitleResourceString)

+

+ @localizer.GetString(SubtitleResourceString) +

+
-
-
- - -
-

@localizer.GetString(TitleResourceString)

-

- @localizer.GetString(SubtitleResourceString) -

-
-
- @CreateEditFormFields() -
-
-
+
+ @CreateEditFormFields() +
+ + -
-

- @_formSubmitResult -

- +

+ @_formSubmitResult +

+
@code { diff --git a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs index 9693ec11..564bfa0b 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs @@ -166,7 +166,7 @@ namespace TIAMSharedUI.Pages.Components layoutItemBuilder.AddAttribute(i++, "Caption", localizer.GetString(displayLabel.Name)); layoutItemBuilder.AddAttribute(i++, "ColSpanMd", 12); layoutItemBuilder.AddAttribute(i++, "CaptionPosition", CaptionPosition.Vertical); - //layoutItemBuilder.AddAttribute(i++, "CssClass", "flex-direction: column;"); + layoutItemBuilder.AddAttribute(i++, "CssClass", "justify-content-center"); layoutItemBuilder.AddAttribute(i++, "Template", (RenderFragment)((context) => ((editor) => { @@ -240,10 +240,10 @@ namespace TIAMSharedUI.Pages.Components //MaskAutoCompleteMode="@((MaskAutoCompleteMode)AutoCompleteMode)" editor.AddAttribute(j++, "MaskAutoCompleteMode", MaskAutoCompleteMode.None); editor.AddAttribute(j++, "NullText", "example@example.com"); - editor.AddAttribute(j++, "ValueExpression", lambda); - + editor.AddAttribute(j++, "ValueExpression", lambda); + editor.AddAttribute(j++, "Placeholder", "#"); - editor.AddAttribute(j++, "PlaceholdersVisible", false); + editor.AddAttribute(j++, "PlaceholdersVisible", false); editor.AddAttribute(j++, "ValueChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); //editor.AddAttribute(j++, "Template", (RenderFragment)((context) => ((editor2) => @@ -262,6 +262,7 @@ namespace TIAMSharedUI.Pages.Components editor.OpenComponent>(j); editor.AddAttribute(j++, "Date", property.GetValue(Data)); editor.AddAttribute(j++, "DateExpression", lambda); + editor.AddAttribute(j++, "CssClass", "form-field"); editor.AddAttribute(j++, "DateChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); editor.CloseComponent(); break; @@ -339,11 +340,11 @@ namespace TIAMSharedUI.Pages.Components } //string.Compare(metadata.CustomDataType, "BoldRed", true) == 0 //else if (property.PropertyType == typeof(string) && property.Name == "Destination") - + else if (property.PropertyType == typeof(string) && string.Compare(attrList.CustomDataType, "TransferDestination", true) == 0) { - editor.OpenComponent(j); + editor.OpenComponent(j); editor.AddAttribute(j++, "OwlId", "owlSelector" + _stepID); editor.AddAttribute(j++, "TextValue", property.GetValue(Data)); //editor.AddAttribute(j++, "TExpression", lambda); @@ -357,13 +358,14 @@ namespace TIAMSharedUI.Pages.Components editor.CloseComponent(); editor.OpenComponent(j++); - editor.AddAttribute(j++, "CssClass", "form-field"); + /*editor.AddAttribute(j++, "CssClass", "form-field");*/ editor.AddAttribute(j++, "NullText", "Slide or type"); editor.AddAttribute(j++, "Enabled", false); editor.AddAttribute(j++, "Text", property.GetValue(Data)); - editor.AddAttribute(j++, "TextExpression", lambda); - editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => { - property.SetValue(Data, str); + editor.AddAttribute(j++, "TextExpression", lambda); + editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => + { + property.SetValue(Data, str); LogToBrowserConsole.LogToBC($"bleh: {property.Name} = {property.GetValue(Data)}"); })); editor.CloseComponent(); @@ -391,25 +393,34 @@ namespace TIAMSharedUI.Pages.Components layoutItemBuilder.CloseComponent(); //close dxformlayoutitem - if (k < _length - 1) + layoutItemBuilder.OpenComponent(i++); + layoutItemBuilder.AddAttribute(i++, "Click", EventCallback.Factory.Create(this, OnPrevious)); + layoutItemBuilder.AddAttribute(i++, "SubmitFormOnClick", false); + layoutItemBuilder.AddAttribute(i++, "CssClass", "btn btn-secondary mt-3"); + if (!(k > 0)) { - layoutItemBuilder.OpenComponent(i++); - layoutItemBuilder.AddAttribute(i++, "Click", EventCallback.Factory.Create(this, OnNext)); - layoutItemBuilder.AddAttribute(i++, "SubmitFormOnClick", false); - layoutItemBuilder.AddAttribute(i++, "CssClass", "btn btn-primary mt-3"); - layoutItemBuilder.AddAttribute(i++, "style", "margin-left: auto;"); - layoutItemBuilder.AddAttribute(i++, "Text", localizer.GetString(ResourceKeys.ButtonNext)); - layoutItemBuilder.CloseComponent(); + layoutItemBuilder.AddAttribute(i++, "disabled", "true"); + } - if (k > 0) + layoutItemBuilder.AddAttribute(i++, "style", "margin-left: auto; width:49%"); + layoutItemBuilder.AddAttribute(i++, "Text", localizer.GetString(ResourceKeys.ButtonPrevious)); + layoutItemBuilder.CloseComponent(); + + + layoutItemBuilder.OpenComponent(i++); + layoutItemBuilder.AddAttribute(i++, "Click", EventCallback.Factory.Create(this, OnNext)); + layoutItemBuilder.AddAttribute(i++, "SubmitFormOnClick", false); + layoutItemBuilder.AddAttribute(i++, "CssClass", "btn btn-primary mt-3"); + if (!(k < _length - 1)) { - layoutItemBuilder.OpenComponent(i++); - layoutItemBuilder.AddAttribute(i++, "Click", EventCallback.Factory.Create(this, OnPrevious)); - layoutItemBuilder.AddAttribute(i++, "SubmitFormOnClick", false); - layoutItemBuilder.AddAttribute(i++, "CssClass", "btn btn-secondary mt-3"); - layoutItemBuilder.AddAttribute(i++, "Text", localizer.GetString(ResourceKeys.ButtonPrevious)); - layoutItemBuilder.CloseComponent(); + layoutItemBuilder.AddAttribute(i++, "disabled", "true"); + } + + layoutItemBuilder.AddAttribute(i++, "style", "margin-left: auto; width:49%"); + layoutItemBuilder.AddAttribute(i++, "Text", localizer.GetString(ResourceKeys.ButtonNext)); + layoutItemBuilder.CloseComponent(); + layoutItemBuilder.CloseElement(); //close div @@ -427,14 +438,15 @@ namespace TIAMSharedUI.Pages.Components } layoutItemBuilder.OpenComponent(i++); layoutItemBuilder.AddAttribute(i++, "ColSpanMd", 12); - layoutItemBuilder.AddAttribute(i++, "CssClass", "full-width"); + layoutItemBuilder.AddAttribute(i++, "CssClass", "full-width justify-content-center"); layoutItemBuilder.AddAttribute(i++, "Template", (RenderFragment)((context) => ((editor) => { LogToBrowserConsole.LogToBC($"Submit button {CurrentStep}, {FormSteps.Count}"); editor.OpenElement(i++, "button"); editor.AddAttribute(i++, "type", "submit"); - editor.AddAttribute(i++, "class", "btn btn-primary mt-3"); + editor.AddAttribute(i++, "class", "btn btn-primary mt-3 w-100"); + editor.AddAttribute(i++, "style", "margin: 0 auto"); if (CurrentStep < _length - 1) { editor.AddAttribute(i++, "disabled", "true"); @@ -503,6 +515,6 @@ namespace TIAMSharedUI.Pages.Components } } - + } diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index 60eb2bac..97d17f0f 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -9,17 +9,43 @@ @using TIAMWebApp.Shared.Application.Utility; @using System.IdentityModel.Tokens.Jwt; @using TIAMSharedUI.Pages.Components; +@using TIAMSharedUI.Shared +@using TIAM.Entities.TransferDestinations +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @inject NavigationManager NavManager @inject IUserDataService UserDataService; @inject IJSRuntime jsRuntime; @inject ISecureStorageHandler SecureStorageHandler @inject ISessionService sessionService; @inject IStringLocalizer localizer; -@using TIAMSharedUI.Shared +@inject NavigationManager navManager +@inject LogToBrowserConsole logToBrowserConsole +@inject IWizardProcessor WizardProcessor Index - + + + +
+
+
+
+ + + +
+
+
+ +
+ +
@@ -76,7 +102,26 @@ @code { + public TransferWizardModel myModel = new TransferWizardModel(); + public List TransferIgnorList = new List + { + "Id", + "Price", + "Driver" + }; + + /*protected override void OnAfterRender(bool isFirst) + { + message = " Target destination is " + slider.SliderElementId.ToString(); + }*/ + + public async Task SubmitForm(object Result) + { + var transfer = await WizardProcessor.ProcessWizardAsync(Result.GetType(), Result); + logToBrowserConsole.LogToBC($"Submitted nested form: {Result.GetType().FullName}"); + navManager.NavigateTo("/transfer2/" + transfer.Id); + } } diff --git a/TIAMSharedUI/Pages/Login.razor b/TIAMSharedUI/Pages/Login.razor index e269bb44..95e07efe 100644 --- a/TIAMSharedUI/Pages/Login.razor +++ b/TIAMSharedUI/Pages/Login.razor @@ -26,7 +26,7 @@
-
+