From 8583171b76e67befbbdf324334b209dadcdbf2f1 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 10 Jan 2024 18:12:00 +0100 Subject: [PATCH] ui changes, slideritemselector fixes, popupalertbox, animations --- TIAMMobileApp/MauiProgram.cs | 3 + TIAMMobileApp/wwwroot/index.html | 1 + TIAMSharedUI/Pages/AppLaunch.razor | 2 +- .../Pages/Components/AuthComponent.razor | 3 +- .../Pages/Components/AuthComponent.razor.cs | 12 + .../Pages/Components/InputWizard.razor.cs | 10 +- TIAMSharedUI/Pages/User/Admin.razor | 41 +- TIAMSharedUI/Pages/User/HotelAdmin.razor | 198 + TIAMSharedUI/Pages/User/HotelAdmin.razor.cs | 12 + TIAMSharedUI/Pages/User/HotelComponent.razor | 10 +- .../Pages/User/MyServiceProviders.razor | 2 +- TIAMSharedUI/Pages/User/MyTransfers.razor | 4 + .../Pages/User/PermissionsComponent.razor | 5 + .../Pages/User/ProfileComponent.razor | 5 + TIAMSharedUI/Pages/User/ServiceProvider.razor | 8 +- .../Pages/User/SysAdminComponent.razor | 94 +- TIAMSharedUI/Shared/Components/Navbar.razor | 30 +- .../Shared/Components/PopupMessageBox.razor | 31 + .../Components/PopupMessageBox.razor.cs | 187 + TIAMSharedUI/Shared/MainLayout.razor | 11 +- TIAMSharedUI/Shared/NavMenu.razor | 5 +- TIAMSharedUI/Shared/SliderItemSelector.razor | 58 +- .../Shared/SliderItemSelector.razor.css | 13 +- TIAMSharedUI/Shared/Users/AdminNavMenu.razor | 78 +- TIAMSharedUI/TIAMSharedUI.csproj | 2 + .../wwwroot/blazorAnimationInterop.js | 12 + TIAMSharedUI/wwwroot/css/TourIAm.css | 31 +- TIAMSharedUI/wwwroot/css/animate.css | 4250 +++++++++++++++++ TIAMWebApp/Client/Program.cs | 2 + .../Client/Services/UserDataServiceWeb.cs | 2 + TIAMWebApp/Client/wwwroot/index.html | 4 +- 31 files changed, 4985 insertions(+), 141 deletions(-) create mode 100644 TIAMSharedUI/Pages/User/HotelAdmin.razor create mode 100644 TIAMSharedUI/Pages/User/HotelAdmin.razor.cs create mode 100644 TIAMSharedUI/Pages/User/PermissionsComponent.razor create mode 100644 TIAMSharedUI/Pages/User/ProfileComponent.razor create mode 100644 TIAMSharedUI/Shared/Components/PopupMessageBox.razor create mode 100644 TIAMSharedUI/Shared/Components/PopupMessageBox.razor.cs create mode 100644 TIAMSharedUI/wwwroot/blazorAnimationInterop.js create mode 100644 TIAMSharedUI/wwwroot/css/animate.css diff --git a/TIAMMobileApp/MauiProgram.cs b/TIAMMobileApp/MauiProgram.cs index 55f2f251..21b1cf04 100644 --- a/TIAMMobileApp/MauiProgram.cs +++ b/TIAMMobileApp/MauiProgram.cs @@ -6,6 +6,7 @@ using System.Resources; using AyCode.Interfaces.StorageHandlers; using TIAMWebApp.Shared.Application.Utility; using TIAMWebApp.Shared.Application.Services; +using BlazorAnimation; namespace TIAMMobileApp { @@ -55,6 +56,8 @@ namespace TIAMMobileApp builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddSingleton(x => new ResourceManager("TIAMWebApp.Shared.Application.Resources", typeof(Main).Assembly)); + + builder.Services.Configure(Guid.NewGuid().ToString(), c => { }); return builder.Build(); } } diff --git a/TIAMMobileApp/wwwroot/index.html b/TIAMMobileApp/wwwroot/index.html index 7a9cda67..703517a8 100644 --- a/TIAMMobileApp/wwwroot/index.html +++ b/TIAMMobileApp/wwwroot/index.html @@ -32,6 +32,7 @@ + diff --git a/TIAMSharedUI/Pages/AppLaunch.razor b/TIAMSharedUI/Pages/AppLaunch.razor index 412c987e..7baff830 100644 --- a/TIAMSharedUI/Pages/AppLaunch.razor +++ b/TIAMSharedUI/Pages/AppLaunch.razor @@ -42,7 +42,7 @@ Loading.... logToBrowserConsole = new LogToBrowserConsole(JSRuntime); //wait for 5 seconds - await Task.Delay(1000); + await Task.Delay(0001); if (!string.IsNullOrWhiteSpace(userDetailsStr)) { diff --git a/TIAMSharedUI/Pages/Components/AuthComponent.razor b/TIAMSharedUI/Pages/Components/AuthComponent.razor index bb1eec69..6401a689 100644 --- a/TIAMSharedUI/Pages/Components/AuthComponent.razor +++ b/TIAMSharedUI/Pages/Components/AuthComponent.razor @@ -1,4 +1,5 @@ - +@using TIAMSharedUI.Shared.Components +

