From 945c85393f8e83c8e3aad72f88cc12d4bc236338 Mon Sep 17 00:00:00 2001 From: czf <2455501+czf@users.noreply.github.com> Date: Sun, 24 Jan 2021 18:41:48 -0800 Subject: [PATCH] Switching to relative paths clean up that was missed in previous commit --- .../ArtistPercentageOfArtistSongsPieChart.razor.cs | 2 +- .../SongPercentageOfArtistPieChart.razor.cs | 2 +- RadiocomDataViewApp/Pages/ArtistWork.razor | 6 +++--- RadiocomDataViewApp/Pages/ArtistWork.razor.cs | 4 +--- RadiocomDataViewApp/Pages/Index.razor | 7 ------- RadiocomDataViewApp/Program.cs | 11 ++--------- .../Shared/LayoutSiderContentNavMenu.razor | 4 ++-- 7 files changed, 10 insertions(+), 26 deletions(-) diff --git a/RadiocomDataViewApp/Components/ArtistCharts/ArtistPercentageOfArtistSongsPieChart.razor.cs b/RadiocomDataViewApp/Components/ArtistCharts/ArtistPercentageOfArtistSongsPieChart.razor.cs index 9eb7bf1..15de605 100644 --- a/RadiocomDataViewApp/Components/ArtistCharts/ArtistPercentageOfArtistSongsPieChart.razor.cs +++ b/RadiocomDataViewApp/Components/ArtistCharts/ArtistPercentageOfArtistSongsPieChart.razor.cs @@ -69,7 +69,7 @@ private ChartColor SliceColorGenerator (int index) => private void OnDashboardPieChartClick(DashboardChartMouseEventArgs eventArgs) { int songId = CurrentDataset[eventArgs.Index].ItemId; - NavManager.NavigateTo($"/artistwork/{songId}"); + NavManager.NavigateTo($"artistwork/{songId}"); } private string DashboardPieChartComponentTitle => $"Comparison of Songs by {ArtistName}"; diff --git a/RadiocomDataViewApp/Components/ArtistWorkCharts/SongPercentageOfArtistPieChart.razor.cs b/RadiocomDataViewApp/Components/ArtistWorkCharts/SongPercentageOfArtistPieChart.razor.cs index 4276e57..46164d9 100644 --- a/RadiocomDataViewApp/Components/ArtistWorkCharts/SongPercentageOfArtistPieChart.razor.cs +++ b/RadiocomDataViewApp/Components/ArtistWorkCharts/SongPercentageOfArtistPieChart.razor.cs @@ -69,7 +69,7 @@ private ChartColor SliceColorGenerator(int indx) } private void OnDashboardPieChartClick() { - NavManager.NavigateTo($"/artist/{ArtistId}/artistworks"); + NavManager.NavigateTo($"artist/{ArtistId}/artistworks"); } private static readonly ChartColor ViewedSongPieChartColor = ChartColor.FromRgba(255, 255, 255, 1);//white private static readonly ChartColor OtherSongsPieChartColor = ChartColor.FromRgba(104, 104, 103, 1);//grey diff --git a/RadiocomDataViewApp/Pages/ArtistWork.razor b/RadiocomDataViewApp/Pages/ArtistWork.razor index 436c6e4..320e3e0 100644 --- a/RadiocomDataViewApp/Pages/ArtistWork.razor +++ b/RadiocomDataViewApp/Pages/ArtistWork.razor @@ -4,9 +4,9 @@ {

@ArtistWorkName

- All Artists - @ArtistName - @ArtistWorkName + All Artists + @ArtistName + @ArtistWorkName diff --git a/RadiocomDataViewApp/Pages/ArtistWork.razor.cs b/RadiocomDataViewApp/Pages/ArtistWork.razor.cs index 655e2f1..013c250 100644 --- a/RadiocomDataViewApp/Pages/ArtistWork.razor.cs +++ b/RadiocomDataViewApp/Pages/ArtistWork.razor.cs @@ -22,9 +22,7 @@ public partial class ArtistWork : ComponentBase protected override Task OnParametersSetAsync() { - //await base.OnParametersSetAsync(); - //_artistWorkInfo = await RadiocomArtistWorkRepository.GetArtistWork(ArtistWorkId); - + return base.OnParametersSetAsync().ContinueWith(x => InvokeAsync(async () => _artistWorkInfo = (await RadiocomArtistWorkRepository.GetArtistWorkAsync(ArtistWorkId))) ).Unwrap(); diff --git a/RadiocomDataViewApp/Pages/Index.razor b/RadiocomDataViewApp/Pages/Index.razor index 936db6b..c193480 100644 --- a/RadiocomDataViewApp/Pages/Index.razor +++ b/RadiocomDataViewApp/Pages/Index.razor @@ -6,7 +6,6 @@ @inject IRadiocomDataAggregateDataClient RadiocomDataAggregateDataClient ; @using RadiocomDataViewApp.Components.IndexCharts; -@*

asdjfosadjf jfdios fjdsoapfjdsaif jdsiafjdisa pfdjsafpd jsaifodpsa jfidospafjd isop

*@ @@ -15,14 +14,8 @@ - @*Style="display:flex;flex-direction:column;"*@ - -
- -

@env.IsDevelopment

-
\ No newline at end of file diff --git a/RadiocomDataViewApp/Program.cs b/RadiocomDataViewApp/Program.cs index f607679..ffdbcce 100644 --- a/RadiocomDataViewApp/Program.cs +++ b/RadiocomDataViewApp/Program.cs @@ -55,8 +55,7 @@ public static async Task Main(string[] args) builder.Services.AddBlazoredLocalStorage(); string value =string.Empty; - value = (string)builder.Configuration.GetValue("version"); - Console.WriteLine($"version: {value}"); + Console.WriteLine($"WelcomeDate: {builder.Configuration.GetValue(CONFIGKEY_WELCOME_DATE)}"); var host = builder.Build(); host.Services .UseBootstrapProviders() @@ -65,13 +64,7 @@ public static async Task Main(string[] args) await host.RunAsync(); } - //public static temp() - //{ - - // System.Security.Cryptography.SHA256Managed. - // System.Security.Cryptography.SHA256. - - //} + } public class EnvironmentService { diff --git a/RadiocomDataViewApp/Shared/LayoutSiderContentNavMenu.razor b/RadiocomDataViewApp/Shared/LayoutSiderContentNavMenu.razor index ea251cd..45e697e 100644 --- a/RadiocomDataViewApp/Shared/LayoutSiderContentNavMenu.razor +++ b/RadiocomDataViewApp/Shared/LayoutSiderContentNavMenu.razor @@ -20,13 +20,13 @@ - + Songs - + Artists