From 0a9f7db73628ae4d23e42fc499078211c68d4ec4 Mon Sep 17 00:00:00 2001 From: samuel Date: Thu, 21 Dec 2023 09:25:02 +0100 Subject: [PATCH 1/4] bootstrap --- AdminPanel.csproj | 11 +++++++ Components/TeamComponents.cs | 6 ++++ Components/UserComponent.razor | 2 +- Models/Team.cs | 6 ++++ Pages/TeamListPanel.razor | 36 +++++++++++++++++++--- Pages/TeamListPanel.razor.cs | 49 ++++++++++++++++++++++++++++++ Pages/TeamListPanel.razor.cs.razor | 4 +++ Pages/UserListPanel.razor.cs | 1 + Program.cs | 5 ++- Services/HttpTeamService.cs | 34 +++++++++++++++++++++ Services/ITeamService.cs | 10 ++++++ Shared/MainLayout.razor | 5 +++ Shared/NavMenu.razor | 9 ++++-- wwwroot/index.html | 1 + 14 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 Components/TeamComponents.cs create mode 100644 Models/Team.cs create mode 100644 Pages/TeamListPanel.razor.cs create mode 100644 Pages/TeamListPanel.razor.cs.razor create mode 100644 Services/HttpTeamService.cs create mode 100644 Services/ITeamService.cs diff --git a/AdminPanel.csproj b/AdminPanel.csproj index d5bc199..030c8ad 100644 --- a/AdminPanel.csproj +++ b/AdminPanel.csproj @@ -18,6 +18,9 @@ + + + @@ -27,4 +30,12 @@ + + + + + + + + diff --git a/Components/TeamComponents.cs b/Components/TeamComponents.cs new file mode 100644 index 0000000..6e17512 --- /dev/null +++ b/Components/TeamComponents.cs @@ -0,0 +1,6 @@ +namespace AdminPanel.Components; + +public class TeamComponents +{ + +} \ No newline at end of file diff --git a/Components/UserComponent.razor b/Components/UserComponent.razor index b33f1f9..c3562ea 100644 --- a/Components/UserComponent.razor +++ b/Components/UserComponent.razor @@ -1,5 +1,4 @@ 
- @if (@User.IsAdmin) {

Administrator @User.Name

@@ -8,6 +7,7 @@ {

@User.Name

} +

email: @User.Email

id: @User.Id

diff --git a/Models/Team.cs b/Models/Team.cs new file mode 100644 index 0000000..4794ee3 --- /dev/null +++ b/Models/Team.cs @@ -0,0 +1,6 @@ +namespace AdminPanel.Models; + +public record Team(string Name, string Picture, string MainColor, string SecondColor) +{ + +} \ No newline at end of file diff --git a/Pages/TeamListPanel.razor b/Pages/TeamListPanel.razor index de789a1..83dd9d7 100644 --- a/Pages/TeamListPanel.razor +++ b/Pages/TeamListPanel.razor @@ -1,10 +1,36 @@ @page "/teams" +@using AdminPanel.Models Teams Panel -

TeamListPanel

- -@code { - -} + +
+ + + + + +
+ Apply +
+ + Close +
+ + + + Ajouter + + + + + + + + + + + + + diff --git a/Pages/TeamListPanel.razor.cs b/Pages/TeamListPanel.razor.cs new file mode 100644 index 0000000..c440753 --- /dev/null +++ b/Pages/TeamListPanel.razor.cs @@ -0,0 +1,49 @@ +using System.Net.Http.Json; +using AdminPanel.Models; +using AdminPanel.Services; +using Microsoft.AspNetCore.Components; +using MudBlazor; + +namespace AdminPanel.Pages; + +public partial class TeamListPanel +{ + [Inject] + private ITeamService TeamService { get; init; } + private bool _isOpen; + + private string? FormName { get; set; } + private string? FormPicture { get; set; } + private string? FormMainColor { get; set; } + private string? FormSecondaryColor { get; set; } + + private MudForm form; + bool success; + string[] errors = { }; + MudTextField pwField1; + + + private async Task> GetTeamsFromServer(GridState state) + { + var (count, teams) = await TeamService.ListTeam((uint)(state.Page * state.PageSize), (uint)state.PageSize); + return new GridData + { + TotalItems = (int) count, + Items = teams + }; + } + private void ToggleOpen() + { + if (_isOpen) + _isOpen = false; + else + _isOpen = true; + } + + private async void AddTeam() + { + await TeamService.AddTeam(FormName!,FormPicture!,FormMainColor!,FormSecondaryColor!); + } +} + + diff --git a/Pages/TeamListPanel.razor.cs.razor b/Pages/TeamListPanel.razor.cs.razor new file mode 100644 index 0000000..5de522e --- /dev/null +++ b/Pages/TeamListPanel.razor.cs.razor @@ -0,0 +1,4 @@ +

TeamListPanel_razor_cs

+ +@code { + } \ No newline at end of file diff --git a/Pages/UserListPanel.razor.cs b/Pages/UserListPanel.razor.cs index f4eff47..45eaaa6 100644 --- a/Pages/UserListPanel.razor.cs +++ b/Pages/UserListPanel.razor.cs @@ -74,6 +74,7 @@ namespace AdminPanel.Pages } } + private void ShowErrors(ServiceException e) { foreach (var erronedArgument in e.ArgumentMessages) diff --git a/Program.cs b/Program.cs index 91dd8e2..a4c2a12 100644 --- a/Program.cs +++ b/Program.cs @@ -1,5 +1,4 @@ using AdminPanel; -using AdminPanel.Pages; using AdminPanel.Services; using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; @@ -8,7 +7,6 @@ using MudBlazor.Services; var builder = WebAssemblyHostBuilder.CreateDefault(args); builder.RootComponents.Add("#app"); builder.RootComponents.Add("head::after"); - builder.Services .AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); @@ -25,4 +23,5 @@ builder.Services.AddScoped(sp => new HttpUsersService(client)); builder.Services.AddMudServices(); -await builder.Build().RunAsync(); \ No newline at end of file +await builder.Build().RunAsync(); + diff --git a/Services/HttpTeamService.cs b/Services/HttpTeamService.cs new file mode 100644 index 0000000..0b0f1a5 --- /dev/null +++ b/Services/HttpTeamService.cs @@ -0,0 +1,34 @@ +using System.Net.Http.Json; +using AdminPanel.Models; + +namespace AdminPanel.Services; + +public class HttpTeamService : ITeamService +{ + + private readonly HttpClient _client; + + public HttpTeamService(HttpClient client) + { + this._client = client; + } + + private record ListTeamResponse(uint TotalCount, List Teams); + + public async Task<(uint, List)> ListTeam(uint from, uint count) + { + var httpResponse = await _client.GetAsync($"/api/admin/list-team?start={from}&n={count}"); + httpResponse.EnsureSuccessStatusCode(); + var response = await httpResponse.Content.ReadFromJsonAsync()!; + + return (response.TotalCount, response.Teams); + } + + private record AddTeamRequest(string Name, string Picture, string MainColor, string SecondaryColor); + + public async Task AddTeam(string name, string Picture, string mainColor, string secondaryColor) + { + var httpResponse = await _client.PostAsJsonAsync($"/api/admin/add-team", new AddTeamRequest(name,Picture,mainColor,secondaryColor)); + httpResponse.EnsureSuccessStatusCode(); + } +} \ No newline at end of file diff --git a/Services/ITeamService.cs b/Services/ITeamService.cs new file mode 100644 index 0000000..c1ac34b --- /dev/null +++ b/Services/ITeamService.cs @@ -0,0 +1,10 @@ +using AdminPanel.Models; + +namespace AdminPanel.Services; + +public interface ITeamService +{ + public Task<(uint, List)> ListTeam(uint from, uint count); + public Task AddTeam(string name, string Picture, string mainColor, string secondaryColor); + +} \ No newline at end of file diff --git a/Shared/MainLayout.razor b/Shared/MainLayout.razor index dc88df5..c601bdc 100644 --- a/Shared/MainLayout.razor +++ b/Shared/MainLayout.razor @@ -4,6 +4,11 @@ + + + + +
diff --git a/Shared/NavMenu.razor b/Shared/NavMenu.razor index 51db3dd..fedc92f 100644 --- a/Shared/NavMenu.razor +++ b/Shared/NavMenu.razor @@ -15,8 +15,13 @@
- - Users + + Users + +
+
+ + Teams
diff --git a/wwwroot/index.html b/wwwroot/index.html index 74fb073..7d18a24 100644 --- a/wwwroot/index.html +++ b/wwwroot/index.html @@ -16,6 +16,7 @@ + -- 2.36.3 From 98e6386d36ac4316428c82ad09fbc34b9cf4c6a5 Mon Sep 17 00:00:00 2001 From: samuel Date: Tue, 16 Jan 2024 14:41:00 +0100 Subject: [PATCH 2/4] button add is OK --- Pages/TeamListPanel.razor | 2 +- Pages/TeamListPanel.razor.cs | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Pages/TeamListPanel.razor b/Pages/TeamListPanel.razor index 83dd9d7..862dbc6 100644 --- a/Pages/TeamListPanel.razor +++ b/Pages/TeamListPanel.razor @@ -12,7 +12,7 @@
- Apply + Apply
Close diff --git a/Pages/TeamListPanel.razor.cs b/Pages/TeamListPanel.razor.cs index c440753..374a178 100644 --- a/Pages/TeamListPanel.razor.cs +++ b/Pages/TeamListPanel.razor.cs @@ -11,16 +11,16 @@ public partial class TeamListPanel [Inject] private ITeamService TeamService { get; init; } private bool _isOpen; + private MudForm form; + bool success; + string[] errors = { }; private string? FormName { get; set; } private string? FormPicture { get; set; } private string? FormMainColor { get; set; } private string? FormSecondaryColor { get; set; } - private MudForm form; - bool success; - string[] errors = { }; - MudTextField pwField1; + private async Task> GetTeamsFromServer(GridState state) @@ -33,17 +33,20 @@ public partial class TeamListPanel }; } private void ToggleOpen() - { - if (_isOpen) - _isOpen = false; - else - _isOpen = true; + { + _isOpen = !(_isOpen); } private async void AddTeam() { await TeamService.AddTeam(FormName!,FormPicture!,FormMainColor!,FormSecondaryColor!); } + + private void AddTeamConfirmed() + { + AddTeam(); + ToggleOpen(); + } } -- 2.36.3 From 39ed6a9ac7306bbbbbd3d7026e1edfbd0386ad9e Mon Sep 17 00:00:00 2001 From: samuel Date: Wed, 17 Jan 2024 17:37:15 +0100 Subject: [PATCH 3/4] WIP --- Models/Team.cs | 2 +- Pages/DisplayUtils.cs | 24 +++++++++ Pages/TeamListPanel.razor | 102 +++++++++++++++++++++++++++++------ Pages/TeamListPanel.razor.cs | 97 ++++++++++++++++++++++++++------- Pages/UserListPanel.razor.cs | 24 ++------- Program.cs | 1 + Services/ErrorsUtils.cs | 27 ++++++++++ Services/HttpTeamService.cs | 24 +++++++-- Services/HttpUsersService.cs | 31 ++--------- Services/ITeamService.cs | 4 +- Services/ServiceException.cs | 7 ++- Shared/MainLayout.razor | 5 -- 12 files changed, 254 insertions(+), 94 deletions(-) create mode 100644 Pages/DisplayUtils.cs create mode 100644 Services/ErrorsUtils.cs diff --git a/Models/Team.cs b/Models/Team.cs index 4794ee3..b4f7f20 100644 --- a/Models/Team.cs +++ b/Models/Team.cs @@ -1,6 +1,6 @@ namespace AdminPanel.Models; -public record Team(string Name, string Picture, string MainColor, string SecondColor) +public record Team(uint Id, string Name, string Picture, string MainColor, string SecondColor) { } \ No newline at end of file diff --git a/Pages/DisplayUtils.cs b/Pages/DisplayUtils.cs new file mode 100644 index 0000000..fd30ce9 --- /dev/null +++ b/Pages/DisplayUtils.cs @@ -0,0 +1,24 @@ +using System.Text; +using AdminPanel.Services; +using MudBlazor; + +namespace AdminPanel.Pages; + +public class DisplayUtils +{ + public static void ShowErrors(ServiceException e, ISnackbar snackbar) + { + foreach (var erronedArgument in e.ArgumentMessages) + { + var sb = new StringBuilder(erronedArgument.Key); + sb.Append(" :"); + + foreach (var message in erronedArgument.Value) + { + sb.Append("\n\t-"); + sb.Append(message); + } + snackbar.Add(sb.ToString()); + } + } +} \ No newline at end of file diff --git a/Pages/TeamListPanel.razor b/Pages/TeamListPanel.razor index 862dbc6..b6b5659 100644 --- a/Pages/TeamListPanel.razor +++ b/Pages/TeamListPanel.razor @@ -1,16 +1,40 @@ @page "/teams" @using AdminPanel.Models +@using DataGridEditMode = MudBlazor.DataGridEditMode Teams Panel - +

