From b83598ab81d16cdeea9da972dcb0b9b6e769ed4c Mon Sep 17 00:00:00 2001 From: chmourgand Date: Sun, 13 Nov 2022 12:21:55 +0100 Subject: [PATCH] ajout de la partie edit et delete --- Sources/MyFirstBlazor/App.razor | 4 +- .../MyFirstBlazor/Factories/ItemFactory.cs | 48 ++++++++ .../Modals/DeleteConfirmation.razor | 10 ++ .../Modals/DeleteConfirmation.razor.cs | 38 ++++++ Sources/MyFirstBlazor/MyFirstBlazor.csproj | 1 + Sources/MyFirstBlazor/Pages/Edit.razor | 82 +++++++++++++ Sources/MyFirstBlazor/Pages/Edit.razor.cs | 111 ++++++++++++++++++ Sources/MyFirstBlazor/Pages/List.razor | 6 + Sources/MyFirstBlazor/Pages/List.razor.cs | 28 +++++ .../MyFirstBlazor/Pages/RouteParameter.razor | 13 ++ Sources/MyFirstBlazor/Pages/_Layout.cshtml | 2 + Sources/MyFirstBlazor/Program.cs | 2 + .../Services/DataLocalService.cs | 101 ++++++++++++++-- .../MyFirstBlazor/Services/IDataService.cs | 4 + Sources/MyFirstBlazor/_Imports.razor | 2 + 15 files changed, 440 insertions(+), 12 deletions(-) create mode 100644 Sources/MyFirstBlazor/Factories/ItemFactory.cs create mode 100644 Sources/MyFirstBlazor/Modals/DeleteConfirmation.razor create mode 100644 Sources/MyFirstBlazor/Modals/DeleteConfirmation.razor.cs create mode 100644 Sources/MyFirstBlazor/Pages/Edit.razor create mode 100644 Sources/MyFirstBlazor/Pages/Edit.razor.cs create mode 100644 Sources/MyFirstBlazor/Pages/RouteParameter.razor diff --git a/Sources/MyFirstBlazor/App.razor b/Sources/MyFirstBlazor/App.razor index 623580d..ffbdbf9 100644 --- a/Sources/MyFirstBlazor/App.razor +++ b/Sources/MyFirstBlazor/App.razor @@ -1,4 +1,5 @@ - + + @@ -10,3 +11,4 @@ + diff --git a/Sources/MyFirstBlazor/Factories/ItemFactory.cs b/Sources/MyFirstBlazor/Factories/ItemFactory.cs new file mode 100644 index 0000000..abfaadf --- /dev/null +++ b/Sources/MyFirstBlazor/Factories/ItemFactory.cs @@ -0,0 +1,48 @@ +using MyFirstBlazor.Models; + +namespace MyFirstBlazor.Factories +{ + public static class ItemFactory + { + public static ItemModel ToModel(Item item, byte[] imageContent) + { + return new ItemModel + { + Id = item.Id, + DisplayName = item.DisplayName, + Name = item.Name, + RepairWith = item.RepairWith, + EnchantCategories = item.EnchantCategories, + MaxDurability = item.MaxDurability, + StackSize = item.StackSize, + ImageContent = imageContent + }; + } + + public static Item Create(ItemModel model) + { + return new Item + { + Id = model.Id, + DisplayName = model.DisplayName, + Name = model.Name, + RepairWith = model.RepairWith, + EnchantCategories = model.EnchantCategories, + MaxDurability = model.MaxDurability, + StackSize = model.StackSize, + CreatedDate = DateTime.Now + }; + } + + public static void Update(Item item, ItemModel model) + { + item.DisplayName = model.DisplayName; + item.Name = model.Name; + item.RepairWith = model.RepairWith; + item.EnchantCategories = model.EnchantCategories; + item.MaxDurability = model.MaxDurability; + item.StackSize = model.StackSize; + item.UpdatedDate = DateTime.Now; + } + } +} diff --git a/Sources/MyFirstBlazor/Modals/DeleteConfirmation.razor b/Sources/MyFirstBlazor/Modals/DeleteConfirmation.razor new file mode 100644 index 0000000..93f7a46 --- /dev/null +++ b/Sources/MyFirstBlazor/Modals/DeleteConfirmation.razor @@ -0,0 +1,10 @@ +
+ +

+ Are you sure you want to delete @item.DisplayName ? +

