From a0aff98cb83dc4f83fd5ab40e8538566d94e6ca2 Mon Sep 17 00:00:00 2001 From: "Jade.VAN_BRABANDT" Date: Sat, 16 Dec 2023 12:05:40 +0100 Subject: [PATCH] Feat: merge --- .../{ => Admins}/AddAdministrators.razor | 0 .../{ => Admins}/AddAdministrators.razor.cs | 2 +- .../Blazor/Pages/Chapters/AddChapter.razor.cs | 4 +- Blazor/Blazor/Pages/Chapters/Chapters.razor | 6 +- .../Blazor/Pages/Chapters/Chapters.razor.cs | 66 +++++++++++-------- 5 files changed, 44 insertions(+), 34 deletions(-) rename Blazor/Blazor/Pages/{ => Admins}/AddAdministrators.razor (100%) rename Blazor/Blazor/Pages/{ => Admins}/AddAdministrators.razor.cs (95%) diff --git a/Blazor/Blazor/Pages/AddAdministrators.razor b/Blazor/Blazor/Pages/Admins/AddAdministrators.razor similarity index 100% rename from Blazor/Blazor/Pages/AddAdministrators.razor rename to Blazor/Blazor/Pages/Admins/AddAdministrators.razor diff --git a/Blazor/Blazor/Pages/AddAdministrators.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs similarity index 95% rename from Blazor/Blazor/Pages/AddAdministrators.razor.cs rename to Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs index 222c73d..257062b 100644 --- a/Blazor/Blazor/Pages/AddAdministrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Components; using Blazor.Models; using Blazor.Services; -namespace Blazor.Pages +namespace Blazor.Pages.Admins { public partial class AddAdministrators { diff --git a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs index 67e2c17..6b03029 100644 --- a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs @@ -1,6 +1,4 @@ -using Blazored.LocalStorage; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components; using Blazor.Models; using Blazor.Services; diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor b/Blazor/Blazor/Pages/Chapters/Chapters.razor index 5529e1e..42ef967 100644 --- a/Blazor/Blazor/Pages/Chapters/Chapters.razor +++ b/Blazor/Blazor/Pages/Chapters/Chapters.razor @@ -1,7 +1,7 @@ @page "/chapters" @using Blazor.ViewClasses; @using Blazorise.DataGrid -@using Blazored.Modal; +@using Blazored.Modal;

Chapters

@@ -26,8 +26,8 @@ Editer - + - + \ No newline at end of file diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs index baf0437..28a8e0e 100644 --- a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs @@ -1,50 +1,62 @@ using Blazored.LocalStorage; using Blazor.Services; -using Blazor.Modals; -using Blazored.Modal; -using Blazored.Modal.Services; -using Blazor.ViewClasses; -using System.Text; -using Microsoft.JSInterop; -using Microsoft.AspNetCore.Components; +using Blazored.Modal.Services; +using Blazor.ViewClasses; +using System.Text; +using Microsoft.JSInterop; +using Microsoft.AspNetCore.Components; using Blazorise.DataGrid; using ChoETL; -using Microsoft.AspNetCore.Components; -using Microsoft.JSInterop; -using System.Text; -using Blazor.ViewClasses; using Microsoft.AspNetCore.Components.Forms; -using System.Linq; +using Blazor.Modals; +using Blazored.Modal; namespace Blazor.Pages.Chapters; public partial class Chapters -{ - public List chapters; +{ + public List chapters; private int totalChapter; - [Inject] - public NavigationManager NavigationManager { get; set; } - - [CascadingParameter] - public IModalService Modal { get; set; } - - [Inject] - public IDataService DataService { get; set; } + [Inject] + public NavigationManager NavigationManager { get; set; } + + [CascadingParameter] + public IModalService Modal { get; set; } + + [Inject] + public IDataService DataService { get; set; } public IWebHostEnvironment WebHostEnvironment { get; set; } - [Inject] + [Inject] public HttpClient Http { get; set; } [Inject] public ILocalStorageService LocalStorage { get; set; } - [Inject] - public NavigationManager NavigationManager { get; set; } - [Inject] public IJSRuntime IJSRuntime { get; set; } + private async void OnDelete(int id) + { + var parameters = new ModalParameters(); + parameters.Add(nameof(Chapter.Id), id); + + var modal = Modal.Show("Delete Confirmation", parameters); + var result = modal.Result; + + if (result.IsCanceled) + { + return; + } + + await DataService.Delete(id); + + // Reload the page + NavigationManager.NavigateTo("chapters", true); + } + + protected override async Task OnAfterRenderAsync(bool firstRender) { // Do not treat this action if is not the first render @@ -93,7 +105,7 @@ public partial class Chapters { csvFile.Write(jsonFile); } - } + } var sentFile = new MemoryStream(Encoding.UTF32.GetBytes(sb.ToString()));