Merge branch 'master' of https://codefirst.iut.uca.fr/git/jade.van_brabandt/3.01-QCM_MuscuMaths

1 year ago · 0445347a17
parent c01615c9d1 3cd0de72d0
commit 0445347a17
47 changed files with 3600 additions and 3533 deletions
--- a/Blazor/Blazor/Components/CardViewQuestion.razor
+++ b/Blazor/Blazor/Components/CardViewQuestion.razor
@ -1,6 +1,29 @@
-
-<div class="card text-center">
-    @CardHeader
-    @CardBody
-    @CardFooter
+<BackButton RedirectionPage="/questions"></BackButton>
+
+<div class="text-center pb-2">
+    <h3>Question n°@Question.Id</h3>
 </div>
+<div class="text-center pb-5 mt-3">
+    <h5>@Question.Content</h5>
+</div>
+
+<div class="container-fluid text-center justify-content-center row card-body">
+    @foreach (var answer in Answers)
+    {
+        <div class="col-3 text-center">
+            @if (answer.Id == Question.IdAnswerGood)
+            {
+                <p class="text-success"><strong>@answer.Content</strong></p>
+            }
+            else
+            {
+                <p class="text-danger">@answer.Content</p>
+            }
+        </div>
+    }
+</div>
+
+<div class="card-footer text-center text-muted">
+    Chapitre : @Question.ChapterName
+</div>
+
--- a/Blazor/Blazor/Components/CardViewQuestion.razor.cs
+++ b/Blazor/Blazor/Components/CardViewQuestion.razor.cs
@ -1,16 +1,15 @@
-using Microsoft.AspNetCore.Components;
+using Blazor.Pages;
+using Blazor.ViewClasses;
+using Microsoft.AspNetCore.Components;

 namespace Blazor.Components
 {
    public partial class CardViewQuestion
    {
        [Parameter]
-        public RenderFragment CardBody { get; set; }
+        public Question Question { get; set; }

        [Parameter]
-        public RenderFragment CardFooter { get; set; }
-
-        [Parameter]
-        public RenderFragment CardHeader { get; set; }
+        public List<Answer> Answers { get; set; }
    }
 }
--- a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor
+++ b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor
@ -1,7 +1,7 @@
@page "/addAdministrator"
@using Blazor.Models
@using Blazor.Components
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle> 
 <BackButton RedirectionPage="/administrators"></BackButton>

 <div class="container text-center">
--- a/Blazor/Blazor/Pages/Admins/Administrators.razor
+++ b/Blazor/Blazor/Pages/Admins/Administrators.razor
@ -1,7 +1,7 @@
@page "/administrators"
@using Blazorise.DataGrid
@using Blazor.ViewClasses
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle> 
 <h3>@Localizer["Title"]</h3>

 <div>
--- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor
+++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor
@ -1,7 +1,7 @@
@page "/editAdministrator/{Id:int}"

@using Blazor.Components;
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle> 
 <BackButton RedirectionPage="/administrators"></BackButton>

 <div class="container text-center">
--- a/Blazor/Blazor/Pages/Chapters/AddChapter.razor
+++ b/Blazor/Blazor/Pages/Chapters/AddChapter.razor
@ -1,7 +1,7 @@
@page "/addChapter"
@using Blazor.Models
@using Blazor.Components
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle> 
 <BackButton RedirectionPage="/chapters"></BackButton>

 <div class="container text-center">
--- a/Blazor/Blazor/Pages/Chapters/Chapters.razor
+++ b/Blazor/Blazor/Pages/Chapters/Chapters.razor
@ -2,7 +2,7 @@
@using Blazor.ViewClasses;
@using Blazorise.DataGrid
@using Blazored.Modal;
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle> 
 <h3>@Localizer["Title"]</h3>
 <div>
    <NavLink class="btn btn-primary" href="addChapter" Match="NavLinkMatch.All">
--- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor
+++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor
@ -1,7 +1,7 @@
@page "/editChapter/{Id:int}"

@using Blazor.Components;
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle> 
 <BackButton RedirectionPage="/chapters"></BackButton>


--- a/Blazor/Blazor/Pages/Error.cshtml
+++ b/Blazor/Blazor/Pages/Error.cshtml
@ -3,7 +3,7 @@

 <!DOCTYPE html>
 <html lang="en">
