From d3d25fa62d66939b723310bdd8b97b781132214f Mon Sep 17 00:00:00 2001 From: Mikhail Shabanov Date: Fri, 14 May 2021 13:29:07 +0200 Subject: [PATCH] chore: Some minor improvements --- .../Pages/SearchDialog.razor | 15 +++++++++++---- .../Pages/SearchDialogTypeBase.cs | 9 ++++++--- WotBlitzStatisticsPro.Blazor/Program.cs | 4 ++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialog.razor b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialog.razor index 3bcb9e9..db09ceb 100644 --- a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialog.razor +++ b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialog.razor @@ -1,16 +1,23 @@ @using WotBlitzStatisticsPro.Blazor.Model @inherits SearchDialogTypeBase - - + + + Style="height:335px; width: 100%; margin-top: 10px;" + Visible="@(!ComponentBusy)"> - OnOkButtonClick()) Text="Ok" Style="margin: 10px auto 10px auto; display: block; width: 150px; " /> + OnOkButtonClick()) + Text="Ok" + Visible="@(!ComponentBusy)" + Style="margin: 10px auto 10px auto; display: block; width: 150px; " /> diff --git a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs index d24c7a4..8b49ca6 100644 --- a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs +++ b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs @@ -33,6 +33,8 @@ namespace WotBlitzStatisticsPro.Blazor.Pages public long CurrentValue { get; set; } + public bool ComponentBusy { get; set; } = false; + public async Task OnSearchTextChange(string value) { if (DialogType == DialogType.FindPlayer && value.Length < 3) @@ -41,10 +43,9 @@ namespace WotBlitzStatisticsPro.Blazor.Pages } FilteredList.Clear(); + ComponentBusy = true; await InvokeAsync(StateHasChanged); - // ToDo: Add busy cursor - // ToDo: Move this call to a service var accounts = await WotBlitzStatisticsProClient.FindAccounts.ExecuteAsync(value, RealmType.Ru, RequestLanguage.En); @@ -58,8 +59,10 @@ namespace WotBlitzStatisticsPro.Blazor.Pages } - await InvokeAsync(StateHasChanged); } + + ComponentBusy = false; + await InvokeAsync(StateHasChanged); } public async Task OnOkButtonClick() diff --git a/WotBlitzStatisticsPro.Blazor/Program.cs b/WotBlitzStatisticsPro.Blazor/Program.cs index 1354d21..d123bcc 100644 --- a/WotBlitzStatisticsPro.Blazor/Program.cs +++ b/WotBlitzStatisticsPro.Blazor/Program.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.DependencyInjection; using System; +using System.Diagnostics; using System.Globalization; using System.Net.Http; using System.Threading.Tasks; @@ -30,11 +31,10 @@ namespace WotBlitzStatisticsPro.Blazor builder.Services.AddSingleton(); builder.Services.AddScoped(); - // ToDo: Find out URL // StrawberryShake GraphQL Client builder.Services .AddWotBlitzStatisticsProClient() - .ConfigureHttpClient(client => client.BaseAddress = new Uri($"https://localhost:5001/graphql/")); + .ConfigureHttpClient(client => client.BaseAddress = new Uri($"{builder.HostEnvironment.BaseAddress}graphql/")); var host = builder.Build();