CI : code smells
continuous-integration/drone/push Build is passing Details

Multiplayer_Php
Jade VAN BRABANDT 1 year ago
parent 66fbaae2ac
commit fd7a1dcac7

@ -15,10 +15,10 @@ namespace Blazor.Components
public Question question = new(); public Question question = new();
private List<Answer> answers = new(); private List<Answer> answers = new();
public List<Question> questions; public List<Question> questions = new();
[Inject] [Inject]
public HttpClient Http { get; set; } public required HttpClient Http { get; set; }
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {

@ -9,22 +9,14 @@ namespace Blazor.Modals
public partial class DeleteConfirmation public partial class DeleteConfirmation
{ {
[CascadingParameter] [CascadingParameter]
public BlazoredModalInstance ModalInstance { get; set; } public required BlazoredModalInstance ModalInstance { get; set; }
[Inject] [Inject]
public IDataService DataService { get; set; } public required IDataService DataService { get; set; }
[Parameter] [Parameter]
public int Id { get; set; } public int Id { get; set; }
//private Chapter chapter = new Chapter();
//protected override async Task OnInitializedAsync()
// // Get the chapter
// chapter = await DataService.GetById(Id);
//}
void ConfirmDelete() void ConfirmDelete()
{ {
ModalInstance.CloseAsync(ModalResult.Ok(true)); ModalInstance.CloseAsync(ModalResult.Ok(true));

@ -8,8 +8,8 @@ namespace Blazor.Models;
public class AdministratorModel public class AdministratorModel
{ {
public int Id { get; set; } public int Id { get; set; }
public string Username { get; set; } public required string Username { get; set; }
public string HashedPassword { get; set; } public required string HashedPassword { get; set; }
public void HashPassword(string password) public void HashPassword(string password)
{ {

@ -4,8 +4,8 @@ public class AnswerModel
{ {
public int Id { get; set; } public int Id { get; set; }
public string Content { get; set; } public string? Content { get; set; }
public int IdQuestion { get; set; } public int? IdQuestion { get; set; }
public AnswerModel(int id) public AnswerModel(int id)
{ {
Id = id; Id = id;

@ -8,6 +8,6 @@ namespace Blazor.Models
[Required(ErrorMessage = "Name is required")] [Required(ErrorMessage = "Name is required")]
[StringLength(50, ErrorMessage = "Name is too long.")] [StringLength(50, ErrorMessage = "Name is too long.")]
public string Name { get; set; } public required string Name { get; set; }
} }
} }

@ -7,8 +7,8 @@ namespace Blazor.Models;
public class PlayerModel public class PlayerModel
{ {
public int Id { get; set; } public int Id { get; set; }
public string Nickname { get; set; } public required string Nickname { get; set; }
public string HashedPassword { get; set; } public required string HashedPassword { get; set; }
public void HashPassword(string password) public void HashPassword(string password)
{ {

@ -3,13 +3,12 @@
public class QuestionModel public class QuestionModel
{ {
public int Id { get; set; } public int Id { get; set; }
public string Content { get; set; } public required string Content { get; set; }
public int IdChapter { get; set; } public int IdChapter { get; set; }
public int? IdAnswerGood { get; set; } public int IdAnswerGood { get; set; }
public int Difficulty { get; set; } public int Difficulty { get; set; }
public int NbFails { get; set; } public int NbFails { get; set; }
public void addFails(int nb) { NbFails += nb; } public void addFails(int nb) { NbFails += nb; }
public void removeFails(int nb) { NbFails -= nb; } public void removeFails(int nb) { NbFails -= nb; }
} }

@ -2,7 +2,6 @@
@using Blazor.Models @using Blazor.Models
<h3>AddAdministrator</h3> <h3>AddAdministrator</h3>
<EditForm Model="@administratorModel" OnValidSubmit="@HandleValidSubmit"> <EditForm Model="@administratorModel" OnValidSubmit="@HandleValidSubmit">
<DataAnnotationsValidator /> <DataAnnotationsValidator />
<ValidationSummary /> <ValidationSummary />

@ -6,7 +6,7 @@ namespace Blazor.Pages.Admins
{ {
public partial class AddAdministrator public partial class AddAdministrator
{ {
private AdministratorModel administratorModel = new(); private AdministratorModel? administratorModel;
[Inject] [Inject]
public required IDataService DataService { get; set; } public required IDataService DataService { get; set; }
@ -19,6 +19,8 @@ namespace Blazor.Pages.Admins
private async Task HandleValidSubmit() private async Task HandleValidSubmit()
{
if (administratorModel != null)
{ {
administratorModel.HashPassword(administratorModel.HashedPassword); administratorModel.HashPassword(administratorModel.HashedPassword);
@ -50,3 +52,4 @@ namespace Blazor.Pages.Admins
} }
} }
} }
}

@ -41,7 +41,7 @@ public partial class Administrators
var response = Http.GetFromJsonAsync<Administrator[]>(API.API_URL+"administrators/"+API.TOKEN).Result; var response = Http.GetFromJsonAsync<Administrator[]>(API.API_URL+"administrators/"+API.TOKEN).Result;
if (!e.CancellationToken.IsCancellationRequested) if (!e.CancellationToken.IsCancellationRequested && response != null)
{ {
administrators = new List<Administrator>(response); // an actual data for the current page administrators = new List<Administrator>(response); // an actual data for the current page
totalItem = administrators.Count; totalItem = administrators.Count;

@ -10,7 +10,7 @@ namespace Blazor.Pages.Admins
[Parameter] [Parameter]
public int Id { get; set; } public int Id { get; set; }
private AdministratorModel administratorModel = new(); private AdministratorModel? administratorModel;
[Inject] [Inject]
public required IDataService DataService { get; set; } public required IDataService DataService { get; set; }
@ -40,6 +40,8 @@ namespace Blazor.Pages.Admins
} }
private async Task HandleValidSubmit() private async Task HandleValidSubmit()
{
if (administratorModel != null)
{ {
administratorModel.HashPassword(administratorModel.HashedPassword); administratorModel.HashPassword(administratorModel.HashedPassword);
@ -71,3 +73,4 @@ namespace Blazor.Pages.Admins
} }
} }
} }
}

@ -6,7 +6,7 @@ namespace Blazor.Pages.Chapters;
public partial class AddChapter public partial class AddChapter
{ {
private ChapterModel chapterModel = new(); private ChapterModel? chapterModel;
[Inject] [Inject]
public required IDataService DataService { get; set; } public required IDataService DataService { get; set; }
@ -20,6 +20,8 @@ public partial class AddChapter
private async Task HandleValidSubmit() private async Task HandleValidSubmit()
{
if (chapterModel != null)
{ {
var formData = new List<KeyValuePair<string, string>>(); var formData = new List<KeyValuePair<string, string>>();
formData.Add(new KeyValuePair<string, string>("name", chapterModel.Name)); formData.Add(new KeyValuePair<string, string>("name", chapterModel.Name));
@ -46,7 +48,7 @@ public partial class AddChapter
Logger.LogInformation("Chapter '{chapterModelName}' added", chapterModel.Name); Logger.LogInformation("Chapter '{chapterModelName}' added", chapterModel.Name);
NavigationManager.NavigateTo("chapters"); NavigationManager.NavigateTo("chapters");
}
} }
} }

@ -9,7 +9,7 @@ public partial class EditChapter
[Parameter] [Parameter]
public int Id { get; set; } public int Id { get; set; }
private ChapterModel chapterModel = new(); private ChapterModel? chapterModel;
[Inject] [Inject]
public IDataService DataService { get; set; } public IDataService DataService { get; set; }

@ -6,7 +6,7 @@ namespace Blazor.Pages.Players
{ {
public partial class AddPlayer public partial class AddPlayer
{ {
private PlayerModel playerModel = new(); private PlayerModel? playerModel;
[Inject] [Inject]
public required IDataService DataService { get; set; } public required IDataService DataService { get; set; }
@ -16,6 +16,8 @@ namespace Blazor.Pages.Players
private async Task HandleValidSubmit() private async Task HandleValidSubmit()
{
if (playerModel != null)
{ {
playerModel.HashPassword(playerModel.HashedPassword); playerModel.HashPassword(playerModel.HashedPassword);
@ -44,3 +46,4 @@ namespace Blazor.Pages.Players
} }
} }
} }
}

@ -10,7 +10,7 @@ namespace Blazor.Pages.Players
[Parameter] [Parameter]
public int Id { get; set; } public int Id { get; set; }
private PlayerModel playerModel = new(); private PlayerModel? playerModel;
[Inject] [Inject]
public required IDataService DataService { get; set; } public required IDataService DataService { get; set; }

@ -9,7 +9,7 @@ namespace Blazor.Pages.Questions
{ {
public partial class AddQuestion public partial class AddQuestion
{ {
private QuestionModel questionModel = new(); private QuestionModel? questionModel;
public List<Chapter> chapters = new(); public List<Chapter> chapters = new();
@ -50,12 +50,13 @@ namespace Blazor.Pages.Questions
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
var response = Http.GetFromJsonAsync<Chapter[]>(API.API_URL + "chapters/" + API.TOKEN).Result; var response = Http.GetFromJsonAsync<Chapter[]>(API.API_URL + "chapters/" + API.TOKEN).Result;
if (response == null) chapters = new List<Chapter>();
chapters = new List<Chapter>(response); else chapters = new List<Chapter>(response);
} }
private async void HandleValidSubmit() private async void HandleValidSubmit()
{ {
if (questionModel != null)
{
await DataService.Add(questionModel); await DataService.Add(questionModel);
var formData = new List<KeyValuePair<string, string>>(); var formData = new List<KeyValuePair<string, string>>();
@ -97,3 +98,4 @@ namespace Blazor.Pages.Questions
} }
} }
} }
}

@ -10,7 +10,7 @@ namespace Blazor.Pages.Questions
[Parameter] [Parameter]
public int Id { get; set; } public int Id { get; set; }
private QuestionModel questionModel = new(); private QuestionModel? questionModel;
[Inject] [Inject]
public required IDataService DataService { get; set; } public required IDataService DataService { get; set; }

Loading…
Cancel
Save