AuthComponent:

Logged in: @IsLoggedIn

diff --git a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs index 9956e312..4cd5a498 100644 --- a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs +++ b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using TIAMSharedUI.Shared.Components; using TIAMWebApp.Shared.Application.Interfaces; namespace TIAMSharedUI.Pages.Components @@ -16,10 +17,21 @@ namespace TIAMSharedUI.Pages.Components [Inject] public IComponentUpdateService componentUpdateService { get; set; } + [CascadingParameter] + private PopupMessageBox PopupMessageBox { get; set; } = default!; + protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); IsLoggedIn = sessionService.IsAuthenticated; + await PopupMessageBox.ShowAsync("AuthComponent", "Initialized", null, null, null, PopupMessageBox.ButtonOk); + + if (await PopupMessageBox.Show("Cancel", "Cancel this stuff", + PopupMessageBox.ButtonNo, PopupMessageBox.ButtonYes) == PopupMessageBox.ButtonNo) + { + //Something is cancelled + //args.Cancel = true; + } componentUpdateService.CallRequestRefresh(); StateHasChanged(); } diff --git a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs index daa70db9..acef020f 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs @@ -342,12 +342,13 @@ namespace TIAMSharedUI.Pages.Components 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++, "OnSliderChanged", EventCallback.Factory.Create(this, result => { LogToBrowserConsole.LogToBC($"Slider changed to {result}"); property.SetValue(Data, result); - LogToBrowserConsole.LogToBC($"Data.Destination = {property.GetValue(Data)}"); + LogToBrowserConsole.LogToBC($"bleh: {property.Name} = {property.GetValue(Data)}"); StateHasChanged(); // Add this line to refresh the UI })); @@ -357,7 +358,10 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(j++, "NullText", "Slide or type"); 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++, "TextChanged", EventCallback.Factory.Create(this, str => { + property.SetValue(Data, str); + LogToBrowserConsole.LogToBC($"bleh: {property.Name} = {property.GetValue(Data)}"); + })); editor.CloseComponent(); } diff --git a/TIAMSharedUI/Pages/User/Admin.razor b/TIAMSharedUI/Pages/User/Admin.razor index 8ccc2f6e..1cddbcb1 100644 --- a/TIAMSharedUI/Pages/User/Admin.razor +++ b/TIAMSharedUI/Pages/User/Admin.razor @@ -1,4 +1,4 @@ -@page "/admin" +@page "/user/admin" @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @@ -16,26 +16,26 @@
+ + + + - - - - - - - -
- - + + + +
+ +
-
+
@@ -85,7 +85,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
@@ -185,7 +185,6 @@
-
@@ -195,8 +194,8 @@ @code { - - + + bool isUserLoggedIn; int userType = 0; @@ -206,11 +205,11 @@ protected override async Task OnInitializedAsync() { - base.OnInitialized(); + base.OnInitialized(); + + - - } - + } diff --git a/TIAMSharedUI/Pages/User/HotelAdmin.razor b/TIAMSharedUI/Pages/User/HotelAdmin.razor new file mode 100644 index 00000000..592084bc --- /dev/null +++ b/TIAMSharedUI/Pages/User/HotelAdmin.razor @@ -0,0 +1,198 @@ +@page "/user/hoteladmin" +@using TIAMSharedUI.Shared +@using TIAMWebApp.Shared.Application.Models; +@using TIAMWebApp.Shared.Application.Interfaces; +@layout AdminLayout +@inject IPopulationStructureDataProvider DataProvider +@inject ISupplierService SupplierService +@inject IUserDataService UserDataService +Transfer + +
+

Dashboard

+

Have a nice day!

+
+ + + +
+ + + + +
+ + +
+
+
+
+
+
+ Panel title +

Subtitle

+
+ +
+
+
+
+
+
Some info
+

Budapest, Dózsa György út 35, 1146

+
+
+ +
+ +
+
    +
  • + PLACED +
  • +
  • WAITING FOR PICK UP
  • +
  • + FINISHED +
  • +
+ +
+

Some conclusion

+
+
+ +
+
+
+
+
+
+
+ Panel title +

Subtitle

+
+ +
+
+
+
+
+
Some info
+

Budapest, Dózsa György út 35, 1146

+
+
+ +
+ +
+
    +
  • + PLACED +
  • +
  • WAITING FOR PICK UP
  • +
  • + FINISHED +
  • +
+ +
+

Some conclusion

+
+
+ +
+
+
+
+
+
+
+ Panel title +

Subtitle

+
+ +
+
+
+
+
+
Some info
+

Budapest, Dózsa György út 35, 1146

+
+
+ +
+ +
+
    +
  • + PLACED +
  • +
  • WAITING FOR PICK UP
  • +
  • + FINISHED +
  • +
+ +
+

Some conclusion

+
+
+ +
+
+
+ +
+ +
+ +
+ + +@code { + string Id = "2312-32132121-32123"; + bool isUserLoggedIn; + int userType = 0; + + protected override async Task OnInitializedAsync() + { + base.OnInitialized(); + + } + +} + diff --git a/TIAMSharedUI/Pages/User/HotelAdmin.razor.cs b/TIAMSharedUI/Pages/User/HotelAdmin.razor.cs new file mode 100644 index 00000000..b8ba5846 --- /dev/null +++ b/TIAMSharedUI/Pages/User/HotelAdmin.razor.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TIAMSharedUI.Pages.User +{ + public partial class Home + { + } +} diff --git a/TIAMSharedUI/Pages/User/HotelComponent.razor b/TIAMSharedUI/Pages/User/HotelComponent.razor index e390172c..4e477967 100644 --- a/TIAMSharedUI/Pages/User/HotelComponent.razor +++ b/TIAMSharedUI/Pages/User/HotelComponent.razor @@ -8,7 +8,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
@@ -100,7 +100,7 @@
-
+
@@ -129,7 +129,7 @@
-
+
@@ -179,7 +179,7 @@
-
+
diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor index 89e3cd6b..52b1e5d8 100644 --- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor @@ -13,7 +13,7 @@
-
+
diff --git a/TIAMSharedUI/Pages/User/MyTransfers.razor b/TIAMSharedUI/Pages/User/MyTransfers.razor index 3dc53bcb..57aaeb48 100644 --- a/TIAMSharedUI/Pages/User/MyTransfers.razor +++ b/TIAMSharedUI/Pages/User/MyTransfers.razor @@ -13,6 +13,10 @@ @inject IStringLocalizer localizer Transfers +
+

Transfer management

+

Manage transfers here!

+
diff --git a/TIAMSharedUI/Pages/User/PermissionsComponent.razor b/TIAMSharedUI/Pages/User/PermissionsComponent.razor new file mode 100644 index 00000000..407304e0 --- /dev/null +++ b/TIAMSharedUI/Pages/User/PermissionsComponent.razor @@ -0,0 +1,5 @@ +

PermissionsComponent

+ +@code { + +} diff --git a/TIAMSharedUI/Pages/User/ProfileComponent.razor b/TIAMSharedUI/Pages/User/ProfileComponent.razor new file mode 100644 index 00000000..b7d6d303 --- /dev/null +++ b/TIAMSharedUI/Pages/User/ProfileComponent.razor @@ -0,0 +1,5 @@ +

ProfileComponent

+ +@code { + +} diff --git a/TIAMSharedUI/Pages/User/ServiceProvider.razor b/TIAMSharedUI/Pages/User/ServiceProvider.razor index 4b0abed5..d59e7e50 100644 --- a/TIAMSharedUI/Pages/User/ServiceProvider.razor +++ b/TIAMSharedUI/Pages/User/ServiceProvider.razor @@ -5,8 +5,14 @@ @layout AdminLayout @inject NavigationManager navigationManager +
+

Service provider: @Id

+

Manage your service provider details

+
+
- + +
@code { diff --git a/TIAMSharedUI/Pages/User/SysAdminComponent.razor b/TIAMSharedUI/Pages/User/SysAdminComponent.razor index d091ab58..a5932a1c 100644 --- a/TIAMSharedUI/Pages/User/SysAdminComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdminComponent.razor @@ -1,4 +1,6 @@ -@using TIAMSharedUI.Shared + +@using BlazorAnimation +@using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @@ -6,44 +8,49 @@
-
-
-
-
- Transfers -

Summary

+ + +
+
+
+
+ Transfers +

Summary

+
+
- +
+ +
New
+

12

+
Scheduled
+

182

+
Finished
+

15665

+ +
+ + + +
-
- -
New
-

12

-
Scheduled
-

182

-
Finished
-

15665

- -
- - - - -
+
+
-
+ +
@@ -77,9 +84,11 @@
+
-
+ +
@@ -113,9 +122,11 @@
+
-
+ +
@@ -151,9 +162,11 @@
+
-
+ +
@@ -192,9 +205,11 @@
+
-
+ +
@@ -266,10 +281,7 @@
- - - - +
diff --git a/TIAMSharedUI/Shared/Components/Navbar.razor b/TIAMSharedUI/Shared/Components/Navbar.razor index ebcb8996..7759e8bd 100644 --- a/TIAMSharedUI/Shared/Components/Navbar.razor +++ b/TIAMSharedUI/Shared/Components/Navbar.razor @@ -53,23 +53,27 @@ } - @if(hasProperty) + else { + @if (hasProperty) + { + + } } - +
diff --git a/TIAMSharedUI/Shared/Components/PopupMessageBox.razor b/TIAMSharedUI/Shared/Components/PopupMessageBox.razor new file mode 100644 index 00000000..c260d989 --- /dev/null +++ b/TIAMSharedUI/Shared/Components/PopupMessageBox.razor @@ -0,0 +1,31 @@ + + + @(new MarkupString(@MessageHtml)) + + + + + + + + \ No newline at end of file diff --git a/TIAMSharedUI/Shared/Components/PopupMessageBox.razor.cs b/TIAMSharedUI/Shared/Components/PopupMessageBox.razor.cs new file mode 100644 index 00000000..781fe3d2 --- /dev/null +++ b/TIAMSharedUI/Shared/Components/PopupMessageBox.razor.cs @@ -0,0 +1,187 @@ +using DevExpress.Blazor; +using Microsoft.AspNetCore.Components.Web; +using Microsoft.AspNetCore.Components; + +namespace TIAMSharedUI.Shared.Components +{ + /// + /// A MessageBox (async and synchronized) component to provide a way to show informational messages. + /// + public partial class PopupMessageBox + { + + public static readonly string ButtonOk = "Ok"; + public static readonly string ButtonCancel = "Cancel"; + public static readonly string ButtonYes = "Yes"; + public static readonly string ButtonNo = "No"; + + [Inject] + private NavigationManager Navigation { get; set; } = default!; + + /// + /// The MessageBox popup. This is a DxPopup that is called asynchronously so it is displayed and control returns + /// to the caller. + /// + private DxPopup MessageBoxPopup { get; set; } = default!; + + /// + /// The header text in the MessageBox popup. This is a MarkupString so do not put any user entered text in this! + /// + private string HeaderText { get; set; } = string.Empty; + + /// + /// The message text in the MessageBox popup. This is a MarkupString so do not put any user entered text in this! + /// + private string MessageHtml { get; set; } = string.Empty; + + private Func? OnClick { get; set; } + + private Func? OnClose { get; set; } + + /// + /// This is passed in in the call to Show() and returned in the calls to OnClick() and OnClose(). + /// + private object? Tag { get; set; } + + /// + /// Used to make the popup synchronous. + /// + private TaskCompletionSource _taskCompletionSource = new(); + + /// + public PopupMessageBox() + { + ButtonVisible = new bool[4]; + ButtonText = new string[4]; + } + + /// + /// Displays the MessageBox. This is a static object so you can't create multiple instances of it. But you + /// can create another instance in the onClick or onCLose calls as the existing instance will be closed by + /// then. + /// + /// The header text in the message box. + /// The main message in the message box. This is treated as html + /// so use HttpUtility.HtmlEncode() on any user generated text in the message. + /// Caller defined data returned in the OnClick/OnClose calls. + /// Will call this method when a button is clicked. Passes the button text as the parameter. + /// Will call this when the popup is closed. Including after receiving the onClick call. + /// The text for the button(s). Can be 1 .. 4 buttons. + /// The task for the underlying DxPopup.ShowAsync() call. + public Task ShowAsync(string header, string message, object? tag, Func? onClick, + Func? onClose, params string[] buttonText) + { + + HeaderText = header; + MessageHtml = message; + Tag = tag; + OnClick = onClick; + OnClose = onClose; + + if (buttonText.Length == 0 || buttonText.Length > 4) + throw new ArgumentOutOfRangeException(nameof(buttonText), "Must have between 1 and 4 buttons"); + Array.Clear(ButtonVisible); + Array.Clear(ButtonText); + for (var index = 0; index < buttonText.Length; index++) + { + ButtonVisible[index] = true; + ButtonText[index] = buttonText[index]; + } + + StateHasChanged(); + + return MessageBoxPopup.ShowAsync(); + } + + /// + /// Displays the MessageBox. Then when click OK, goes to the url. This is a static object so you can't create + /// multiple instances of it. + /// + /// The header text in the message box. + /// The main message in the message box. This is treated as html + /// so use HttpUtility.HtmlEncode() on any user generated text in the message. + /// The url to navigate to when click OK. + /// The task for the underlying DxPopup.ShowAsync() call. + public Task ShowThenRedirectAsync(string header, string message, string url) + { + return ShowAsync(header, message, null, + (_, _) => + { + Navigation.NavigateTo(url, false); + return Task.CompletedTask; + }, + null, PopupMessageBox.ButtonOk); + } + + /// + /// Displays the MessageBox synchronously. Returns the text of the button clicked. This is a static object + /// so you can't create multiple instances of it. But you can create another instance when it returns as the + /// existing instance will be closed by then. + /// + /// The header text in the message box. + /// The main message in the message box. This is treated as html + /// so use HttpUtility.HtmlEncode() on any user generated text in the message. + /// The text for the button(s). Can be 1 .. 4 buttons. + /// The text of the button clicked. + public Task Show(string header, string message, params string[] buttonText) + { + _taskCompletionSource = new TaskCompletionSource(); + + ShowAsync(header, message, null, ShowOnClick, null, buttonText); + + // we return the Task from the TaskCompletionSource that is not completed + return _taskCompletionSource.Task; + } + + private Task ShowOnClick(string buttonText, object? tag) + { + // as this is called from the OnClick handler, the popup has been closed. + + // sets the TaskCompletionSource to completed. Any await-ers will now complete + _taskCompletionSource.SetResult(buttonText); + return Task.FromResult(_taskCompletionSource); + } + + private string[] ButtonText { get; } + + private bool[] ButtonVisible { get; } + + private async Task Button0Click(MouseEventArgs arg) + { + // need to close before calling OnClick because OnClick may call ShowAsync again + await MessageBoxPopup.CloseAsync(); + if (OnClick != null) + await OnClick.Invoke(ButtonText[0], Tag); + } + + private async Task Button1Click(MouseEventArgs arg) + { + // need to close before calling OnClick because OnClick may call ShowAsync again + await MessageBoxPopup.CloseAsync(); + if (OnClick != null) + await OnClick.Invoke(ButtonText[1], Tag); + } + private async Task Button2Click(MouseEventArgs arg) + { + // need to close before calling OnClick because OnClick may call ShowAsync again + await MessageBoxPopup.CloseAsync(); + if (OnClick != null) + await OnClick.Invoke(ButtonText[2], Tag); + } + private async Task Button3Click(MouseEventArgs arg) + { + // need to close before calling OnClick because OnClick may call ShowAsync again + await MessageBoxPopup.CloseAsync(); + if (OnClick != null) + await OnClick.Invoke(ButtonText[3], Tag); + } + + private async Task PopupClosed(PopupClosedEventArgs arg) + { + // need to close before calling OnClose because OnClose may call ShowAsync again + await MessageBoxPopup.CloseAsync(); + if (OnClose != null) + await OnClose.Invoke(Tag); + } + } +} \ No newline at end of file diff --git a/TIAMSharedUI/Shared/MainLayout.razor b/TIAMSharedUI/Shared/MainLayout.razor index 9c6109c8..79f22140 100644 --- a/TIAMSharedUI/Shared/MainLayout.razor +++ b/TIAMSharedUI/Shared/MainLayout.razor @@ -24,17 +24,20 @@
- - - @Body + + @Body +
+ + +
@code { - + public PopupMessageBox PopupMessageBox { get; private set; } = default!; } diff --git a/TIAMSharedUI/Shared/NavMenu.razor b/TIAMSharedUI/Shared/NavMenu.razor index 1779cda6..86641371 100644 --- a/TIAMSharedUI/Shared/NavMenu.razor +++ b/TIAMSharedUI/Shared/NavMenu.razor @@ -35,8 +35,7 @@ Counter - - +
-

Please type an address or swipe to select from preset destinations!

+

Please type an address or swipe to select from preset destinations!

+ -@{ - var jsOwlId = OwlId; - logToBrowserConsole.LogToBC(jsOwlId); -} @@ -136,6 +167,7 @@ protected override void OnParametersSet() { logToBrowserConsole.LogToBC($"SliderItemSelector is initialized with OwlId: {OwlId}"); + base.OnParametersSet(); } @@ -144,6 +176,8 @@ if(firstRender) { var dotNetObjRef = DotNetObjectReference.Create(this); + JSRuntime.InvokeVoidAsync("setOwlId", OwlId); + JSRuntime.InvokeVoidAsync("InitOwl", OwlId); JSRuntime.InvokeVoidAsync("CStoJSCall", dotNetObjRef); } diff --git a/TIAMSharedUI/Shared/SliderItemSelector.razor.css b/TIAMSharedUI/Shared/SliderItemSelector.razor.css index ce6e0992..e02abfc9 100644 --- a/TIAMSharedUI/Shared/SliderItemSelector.razor.css +++ b/TIAMSharedUI/Shared/SliderItemSelector.razor.css @@ -1,12 +1 @@ -#owl-selector .item { - height: 30vh; - overflow-y: hidden; - vertical-align: middle; - align-content: center; -} - - #owl-selector .item img { - display: block; - width: 100%; - height: auto; - } + diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index b02451b8..8067cd22 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -29,41 +29,78 @@ Home
+ + + + @if (expandSysAdminNav) + { +
+ + + +
+ } + + @if (expandHotelAdminNav) + { +
+ + + + +
+ } + + + + - - - + + + - + +