+ + + + +
\ No newline at end of file diff --git a/Sources/MyFirstBlazor/Modals/DeleteConfirmation.razor.cs b/Sources/MyFirstBlazor/Modals/DeleteConfirmation.razor.cs new file mode 100644 index 0000000..6382acc --- /dev/null +++ b/Sources/MyFirstBlazor/Modals/DeleteConfirmation.razor.cs @@ -0,0 +1,38 @@ +using Blazored.Modal.Services; +using Blazored.Modal; +using Microsoft.AspNetCore.Components; +using MyFirstBlazor.Models; +using MyFirstBlazor.Services; + +namespace MyFirstBlazor.Modals +{ + public partial class DeleteConfirmation + { + [CascadingParameter] + public BlazoredModalInstance ModalInstance { get; set; } + + [Inject] + public IDataService DataService { get; set; } + + [Parameter] + public int Id { get; set; } + + private Item item = new Item(); + + protected override async Task OnInitializedAsync() + { + // Get the item + item = await DataService.GetById(Id); + } + + void ConfirmDelete() + { + ModalInstance.CloseAsync(ModalResult.Ok(true)); + } + + void Cancel() + { + ModalInstance.CancelAsync(); + } + } +} diff --git a/Sources/MyFirstBlazor/MyFirstBlazor.csproj b/Sources/MyFirstBlazor/MyFirstBlazor.csproj index 93b929d..f2eba01 100644 --- a/Sources/MyFirstBlazor/MyFirstBlazor.csproj +++ b/Sources/MyFirstBlazor/MyFirstBlazor.csproj @@ -8,6 +8,7 @@ + diff --git a/Sources/MyFirstBlazor/Pages/Edit.razor b/Sources/MyFirstBlazor/Pages/Edit.razor new file mode 100644 index 0000000..5544f1f --- /dev/null +++ b/Sources/MyFirstBlazor/Pages/Edit.razor @@ -0,0 +1,82 @@ +@page "/edit/{Id:int}" + +

Edit

+ + + + + +

+ +

+

+ +

+

+ +

+

+ +

+

+ Enchant categories: +

+ @foreach (var item in enchantCategories) + { + + } +
+

+

+ Repair with: +

+ @foreach (var item in repairWith) + { + + } +
+

+

+ +

+

+ +

+

+ +

+ + + diff --git a/Sources/MyFirstBlazor/Pages/Edit.razor.cs b/Sources/MyFirstBlazor/Pages/Edit.razor.cs new file mode 100644 index 0000000..6ac52b2 --- /dev/null +++ b/Sources/MyFirstBlazor/Pages/Edit.razor.cs @@ -0,0 +1,111 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Forms; +using MyFirstBlazor.Factories; +using MyFirstBlazor.Models; +using MyFirstBlazor.Services; + +namespace MyFirstBlazor.Pages +{ + public partial class Edit + { + [Parameter] + public int Id { get; set; } + + /// + /// The default enchant categories. + /// + private List enchantCategories = new List() { "armor", "armor_head", "armor_chest", "weapon", "digger", "breakable", "vanishable" }; + + /// + /// The current item model + /// + private ItemModel itemModel = new() + { + EnchantCategories = new List(), + RepairWith = new List() + }; + + /// + /// The default repair with. + /// + private List repairWith = new List() { "oak_planks", "spruce_planks", "birch_planks", "jungle_planks", "acacia_planks", "dark_oak_planks", "crimson_planks", "warped_planks" }; + + [Inject] + public IDataService DataService { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } + + [Inject] + public IWebHostEnvironment WebHostEnvironment { get; set; } + + protected override async Task OnInitializedAsync() + { + var item = await DataService.GetById(Id); + + var fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/default.png"); + + if (File.Exists($"{WebHostEnvironment.WebRootPath}/images/{itemModel.Name}.png")) + { + fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/{item.Name}.png"); + } + + // Set the model with the item + itemModel = ItemFactory.ToModel(item, fileContent); + } + + private async void HandleValidSubmit() + { + await DataService.Update(Id, itemModel); + + NavigationManager.NavigateTo("list"); + } + + private async Task LoadImage(InputFileChangeEventArgs e) + { + // Set the content of the image to the model + using (var memoryStream = new MemoryStream()) + { + await e.File.OpenReadStream().CopyToAsync(memoryStream); + itemModel.ImageContent = memoryStream.ToArray(); + } + } + + private void OnEnchantCategoriesChange(string item, object checkedValue) + { + if ((bool)checkedValue) + { + if (!itemModel.EnchantCategories.Contains(item)) + { + itemModel.EnchantCategories.Add(item); + } + + return; + } + + if (itemModel.EnchantCategories.Contains(item)) + { + itemModel.EnchantCategories.Remove(item); + } + } + + private void OnRepairWithChange(string item, object checkedValue) + { + if ((bool)checkedValue) + { + if (!itemModel.RepairWith.Contains(item)) + { + itemModel.RepairWith.Add(item); + } + + return; + } + + if (itemModel.RepairWith.Contains(item)) + { + itemModel.RepairWith.Remove(item); + } + } + + } +} diff --git a/Sources/MyFirstBlazor/Pages/List.razor b/Sources/MyFirstBlazor/Pages/List.razor index db80728..c39f860 100644 --- a/Sources/MyFirstBlazor/Pages/List.razor +++ b/Sources/MyFirstBlazor/Pages/List.razor @@ -44,4 +44,10 @@ + + + Editer + + + diff --git a/Sources/MyFirstBlazor/Pages/List.razor.cs b/Sources/MyFirstBlazor/Pages/List.razor.cs index 521a8fa..04ee24a 100644 --- a/Sources/MyFirstBlazor/Pages/List.razor.cs +++ b/Sources/MyFirstBlazor/Pages/List.razor.cs @@ -1,6 +1,9 @@ using Blazored.LocalStorage; +using Blazored.Modal; +using Blazored.Modal.Services; using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; +using MyFirstBlazor.Modals; using MyFirstBlazor.Models; using MyFirstBlazor.Services; @@ -18,6 +21,12 @@ namespace MyFirstBlazor.Pages [Inject] public IWebHostEnvironment WebHostEnvironment { get; set; } + [Inject] + public NavigationManager NavigationManager { get; set; } + + [CascadingParameter] + public IModalService Modal { get; set; } + private async Task OnReadData(DataGridReadDataEventArgs e) { if (e.CancellationToken.IsCancellationRequested) @@ -31,6 +40,25 @@ namespace MyFirstBlazor.Pages totalItem = await DataService.Count(); } } + private async Task OnDeleteAsync(int id) + { + var parameters = new ModalParameters(); + parameters.Add(nameof(Item.Id), id); + + var modal = Modal.Show("Delete Confirmation", parameters); + var result = await modal.Result; + + if (result.Cancelled) + { + return; + } + + await DataService.Delete(id); + + // Reload the page + NavigationManager.NavigateTo("list", true); + + } } } diff --git a/Sources/MyFirstBlazor/Pages/RouteParameter.razor b/Sources/MyFirstBlazor/Pages/RouteParameter.razor new file mode 100644 index 0000000..abe654e --- /dev/null +++ b/Sources/MyFirstBlazor/Pages/RouteParameter.razor @@ -0,0 +1,13 @@ +@page "/RouteParameter/{text?}" + +

Blazor is @Text!

+ +@code { + [Parameter] + public string? Text { get; set; } + + protected override void OnInitialized() + { + Text = Text ?? "fantastic"; + } +} \ No newline at end of file diff --git a/Sources/MyFirstBlazor/Pages/_Layout.cshtml b/Sources/MyFirstBlazor/Pages/_Layout.cshtml index 6f16388..31eca11 100644 --- a/Sources/MyFirstBlazor/Pages/_Layout.cshtml +++ b/Sources/MyFirstBlazor/Pages/_Layout.cshtml @@ -32,5 +32,7 @@ + + diff --git a/Sources/MyFirstBlazor/Program.cs b/Sources/MyFirstBlazor/Program.cs index d40326e..1d9bfde 100644 --- a/Sources/MyFirstBlazor/Program.cs +++ b/Sources/MyFirstBlazor/Program.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; using MyFirstBlazor.Data; using MyFirstBlazor.Services; +using Blazored.Modal; var builder = WebApplication.CreateBuilder(args); @@ -21,6 +22,7 @@ builder.Services .AddFontAwesomeIcons(); builder.Services.AddBlazoredLocalStorage(); builder.Services.AddScoped(); +builder.Services.AddBlazoredModal(); var app = builder.Build(); diff --git a/Sources/MyFirstBlazor/Services/DataLocalService.cs b/Sources/MyFirstBlazor/Services/DataLocalService.cs index 5087abc..b378ae5 100644 --- a/Sources/MyFirstBlazor/Services/DataLocalService.cs +++ b/Sources/MyFirstBlazor/Services/DataLocalService.cs @@ -1,5 +1,6 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; +using MyFirstBlazor.Factories; using MyFirstBlazor.Models; namespace MyFirstBlazor.Services @@ -32,17 +33,7 @@ namespace MyFirstBlazor.Services model.Id = currentData.Max(s => s.Id) + 1; // Add the item to the current data - currentData.Add(new Item - { - Id = model.Id, - DisplayName = model.DisplayName, - Name = model.Name, - RepairWith = model.RepairWith, - EnchantCategories = model.EnchantCategories, - MaxDurability = model.MaxDurability, - StackSize = model.StackSize, - CreatedDate = DateTime.Now - }); + currentData.Add(ItemFactory.Create(model)); // Save the image var imagePathInfo = new DirectoryInfo($"{_webHostEnvironment.WebRootPath}/images"); @@ -59,6 +50,8 @@ namespace MyFirstBlazor.Services // Write the file content await File.WriteAllBytesAsync(fileName.FullName, model.ImageContent); + + // Save the data await _localStorage.SetItemAsync("data", currentData); } @@ -83,5 +76,91 @@ namespace MyFirstBlazor.Services return (await _localStorage.GetItemAsync("data")).Skip((currentPage - 1) * pageSize).Take(pageSize).ToList(); } + public async Task GetById(int id) + { + // Get the current data + var currentData = await _localStorage.GetItemAsync>("data"); + + // Get the item int the list + var item = currentData.FirstOrDefault(w => w.Id == id); + + // Check if item exist + if (item == null) + { + throw new Exception($"Unable to found the item with ID: {id}"); + } + + return item; + } + + public async Task Update(int id, ItemModel model) + { + // Get the current data + var currentData = await _localStorage.GetItemAsync>("data"); + + // Get the item int the list + var item = currentData.FirstOrDefault(w => w.Id == id); + + // Check if item exist + if (item == null) + { + throw new Exception($"Unable to found the item with ID: {id}"); + } + + // Save the image + var imagePathInfo = new DirectoryInfo($"{_webHostEnvironment.WebRootPath}/images"); + + // Check if the folder "images" exist + if (!imagePathInfo.Exists) + { + imagePathInfo.Create(); + } + + // Delete the previous image + if (item.Name != model.Name) + { + var oldFileName = new FileInfo($"{imagePathInfo}/{item.Name}.png"); + + if (oldFileName.Exists) + { + File.Delete(oldFileName.FullName); + } + } + + // Determine the image name + var fileName = new FileInfo($"{imagePathInfo}/{model.Name}.png"); + + // Write the file content + await File.WriteAllBytesAsync(fileName.FullName, model.ImageContent); + + // Modify the content of the item + ItemFactory.Update(item, model); + + // Save the data + await _localStorage.SetItemAsync("data", currentData); + } + public async Task Delete(int id) + { + // Get the current data + var currentData = await _localStorage.GetItemAsync>("data"); + + // Get the item int the list + var item = currentData.FirstOrDefault(w => w.Id == id); + + // Delete item in + currentData.Remove(item); + + // Delete the image + var imagePathInfo = new DirectoryInfo($"{_webHostEnvironment.WebRootPath}/images"); + var fileName = new FileInfo($"{imagePathInfo}/{item.Name}.png"); + + if (fileName.Exists) + { + File.Delete(fileName.FullName); + } + + // Save the data + await _localStorage.SetItemAsync("data", currentData); + } } } diff --git a/Sources/MyFirstBlazor/Services/IDataService.cs b/Sources/MyFirstBlazor/Services/IDataService.cs index 2a061a7..8bcd2a7 100644 --- a/Sources/MyFirstBlazor/Services/IDataService.cs +++ b/Sources/MyFirstBlazor/Services/IDataService.cs @@ -9,5 +9,9 @@ namespace MyFirstBlazor.Services Task Count(); Task> List(int currentPage, int pageSize); + Task GetById(int id); + + Task Update(int id, ItemModel model); + Task Delete(int id); } } diff --git a/Sources/MyFirstBlazor/_Imports.razor b/Sources/MyFirstBlazor/_Imports.razor index c91e5ad..785a664 100644 --- a/Sources/MyFirstBlazor/_Imports.razor +++ b/Sources/MyFirstBlazor/_Imports.razor @@ -9,3 +9,5 @@ @using MyFirstBlazor @using MyFirstBlazor.Shared @using Blazorise.DataGrid +@using Blazored.Modal +@using Blazored.Modal.Services