-
+<PageTitle>Error</PageTitle>
 <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
--- a/Blazor/Blazor/Pages/Index.razor
+++ b/Blazor/Blazor/Pages/Index.razor
@ -1,6 +1,6 @@
@page "/"

-<PageTitle>Home</PageTitle>
+<PageTitle>@Localizer["PageTitle"]</PageTitle>

 <div class="container text-center mb-5">
    <img src="/images/mathseduc.png" alt="Logo MathsEduc" height="150" />
--- a/Blazor/Blazor/Pages/Players/AddPlayer.razor
+++ b/Blazor/Blazor/Pages/Players/AddPlayer.razor
@ -3,7 +3,7 @@
@using Blazor.Components

 <BackButton RedirectionPage="/players"></BackButton>
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle>  
 <div class="container text-center">
    <div class="border border-dark p-4 d-inline-block">
        <h3>@Localizer["Title"]</h3>
--- a/Blazor/Blazor/Pages/Players/EditPlayer.razor
+++ b/Blazor/Blazor/Pages/Players/EditPlayer.razor
@ -3,7 +3,7 @@
@using Blazor.Components;

 <BackButton RedirectionPage="/players"></BackButton>
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle> 
 <div class="container text-center">
    <div class="border border-dark p-4 d-inline-block">
        <h3>@Localizer["Title"]</h3>
--- a/Blazor/Blazor/Pages/Players/Players.razor
+++ b/Blazor/Blazor/Pages/Players/Players.razor
@ -2,7 +2,7 @@
@using Blazor.ViewClasses;
@using Blazorise.DataGrid
@using Blazored.Modal;
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle>
 <h3>@Localizer["Title"]</h3>
 <div>
    <NavLink class="btn btn-primary" href="addPlayer" Match="NavLinkMatch.All">
--- a/Blazor/Blazor/Pages/Questions/AddQuestion.razor
+++ b/Blazor/Blazor/Pages/Questions/AddQuestion.razor
@ -3,7 +3,7 @@
@using Blazor.Components

 <BackButton RedirectionPage="/questions"></BackButton>
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle>
 <div class="container text-center">
    <div class="border border-dark p-4 d-inline-block">
        <h3>@Localizer["Title"]</h3>
--- a/Blazor/Blazor/Pages/Questions/DisplayQuestions.razor
+++ b/Blazor/Blazor/Pages/Questions/DisplayQuestions.razor
@ -2,36 +2,4 @@

@using Blazor.Components;

-<CardViewQuestion>
-    <CardHeader>
-        <div class="text-center pb-2">
-            <h3>Question n°@question.Id</h3>
-        </div>
-        <div class="text-center pb-5 mt-3">
-            <h5>@question.Content</h5>
-        </div>
-    </CardHeader>
-    <CardBody>
-        <div class="container-fluid text-center justify-content-center row">
-            @foreach (var answer in answers)
-            {
-                <div class="col-3 text-center">
-                    @if (answer.Id == question.IdAnswerGood)
-                    {
-                        <p class="text-success"><strong>@answer.Content</strong></p>
-                    }
-                    else
-                    {
-                        <p class="text-danger">@answer.Content</p>
-                    }
-                </div>
-            }
-        </div>
-    </CardBody>
-    <CardFooter>
-        <div class="card-footer text-muted">
-            Chapitre : @question.ChapterName
-        </div>
-        <BackButton RedirectionPage="/questions"></BackButton>
-    </CardFooter>
-</CardViewQuestion>
+<CardViewQuestion Question="@question" Answers="@answers"></CardViewQuestion>
--- a/Blazor/Blazor/Pages/Questions/DisplayQuestions.razor.cs
+++ b/Blazor/Blazor/Pages/Questions/DisplayQuestions.razor.cs
@ -1,8 +1,6 @@
-using Blazor.Models;
-using Blazor.Pages;
-using Blazor.ViewClasses;
+using Blazor.ViewClasses;
 using Microsoft.AspNetCore.Components;