Team Panel

+ + +
- - - - - + + + + +
Apply
@@ -18,19 +42,65 @@ Close
+ - - Ajouter - - - + + +
+ + Add Team +
+
+ + Remove selection +
+ + + Teams + + + + + + +
+ +

Are you sure you want to delete this team(s)?

+ +
+ Confirm + Close +
+
+ + + - - - - + + + + + + + + + + - + diff --git a/Pages/TeamListPanel.razor.cs b/Pages/TeamListPanel.razor.cs index 374a178..c3c8dd1 100644 --- a/Pages/TeamListPanel.razor.cs +++ b/Pages/TeamListPanel.razor.cs @@ -1,6 +1,8 @@ -using System.Net.Http.Json; +using System.ComponentModel.DataAnnotations; +using System.Text; using AdminPanel.Models; using AdminPanel.Services; +using Blazorise.Extensions; using Microsoft.AspNetCore.Components; using MudBlazor; @@ -8,45 +10,100 @@ namespace AdminPanel.Pages; public partial class TeamListPanel { - [Inject] - private ITeamService TeamService { get; init; } - private bool _isOpen; - private MudForm form; - bool success; - string[] errors = { }; - + [Inject] private ISnackbar Snackbar { get; init; } + [Inject] private ITeamService TeamService { get; init; } + private bool _isOpenAdd; + private bool _isOpenConf; + private bool success; + private string[] errors = { }; + + [StringLength(1,ErrorMessage = "Nombre de caractères minimal : 1 ")] private string? FormName { get; set; } + + [RegularExpression(@"(https:\/\/www\.|http:\/\/www\.|https:\/\/|http:\/\/)?[a-zA-Z0-9]{2,}\.[a-zA-Z0-9]{2,}\.[a-zA-Z0-9]{2,}(\.[a-zA-Z0-9]{2,})?", ErrorMessage = "L'image doit être le lien d'une image sur le web")] private string? FormPicture { get; set; } + + [RegularExpression(@"(/#[0-9a-f]{6})",ErrorMessage = "La couleur principale doit être un code hexadécimal")] private string? FormMainColor { get; set; } - private string? FormSecondaryColor { get; set; } - - + [RegularExpression(@"(/#[0-9a-f]{6})",ErrorMessage = "La couleur secondaire doit être un code hexadécimal")] + private string? FormSecondaryColor { get; set; } + private MudDataGrid? Grid { get; set; } + private HashSet SelectedTeams { get; set; } = new(); + + private void UnBindForm() + { + FormName = null; + FormPicture = null; + FormMainColor = null; + FormSecondaryColor = null; + } private async Task> GetTeamsFromServer(GridState state) { var (count, teams) = await TeamService.ListTeam((uint)(state.Page * state.PageSize), (uint)state.PageSize); return new GridData { - TotalItems = (int) count, + TotalItems = (int)count, Items = teams }; } + private void ToggleOpen() - { - _isOpen = !(_isOpen); + { + _isOpenAdd = !(_isOpenAdd); } - - private async void AddTeam() + + private void ToggleOpenConfirmation() { - await TeamService.AddTeam(FormName!,FormPicture!,FormMainColor!,FormSecondaryColor!); + _isOpenConf = !(_isOpenConf); } - private void AddTeamConfirmed() + private async Task AddTeam() { - AddTeam(); + try + { + await TeamService.AddTeam(FormName!, FormPicture!, FormMainColor!, FormSecondaryColor!); + } + catch (ServiceException err) + { + DisplayUtils.ShowErrors(err,Snackbar); + } + } + + private async void AddTeamConfirmed() + { + await AddTeam(); ToggleOpen(); + await Grid!.ReloadServerData(); + UnBindForm(); } -} + private async void DeleteSelectedTeams() + { + if (!SelectedTeams.IsNullOrEmpty()) + { + var ids = SelectedTeams.ToList().ConvertAll(team => team.Id); + await TeamService.DeleteTeams(ids); + await Grid!.ReloadServerData(); + } + CloseToggleConf(); + } + private void CloseToggleConf() + { + _isOpenConf = false; + } + + private async void OnTeamUpdated(Team t) + { + try + { + await TeamService.UpdateTeam(t); + } + catch (ServiceException err) + { + DisplayUtils.ShowErrors(err,Snackbar); + } + } +} \ No newline at end of file diff --git a/Pages/UserListPanel.razor.cs b/Pages/UserListPanel.razor.cs index 45eaaa6..3b3d51d 100644 --- a/Pages/UserListPanel.razor.cs +++ b/Pages/UserListPanel.razor.cs @@ -52,7 +52,7 @@ namespace AdminPanel.Pages } catch (ServiceException err) { - ShowErrors(err); + DisplayUtils.ShowErrors(err,Snackbar); } } @@ -70,26 +70,10 @@ namespace AdminPanel.Pages } catch (ServiceException err) { - ShowErrors(err); - } - } - - - private void ShowErrors(ServiceException e) - { - foreach (var erronedArgument in e.ArgumentMessages) - { - var sb = new StringBuilder(erronedArgument.Key); - sb.Append(" :"); - - foreach (var message in erronedArgument.Value) - { - sb.Append("\n\t-"); - sb.Append(message); - } - Snackbar.Add(sb.ToString()); + DisplayUtils.ShowErrors(err,Snackbar); } } + private async void RemoveSelection(MouseEventArgs e) { @@ -102,7 +86,7 @@ namespace AdminPanel.Pages } catch (ServiceException err) { - ShowErrors(err); + DisplayUtils.ShowErrors(err,Snackbar); } } diff --git a/Program.cs b/Program.cs index a4c2a12..ae3bdd6 100644 --- a/Program.cs +++ b/Program.cs @@ -19,6 +19,7 @@ var client = new HttpClient builder.Services.AddScoped(sp => new HttpUsersService(client)); //builder.Services.AddScoped(); +builder.Services.AddScoped(sp => new HttpTeamService(client)); builder.Services.AddMudServices(); diff --git a/Services/ErrorsUtils.cs b/Services/ErrorsUtils.cs new file mode 100644 index 0000000..62c3e8c --- /dev/null +++ b/Services/ErrorsUtils.cs @@ -0,0 +1,27 @@ +using System.Net; +using System.Net.Http.Json; + +namespace AdminPanel.Services; + +public class ErrorsUtils +{ + private record ServerErrorMessageDto(string? Field, string? Error, string Message); + + public static async Task EnsureResponseIsOk(HttpResponseMessage response) + { + if (response.StatusCode == HttpStatusCode.OK) + { + return; + } + + var content = await response.Content.ReadFromJsonAsync(); + var messages = content! + .GroupBy(e => e.Field ?? e.Error!) + .ToDictionary( + g => g.Key, + g => g.ToList().ConvertAll(e => e.Message) + ); + + throw new ServiceException("Server refused request", messages); + } +} \ No newline at end of file diff --git a/Services/HttpTeamService.cs b/Services/HttpTeamService.cs index 0b0f1a5..6f38f26 100644 --- a/Services/HttpTeamService.cs +++ b/Services/HttpTeamService.cs @@ -24,11 +24,27 @@ public class HttpTeamService : ITeamService return (response.TotalCount, response.Teams); } - private record AddTeamRequest(string Name, string Picture, string MainColor, string SecondaryColor); + private record AddTeamDTORequest(string Name, string Picture, string MainColor, string SecondaryColor); - public async Task AddTeam(string name, string Picture, string mainColor, string secondaryColor) + public async Task AddTeam(string name, string picture, string mainColor, string secondaryColor) { - var httpResponse = await _client.PostAsJsonAsync($"/api/admin/add-team", new AddTeamRequest(name,Picture,mainColor,secondaryColor)); - httpResponse.EnsureSuccessStatusCode(); + var httpResponse = await _client.PostAsJsonAsync($"/api/admin/add-team", new AddTeamDTORequest(name,picture,mainColor,secondaryColor)); + await ErrorsUtils.EnsureResponseIsOk(httpResponse); + } + + private record DeleteTeamsDTORequest(List Teams); + public async Task DeleteTeams(List teams) + { + var httpResponse = await _client.PostAsJsonAsync($"/api/admin/delete-teams", new DeleteTeamsDTORequest(teams)); + await ErrorsUtils.EnsureResponseIsOk(httpResponse); + + } + + private record UpdateTeamDTORequest(uint Id, string Name, string Picture, string MainColor, string SecondaryColor); + public async Task UpdateTeam(Team team) + { + var httpResponse = await _client.PostAsJsonAsync($"/api/admin/team/{team.Id}/update", + new UpdateTeamDTORequest(team.Id, team.Name, team.Picture, team.MainColor, team.SecondColor) ); + await ErrorsUtils.EnsureResponseIsOk(httpResponse); } } \ No newline at end of file diff --git a/Services/HttpUsersService.cs b/Services/HttpUsersService.cs index 824fefd..3582edc 100644 --- a/Services/HttpUsersService.cs +++ b/Services/HttpUsersService.cs @@ -13,35 +13,14 @@ public class HttpUsersService : IUsersService { this.Client = client; } - - private record ServerErrorMessageDto(string? Field, string? Error, string Message); - - private async Task EnsureResponseIsOk(HttpResponseMessage response) - { - - if (response.StatusCode == HttpStatusCode.OK) - { - return; - } - - var content = await response.Content.ReadFromJsonAsync(); - var messages = content! - .GroupBy(e => e.Field ?? e.Error!) - .ToDictionary( - g => g.Key, - g => g.ToList().ConvertAll(e => e.Message) - ); - - throw new ServiceException("Server refused request", messages); - } - + private record ListUsersResponseDto(List Users, uint TotalCount); public async Task<(uint, List)> ListUsers(uint from, uint len, string? searchString = null) { var httpResponse = await Client.GetAsync($"/api/admin/list-users?start={from}&n={len}&search={searchString ?? ""}"); - await EnsureResponseIsOk(httpResponse); + await ErrorsUtils.EnsureResponseIsOk(httpResponse); var response = await httpResponse.Content.ReadFromJsonAsync() ?? throw new Exception("Received non-parseable json from server"); @@ -58,7 +37,7 @@ public class HttpUsersService : IUsersService var httpResponse = await Client.PostAsJsonAsync("/api/admin/user/add", new AddUserRequestDto(username, email, password, isAdmin)); - await EnsureResponseIsOk(httpResponse); + await ErrorsUtils.EnsureResponseIsOk(httpResponse); var response = await httpResponse.Content.ReadFromJsonAsync() ?? throw new Exception("Received non-parseable json from server"); @@ -79,7 +58,7 @@ public class HttpUsersService : IUsersService var httpResponse = await Client.PostAsJsonAsync("/api/admin/user/remove-all", new RemoveUsersRequestDto(userIds.ToArray())); - await EnsureResponseIsOk(httpResponse); + await ErrorsUtils.EnsureResponseIsOk(httpResponse); } private record UpdateUserRequestDto(string Email, string Username, bool IsAdmin); @@ -88,6 +67,6 @@ public class HttpUsersService : IUsersService { var httpResponse = await Client.PostAsJsonAsync($"/api/admin/user/{user.Id}/update", new UpdateUserRequestDto(user.Email, user.Name, user.IsAdmin)); - await EnsureResponseIsOk(httpResponse); + await ErrorsUtils.EnsureResponseIsOk(httpResponse); } } \ No newline at end of file diff --git a/Services/ITeamService.cs b/Services/ITeamService.cs index c1ac34b..163d883 100644 --- a/Services/ITeamService.cs +++ b/Services/ITeamService.cs @@ -5,6 +5,8 @@ namespace AdminPanel.Services; public interface ITeamService { public Task<(uint, List)> ListTeam(uint from, uint count); - public Task AddTeam(string name, string Picture, string mainColor, string secondaryColor); + public Task AddTeam(string name, string picture, string mainColor, string secondaryColor); + public Task DeleteTeams(List teams); + public Task UpdateTeam(Team team); } \ No newline at end of file diff --git a/Services/ServiceException.cs b/Services/ServiceException.cs index 8dbcb00..853efac 100644 --- a/Services/ServiceException.cs +++ b/Services/ServiceException.cs @@ -1,6 +1,9 @@ +using System.Net; +using System.Net.Http.Json; + namespace AdminPanel.Services; -class ServiceException : Exception +public class ServiceException : Exception { public Dictionary> ArgumentMessages { get; init; } @@ -15,4 +18,6 @@ class ServiceException : Exception { ArgumentMessages = arguments; } + + } \ No newline at end of file diff --git a/Shared/MainLayout.razor b/Shared/MainLayout.razor index c601bdc..dc88df5 100644 --- a/Shared/MainLayout.razor +++ b/Shared/MainLayout.razor @@ -4,11 +4,6 @@ - - - - -
-- 2.36.3 From dd7a3ee1d271d48b706de1659691988e3dd9a6f9 Mon Sep 17 00:00:00 2001 From: sam Date: Wed, 31 Jan 2024 19:14:48 +0100 Subject: [PATCH 4/4] requests for changes fixed --- Components/TeamComponents.cs | 6 ------ Pages/TeamListPanel.razor | 2 +- Pages/TeamListPanel.razor.cs | 4 ++-- Pages/TeamListPanel.razor.cs.razor | 4 ---- 4 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 Components/TeamComponents.cs delete mode 100644 Pages/TeamListPanel.razor.cs.razor diff --git a/Components/TeamComponents.cs b/Components/TeamComponents.cs deleted file mode 100644 index 6e17512..0000000 --- a/Components/TeamComponents.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace AdminPanel.Components; - -public class TeamComponents -{ - -} \ No newline at end of file diff --git a/Pages/TeamListPanel.razor b/Pages/TeamListPanel.razor index b6b5659..813635a 100644 --- a/Pages/TeamListPanel.razor +++ b/Pages/TeamListPanel.razor @@ -10,7 +10,7 @@
- + TeamListPanel_razor_cs - -@code { - } \ No newline at end of file -- 2.36.3