diff --git a/Sources/BlazorApp/.vs/BlazorApp/DesignTimeBuild/.dtbcache.v2 b/Sources/BlazorApp/.vs/BlazorApp/DesignTimeBuild/.dtbcache.v2 index 53e19df..7c560b8 100644 Binary files a/Sources/BlazorApp/.vs/BlazorApp/DesignTimeBuild/.dtbcache.v2 and b/Sources/BlazorApp/.vs/BlazorApp/DesignTimeBuild/.dtbcache.v2 differ diff --git a/Sources/BlazorApp/.vs/BlazorApp/v17/.suo b/Sources/BlazorApp/.vs/BlazorApp/v17/.suo index 960ca8c..7e97e23 100644 Binary files a/Sources/BlazorApp/.vs/BlazorApp/v17/.suo and b/Sources/BlazorApp/.vs/BlazorApp/v17/.suo differ diff --git a/Sources/BlazorApp/BlazorApp/BlazorApp.csproj b/Sources/BlazorApp/BlazorApp/BlazorApp.csproj index 58db655..4b7dd81 100644 --- a/Sources/BlazorApp/BlazorApp/BlazorApp.csproj +++ b/Sources/BlazorApp/BlazorApp/BlazorApp.csproj @@ -19,6 +19,7 @@ + @@ -30,4 +31,10 @@ + + + + + + diff --git a/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor b/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor index d196fee..912812d 100644 --- a/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor +++ b/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor @@ -54,7 +54,7 @@ - + diff --git a/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor.cs b/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor.cs index db37d89..438ff6a 100644 --- a/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor.cs +++ b/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor.cs @@ -1,8 +1,10 @@ using BlazorApp.Models; +using BlazorApp.Pages; using BlazorApp.Services; using Blazorise; using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Localization; using Microsoft.JSInterop; using System.Collections.ObjectModel; using System.Collections.Specialized; @@ -14,6 +16,8 @@ namespace BlazorApp.Components [Inject] public IDataService DataService { get; set; } + + private int totalItem; public Item CurrentDragItem { get; set; } @@ -76,11 +80,13 @@ namespace BlazorApp.Components { Items.Sort((x, y) => x.Id.CompareTo(y.Id)); choiceSort = !choiceSort; + Actions.Add(new InventoryAction { Action = "Sort by Id" }); } else { Items.Sort((x, y) => x.Name.CompareTo(y.Name)); choiceSort = !choiceSort; + Actions.Add(new InventoryAction { Action = "Sort by Name" }); } } diff --git a/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor b/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor index 3f46daa..4b59025 100644 --- a/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor +++ b/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor @@ -1,7 +1,7 @@ @page "/inventory" @using System.Globalization @using BlazorApp.Components -

My Inventory

+

@Localizer["Title"]

diff --git a/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor.cs b/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor.cs index 8269ca5..6b87ead 100644 --- a/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor.cs +++ b/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor.cs @@ -5,17 +5,20 @@ using BlazorApp.Models; using BlazorApp.Services; using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Localization; -namespace BlazorApp.Pages -{ +namespace BlazorApp.Pages; public partial class Inventory { [Inject] public IDataService DataService { get; set; } private int totalItem; + [Inject] + public IStringLocalizer Localizer { get; set; } - public List Items { get; set; } = new List(); + private string? title; + public List Items { get; set; } = new List(); protected override async Task OnAfterRenderAsync(bool firstRender) { @@ -25,8 +28,7 @@ namespace BlazorApp.Pages { return; } - - Items = await DataService.List(0, await DataService.Count()); + Items = await DataService.List(0, await DataService.Count()); StateHasChanged(); } @@ -44,4 +46,4 @@ namespace BlazorApp.Pages } } } -} + diff --git a/Sources/BlazorApp/BlazorApp/Pages/List.razor.cs b/Sources/BlazorApp/BlazorApp/Pages/List.razor.cs index 370d201..0e5ca5f 100644 --- a/Sources/BlazorApp/BlazorApp/Pages/List.razor.cs +++ b/Sources/BlazorApp/BlazorApp/Pages/List.razor.cs @@ -12,12 +12,12 @@ namespace BlazorApp.Pages; public partial class List { + [Inject] + public IStringLocalizer Localizer { get; set; } private List items; private int totalItem; - [Inject] - public IStringLocalizer Localizer { get; set; } [Inject] public IDataService DataService { get; set; } diff --git a/Sources/BlazorApp/BlazorApp/Ressources/Pages.List.en-US.resx b/Sources/BlazorApp/BlazorApp/Ressources/Pages.List.en-US.resx new file mode 100644 index 0000000..75c79be --- /dev/null +++ b/Sources/BlazorApp/BlazorApp/Ressources/Pages.List.en-US.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + List of elements + + \ No newline at end of file diff --git a/Sources/BlazorApp/BlazorApp/Shared/NavMenu.razor b/Sources/BlazorApp/BlazorApp/Shared/NavMenu.razor index bf25669..ebbef0a 100644 --- a/Sources/BlazorApp/BlazorApp/Shared/NavMenu.razor +++ b/Sources/BlazorApp/BlazorApp/Shared/NavMenu.razor @@ -1,6 +1,6 @@