-using static System.Net.WebRequestMethods;
+using Microsoft.Extensions.Localization;

 namespace Blazor.Pages.Questions
 {
@ -15,7 +13,8 @@ namespace Blazor.Pages.Questions

        private List<Answer> answers = new();
        public List<Question> questions = new();
-
+        [Inject]
+        public IStringLocalizer<DisplayQuestions> Localizer { get; set; }
        [Inject]
        public required HttpClient Http { get; set; }

--- a/Blazor/Blazor/Pages/Questions/EditQuestion.razor
+++ b/Blazor/Blazor/Pages/Questions/EditQuestion.razor
@ -2,7 +2,7 @@


 <BackButton RedirectionPage="/questions"></BackButton>
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle>
 <div class="container text-center">
    <div class="border border-dark p-4 d-inline-block">
        <h3>@Localizer["Title"]</h3>
--- a/Blazor/Blazor/Pages/Questions/Questions.razor
+++ b/Blazor/Blazor/Pages/Questions/Questions.razor
@ -2,7 +2,7 @@
@using Blazor.ViewClasses;
@using Blazorise.DataGrid
@using Blazored.Modal;
-
+<PageTitle>@Localizer["PageTitle"]</PageTitle>
 <h3>@Localizer["Title"]</h3>

 <div>
--- a/Blazor/Blazor/Resources/Pages.Admins.AddAdministrator.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Admins.AddAdministrator.fr-FR.resx
@ -117,6 +117,9 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Ajouter administrateur</value>
+  </data>
  <data name="Password" xml:space="preserve">
    <value>Mot de passe</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Admins.AddAdministrator.resx
+++ b/Blazor/Blazor/Resources/Pages.Admins.AddAdministrator.resx
@ -117,6 +117,9 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Add Admnistrator</value>
+  </data>
  <data name="Password" xml:space="preserve">
    <value>Password</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Admins.Administrators.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Admins.Administrators.fr-FR.resx
@ -126,6 +126,9 @@
  <data name="Edit" xml:space="preserve">
    <value>Editer</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Administrateurs</value>
+  </data>
  <data name="Title" xml:space="preserve">
    <value>Administrateurs</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Admins.Administrators.resx
+++ b/Blazor/Blazor/Resources/Pages.Admins.Administrators.resx
@ -126,6 +126,9 @@
  <data name="Edit" xml:space="preserve">
    <value>Edit</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Administrators</value>
+  </data>
  <data name="Title" xml:space="preserve">
    <value>Administrators</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Admins.EditAdministrator.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Admins.EditAdministrator.fr-FR.resx
@ -120,6 +120,9 @@
  <data name="HashedPassword" xml:space="preserve">
    <value>Mot de passe</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Editer Administrateur</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Valider</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Admins.EditAdministrator.resx
+++ b/Blazor/Blazor/Resources/Pages.Admins.EditAdministrator.resx
@ -120,6 +120,9 @@
  <data name="HashedPassword" xml:space="preserve">
    <value>Password</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Edit Administrator</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Submit</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Chapters.AddChapter.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Chapters.AddChapter.fr-FR.resx
@ -120,6 +120,9 @@
  <data name="Name" xml:space="preserve">
    <value>Nom</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Ajouter Chapitre</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Valider</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Chapters.AddChapter.resx
+++ b/Blazor/Blazor/Resources/Pages.Chapters.AddChapter.resx
@ -120,6 +120,9 @@
  <data name="Name" xml:space="preserve">
    <value>Name</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Add Chapter</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Submit</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Chapters.Chapters.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Chapters.Chapters.fr-FR.resx
@ -132,6 +132,9 @@
  <data name="Name" xml:space="preserve">
    <value>Nom</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Chapitres</value>
+  </data>
  <data name="Title" xml:space="preserve">
    <value>Chapitres</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Chapters.Chapters.resx
+++ b/Blazor/Blazor/Resources/Pages.Chapters.Chapters.resx
@ -132,6 +132,9 @@
  <data name="Name" xml:space="preserve">
    <value>Name</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Chapters</value>
+  </data>
  <data name="Title" xml:space="preserve">
    <value>Chapters</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Chapters.EditChapter.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Chapters.EditChapter.fr-FR.resx
@ -120,6 +120,9 @@
  <data name="Name" xml:space="preserve">
    <value>Nom</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Editer Chapitre</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Valider</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Chapters.EditChapter.resx
+++ b/Blazor/Blazor/Resources/Pages.Chapters.EditChapter.resx
@ -120,6 +120,9 @@
  <data name="Name" xml:space="preserve">
    <value>Name</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Edit Chapter</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Submit</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Index.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Index.fr-FR.resx
@ -117,6 +117,9 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Acceuil</value>
+  </data>
  <data name="Text" xml:space="preserve">
    <value>C'est la partie administrateur de l'application MathsEduc. Vous pouvez modifier/ajouter/supprimer des questions ou gérer les joueurs, les administrateurs et les chapitres.</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Index.resx
+++ b/Blazor/Blazor/Resources/Pages.Index.resx
@ -117,6 +117,9 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Home</value>
+  </data>
  <data name="Text" xml:space="preserve">
    <value>This is the administrator part of the MathsEduc application. You can edit/add/delete questions or manage players, admins and chapters.</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Players.AddPlayer.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Players.AddPlayer.fr-FR.resx
@ -123,6 +123,9 @@
  <data name="Nickname" xml:space="preserve">
    <value>Pseudo</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Ajouter Joueur</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Envoyer</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Players.AddPlayer.resx
+++ b/Blazor/Blazor/Resources/Pages.Players.AddPlayer.resx
@ -123,6 +123,9 @@
  <data name="Nickname" xml:space="preserve">
    <value>Nickname</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Add Player</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Submit</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Players.EditPlayer.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Players.EditPlayer.fr-FR.resx
@ -123,6 +123,9 @@
  <data name="Nickname" xml:space="preserve">
    <value>Pseudo</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Editer Joueur</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Valider</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Players.EditPlayer.resx
+++ b/Blazor/Blazor/Resources/Pages.Players.EditPlayer.resx
@ -123,6 +123,9 @@
  <data name="Nickname" xml:space="preserve">
    <value>Nickname</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Edit Player</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Submit</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Players.Players.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Players.Players.fr-FR.resx
@ -129,6 +129,9 @@
  <data name="Nickname" xml:space="preserve">
    <value>Pseudo</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Joueurs</value>
+  </data>
  <data name="Title" xml:space="preserve">
    <value>Joueurs</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Players.Players.resx
+++ b/Blazor/Blazor/Resources/Pages.Players.Players.resx
@ -129,6 +129,9 @@
  <data name="Nickname" xml:space="preserve">
    <value>Nickname</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Players</value>
+  </data>
  <data name="Title" xml:space="preserve">
    <value>Players</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Questions.AddQuestion.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Questions.AddQuestion.fr-FR.resx
@ -126,6 +126,9 @@
  <data name="Content" xml:space="preserve">
    <value>Contenu</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Ajouter Question</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Valider</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Questions.AddQuestion.resx
+++ b/Blazor/Blazor/Resources/Pages.Questions.AddQuestion.resx
@ -127,6 +127,9 @@
  <data name="Content" xml:space="preserve">
    <value>Content</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Add Question</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Submit</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Questions.EditQuestion.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Questions.EditQuestion.fr-FR.resx
@ -129,6 +129,9 @@
  <data name="Correct" xml:space="preserve">
    <value>Correcte</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Editer Question</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Valider</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Questions.EditQuestion.resx
+++ b/Blazor/Blazor/Resources/Pages.Questions.EditQuestion.resx
@ -129,6 +129,9 @@
  <data name="Correct" xml:space="preserve">
    <value>Correct</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Edit Question</value>
+  </data>
  <data name="Submit" xml:space="preserve">
    <value>Submit</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Questions.Questions.fr-FR.resx
+++ b/Blazor/Blazor/Resources/Pages.Questions.Questions.fr-FR.resx
@ -135,6 +135,9 @@
  <data name="Export" xml:space="preserve">
    <value>Exporter</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Questions</value>
+  </data>
  <data name="Show" xml:space="preserve">
    <value>Afficher</value>
  </data>
--- a/Blazor/Blazor/Resources/Pages.Questions.Questions.resx
+++ b/Blazor/Blazor/Resources/Pages.Questions.Questions.resx
@ -135,6 +135,9 @@
  <data name="Export" xml:space="preserve">
    <value>Export</value>
  </data>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Questions</value>
+  </data>
  <data name="Show" xml:space="preserve">
    <value>Show</value>
  </data>
--- a/Blazor/Blazor/wwwroot/favicon.png
+++ b/Blazor/Blazor/wwwroot/favicon.png