From 415257342cbd4296d5877f804630d062ffabc444 Mon Sep 17 00:00:00 2001 From: "kentin.brongniart" Date: Wed, 8 Jan 2025 15:58:09 +0100 Subject: [PATCH 01/32] recuperation push --- WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs | 4 +- WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor | 59 ++++++++++--------- WF-WebAdmin/WF-WebAdmin/Pages/_Layout.cshtml | 1 + WF-WebAdmin/WF-WebAdmin/Program.cs | 3 + WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj | 7 +++ WF-WebAdmin/WF-WebAdmin/_Imports.razor | 2 +- .../WF-WebAdmin/wwwroot/fake-dataQuote.json | 16 ++--- 7 files changed, 55 insertions(+), 37 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs index 6553676..d98f86e 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs @@ -1,4 +1,6 @@ -using Microsoft.AspNetCore.Components; +using Blazored.LocalStorage; +using Blazorise.DataGrid; +using Microsoft.AspNetCore.Components; using WF_WebAdmin.Model; diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor index bba7495..e9f0d0b 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor @@ -5,35 +5,40 @@

Accueil

+

Sitation du jour

+ +@* +
+ +

Identifiant de la citation :@quote.Id

+

Citation:@quote.Content

+

Personnage : @quote.Charac

+

Source : @quote.TitleSrc

+

Langue : @quote.Langue

+

@quote.UserProposition a proposé cette citation

+ +
+*@ + + @if (quotes != null) { - - - - - - - - - - - - - - @foreach (var quote in quotes) - { - - - - - - - - - - } - -
IdContentCharactéreTitle SourceLikeLangueDate Source
@quote.Id@quote.Content@quote.Charac@quote.TitleSrc@quote.Like@quote.Langue@quote.DateSrc.ToShortDateString()
+

Citations non validées

+

Citations en attente de validation:

+ + @foreach (var quote in quotes) + { +
+ +

Identifiant de la citation :@quote.Id

+

Citation:@quote.Content

+

Personnage : @quote.Charac

+

Source : @quote.TitleSrc

+

Langue : @quote.Langue

+

@quote.UserProposition a proposé cette citation

+ +
+ } } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/_Layout.cshtml b/WF-WebAdmin/WF-WebAdmin/Pages/_Layout.cshtml index dd71165..db114bc 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/_Layout.cshtml +++ b/WF-WebAdmin/WF-WebAdmin/Pages/_Layout.cshtml @@ -28,5 +28,6 @@ + diff --git a/WF-WebAdmin/WF-WebAdmin/Program.cs b/WF-WebAdmin/WF-WebAdmin/Program.cs index cdcdbeb..77896c4 100644 --- a/WF-WebAdmin/WF-WebAdmin/Program.cs +++ b/WF-WebAdmin/WF-WebAdmin/Program.cs @@ -1,3 +1,4 @@ +using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; using WF_WebAdmin.Data; @@ -11,6 +12,8 @@ builder.Services.AddSingleton(); builder.Services.AddHttpClient(); +builder.Services.AddBlazoredLocalStorage(); + var app = builder.Build(); // Configure the HTTP request pipeline. diff --git a/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj b/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj index 9c94761..5eab720 100644 --- a/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj +++ b/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj @@ -7,4 +7,11 @@ WF_WebAdmin + + + + + + + diff --git a/WF-WebAdmin/WF-WebAdmin/_Imports.razor b/WF-WebAdmin/WF-WebAdmin/_Imports.razor index 5f99f58..d4da21d 100644 --- a/WF-WebAdmin/WF-WebAdmin/_Imports.razor +++ b/WF-WebAdmin/WF-WebAdmin/_Imports.razor @@ -7,4 +7,4 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop @using WF_WebAdmin -@using WF_WebAdmin.Shared +@using WF_WebAdmin.Shared \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json index f38cd34..1378868 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json @@ -1,20 +1,20 @@ [ { "Id": 1, - "Content": "coucou", - "Charac": "moi", - "ImgPath": "img", - "TitleSrc": "G4", + "Content": "'Dans le monde il n’y a pas d’un côté le bien et le mal, il y a une part de lumière et d’ombre en chacun de nous. Ce qui compte c’est celle que l’on choisit de montrer dans nos actes, ça c’est ce que l’on est vraiment.'", + "Charac": "Sirius Black", + "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "TitleSrc": "Harry Potter et L’ordre du Phoenix", "DateSrc": "2001-01-01", "Like": 20, "Langue": "fr" }, { "Id": 2, - "Content": "boujour", - "Charac": "toi", - "ImgPath": "img", - "TitleSrc": "G4", + "Content": "'Une autre citation'", + "Charac": "Un personnage", + "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.zR4rzkK7q2wCcNwZd6jjegHaIC?w=163&h=180&c=7&r=0&o=5&pid=1.7", + "TitleSrc": "Un super film", "DateSrc": "2002-02-02", "Like": 0, "Langue": "fr" From a5fd2911026c674a5fcc423a78c58a52245fc0d6 Mon Sep 17 00:00:00 2001 From: tomivt Date: Wed, 8 Jan 2025 16:42:00 +0100 Subject: [PATCH 02/32] Start /ValidQuiz view --- .../.idea/.idea.WF-WebAdmin/.idea/.gitignore | 13 +++++++++++++ .../.idea/.idea.WF-WebAdmin/.idea/indexLayout.xml | 8 ++++++++ WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/vcs.xml | 6 ++++++ WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs | 12 ++++++++++++ WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor | 11 +++++++++++ WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs | 11 +++++++++++ WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor | 8 +++++++- 7 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/.gitignore create mode 100644 WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/indexLayout.xml create mode 100644 WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/vcs.xml create mode 100644 WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor create mode 100644 WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs diff --git a/WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/.gitignore b/WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/.gitignore new file mode 100644 index 0000000..f755717 --- /dev/null +++ b/WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/.idea.WF-WebAdmin.iml +/modules.xml +/contentModel.xml +/projectSettingsUpdater.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/indexLayout.xml b/WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/vcs.xml b/WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/WF-WebAdmin/.idea/.idea.WF-WebAdmin/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs b/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs new file mode 100644 index 0000000..a5ecef4 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs @@ -0,0 +1,12 @@ +namespace WF_WebAdmin.Model; + +public class Quiz +{ + public int Id { get; set; } + public string Question { get; set; } + public string AnswerA { get; set; } + public string AnswerB { get; set; } + public string AnswerC { get; set; } + public string AnswerD { get; set; } + public string CAnswer { get; set; } +} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor new file mode 100644 index 0000000..ad96674 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor @@ -0,0 +1,11 @@ +@page "/ValidQuiz" +@using WF_WebAdmin.Model + +

Quiz à valider

+ +@if (quizzes is null) +{ +

+ Chargement des quiz +

+} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs new file mode 100644 index 0000000..c419e91 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs @@ -0,0 +1,11 @@ +using Npgsql; +using WF_WebAdmin.Model; + +namespace WF_WebAdmin.Pages + +{ + public partial class ValidQuiz + { + private List quizzes; + } +} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor index 5464a8c..d4c1b4f 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor @@ -25,6 +25,12 @@ +
+ + Validation de quiz + +
+
Gestion des utilisateurs @@ -33,7 +39,7 @@
- Corection des citation + Correction des citations
From 1e2a18613eec741e089fe61fef02778a0ba07e33 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 8 Jan 2025 17:29:56 +0100 Subject: [PATCH 03/32] =?UTF-8?q?D=C3=A9but=20du=20DTO=20et=20des=20extens?= =?UTF-8?q?ions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs | 7 +++++++ .../WF-WebAdmin/Converter/AdminExtension.cs | 6 ++++++ WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs | 18 ++++++++++++++++++ .../WF-WebAdmin/Converter/QuoteExtension.cs | 7 +++++++ WF-WebAdmin/WF-WebAdmin/Model/Quote.cs | 12 ++++++------ WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor | 3 +-- 6 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/AdminExtension.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs b/WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs new file mode 100644 index 0000000..4356cfe --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs @@ -0,0 +1,7 @@ +namespace WF_WebAdmin.Converter +{ + public class AdminDTO + { + + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/AdminExtension.cs b/WF-WebAdmin/WF-WebAdmin/Converter/AdminExtension.cs new file mode 100644 index 0000000..9b6ef16 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Converter/AdminExtension.cs @@ -0,0 +1,6 @@ +namespace WF_WebAdmin.Converter +{ + public class AdminExtension + { + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs new file mode 100644 index 0000000..532e700 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs @@ -0,0 +1,18 @@ +using Microsoft.AspNetCore.DataProtection.KeyManagement; +using System; + +namespace WF_WebAdmin.Converter +{ + public class QuoteDTO + { + private int id_quote; + private string content; + private int likes; + private string langue; + private bool isValide; + private string? reason; + private int id_caracter; + private int id_source; + private int? id_user_verif; + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs new file mode 100644 index 0000000..a449430 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs @@ -0,0 +1,7 @@ +namespace WF_WebAdmin.Converter +{ + public class QuoteExtension + { + + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs index 9fcb751..53a25b2 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs @@ -4,12 +4,12 @@ { public int Id { get; set; } public string Content { get; set; } - public string Charac { get; set; } - public string ImgPath { get; set; } - public string TitleSrc { get; set; } - public DateTime DateSrc { get; set; } - public int Like { get; set; } + public int Likes { get; set; } public string Langue { get; set; } - public string UserProposition { get; set; } + public bool IsValide { get; set; } + public string? Reason { get; set; } + public int IdCaracter { get; set; } + public int IdSource { get; set; } + public int IdUserVerif { get; set; } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor index da423b0..57f8ecc 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor @@ -21,13 +21,12 @@ else

ID : @quote.Id

Contenu : @quote.Content

Langue : @quote.Langue

-

Likes : @quote.Like

Personnage : @quote.Charac

Image : @quote.ImgPath

Source : @quote.TitleSrc

Date de source : @quote.DateSrc.ToShortDateString()

-

Utilisateur proposition : @quote.UserProposition

+

Utilisateur : @quote.UserProposition

From 143a8c2f8a3eec10950e920d30969e69c8d542b5 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Wed, 8 Jan 2025 17:32:39 +0100 Subject: [PATCH 04/32] =?UTF-8?q?Ajout=20de=20la=20fonctionnalit=C3=A9,=20?= =?UTF-8?q?add=20Admin=20et=20delete=20admin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs | 10 ++ WF-WebAdmin/WF-WebAdmin/Model/User.cs | 3 + .../WF-WebAdmin/Pages/DeleteUser.razor | 47 +++++- .../WF-WebAdmin/Pages/DeleteUser.razor.cs | 37 ++++- .../WF-WebAdmin/Pages/ValidQuote.razor.cs | 2 +- .../WF-WebAdmin/wwwroot/fake-dataUser.json | 147 +++++++++++++++++- 6 files changed, 234 insertions(+), 12 deletions(-) create mode 100644 WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs b/WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs new file mode 100644 index 0000000..c3251c3 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs @@ -0,0 +1,10 @@ +namespace WF_WebAdmin.Model +{ + public class Commentary + { + public int Id { get; set; } + public int IdUser { get; set; } + public string Text { get; set; } + public DateTime DateCreation { get; set; } + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Model/User.cs b/WF-WebAdmin/WF-WebAdmin/Model/User.cs index d599e5b..05671ab 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/User.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/User.cs @@ -3,10 +3,13 @@ public class User { public int Id { get; set; } + public string Image { get; set; } public string Name { get; set; } public string Email { get; set; } public DateTime DateCreation { get; set; } + public Boolean IsAdmin { get; set; } + public List Comments { get; set; } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor index 47af991..fe1c3fa 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor @@ -14,13 +14,44 @@

Identifiant d'utilisateur : @user.Id

-

Nom d'utilisateur : @user.Name

+ @if (user.IsAdmin) + { +

Nom d'utilisateur : @user.Name (Administrateur)

+ } + else + { +

Nom d'utilisateur : @user.Name

+ } +

Email de l'utilisateur : @user.Email

Date de création de l'utilisateur : @user.DateCreation.ToShortDateString()

+ + @if(user.Comments != null) + { + @foreach (var comment in user.Comments) + { +

Commentaire (@comment.) : @comment.Text

+ } + } + else + { +

Aucun commentaires

+ } + + + @if (!user.IsAdmin) + { + + } + else + { + + } +
} - + @if (showPopup) {
@@ -32,6 +63,18 @@
} + + @if (showPopupAdmin) + { +
+
+

Êtes-vous sûr de vouloir changer le rôle de cet utilisateur ?

+ + +
+
+ } + } else diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs index 0743f27..8c8a98f 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs @@ -11,6 +11,9 @@ namespace WF_WebAdmin.Pages private bool showPopup = false; private User userToDelete = null; + + private bool showPopupAdmin = false; + private User userToAdmin = null; [Inject] public HttpClient Http { get; set; } @@ -27,7 +30,6 @@ namespace WF_WebAdmin.Pages private void ShowConfirmation(User user) { - // Afficher la modale et mémoriser l'utilisateur à supprimer userToDelete = user; showPopup = true; } @@ -47,6 +49,39 @@ namespace WF_WebAdmin.Pages { showPopup = false; } + + + + + + private void ShowConfirmationAdmin(User user) + { + userToAdmin = user; + showPopupAdmin = true; + } + + + + private async Task Admin() + { + if (!userToAdmin.IsAdmin) + { + userToAdmin.IsAdmin = true; + ClosePopupAdmin(); + } + else + { + userToAdmin.IsAdmin = false; + ClosePopupAdmin(); + } + } + + private void ClosePopupAdmin() + { + showPopupAdmin = false; + } + + } } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs index a42112a..5e061c5 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs @@ -13,7 +13,7 @@ namespace WF_WebAdmin.Pages { // Chaîne de connexion à adapter private const string connectionString = - "Host=localhost;Port=5432;Database=wikifantasy3;Username=postgres;Password=postgres"; + "Host=londres;Port=5432;Database=dbkentin;Username=kentin;Password=passwd"; private List quotes; diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json index 60632fc..519f6ca 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json @@ -2,30 +2,161 @@ { "Id": 1, "Image": "https://tse4.mm.bing.net/th/id/OIP.fc5TQflh0cbxB1GUeOdk6gHaK8?w=123&h=180&c=7&r=0&o=5&pid=1.7", - "Name": "Demo", - "Email": "demo@gmail.com", - "DateCreation": "2024-12-12" - + "Name": "Admin", + "Email": "admin@gmail.com", + "DateCreation": "2024-12-12", + "IsAdmin": true }, { "Id": 2, "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", "Name": "exploit", "Email": "exploit@gmail.com", - "DateCreation": "2024-11-12" + "DateCreation": "2024-11-12", + "IsAdmin": true }, { "Id": 3, "Image": "https://tse4.mm.bing.net/th/id/OIP.XNQPKwc1OUfvnSO9MsxDYgHaE7?w=202&h=180&c=7&r=0&o=5&pid=1.7", "Name": "testeur", "Email": "testeur@gmail.com", - "DateCreation": "2024-08-02" + "DateCreation": "2024-08-02", + "IsAdmin": false }, { "Id": 4, - "Image": "https://tse2.mm.bing.net/th/id/OIP.3vXkEUJ9J8s-GsnBC6I3KAHaF0?w=185&h=180&c=7&r=0&o=5&pid=1.7", + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", "Name": "dev", "Email": "dev@gmail.com", - "DateCreation": "2024-10-10" + "DateCreation": "2024-10-10", + "IsAdmin": false + }, + { + "Id": 5, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "jean_doe", + "Email": "jean.doe@gmail.com", + "DateCreation": "2024-06-25", + "IsAdmin": false + }, + { + "Id": 6, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "jane_smith", + "Email": "jane.smith@gmail.com", + "DateCreation": "2024-07-15", + "IsAdmin": false + }, + { + "Id": 7, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_joe", + "Email": "admin.joe@gmail.com", + "DateCreation": "2024-05-30", + "IsAdmin": true + }, + { + "Id": 8, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev_anna", + "Email": "dev.anna@gmail.com", + "DateCreation": "2024-09-05", + "IsAdmin": false + }, + { + "Id": 9, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "support_mark", + "Email": "support.mark@gmail.com", + "DateCreation": "2024-11-20", + "IsAdmin": false + }, + { + "Id": 10, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev_susan", + "Email": "dev.susan@gmail.com", + "DateCreation": "2024-08-12", + "IsAdmin": false + }, + { + "Id": 11, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "designer_steve", + "Email": "designer.steve@gmail.com", + "DateCreation": "2024-07-01", + "IsAdmin": false + }, + { + "Id": 12, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_lucas", + "Email": "admin.lucas@gmail.com", + "DateCreation": "2024-09-22", + "IsAdmin": true + }, + { + "Id": 13, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "manager_anna", + "Email": "manager.anna@gmail.com", + "DateCreation": "2024-05-01", + "IsAdmin": false + }, + { + "Id": 14, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "developer_mike", + "Email": "developer.mike@gmail.com", + "DateCreation": "2024-11-02", + "IsAdmin": false + }, + { + "Id": 15, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "test_user_01", + "Email": "test.user01@gmail.com", + "DateCreation": "2024-06-10", + "IsAdmin": false + }, + { + "Id": 16, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_kate", + "Email": "admin.kate@gmail.com", + "DateCreation": "2024-04-16", + "IsAdmin": true + }, + { + "Id": 17, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "support_olivia", + "Email": "support.olivia@gmail.com", + "DateCreation": "2024-07-30", + "IsAdmin": false + }, + { + "Id": 18, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "assistant_jack", + "Email": "assistant.jack@gmail.com", + "DateCreation": "2024-10-03", + "IsAdmin": false + }, + { + "Id": 19, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "developer_bob", + "Email": "developer.bob@gmail.com", + "DateCreation": "2024-06-01", + "IsAdmin": false + }, + { + "Id": 20, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_sophie", + "Email": "admin.sophie@gmail.com", + "DateCreation": "2024-12-05", + "IsAdmin": true } ] \ No newline at end of file From cd9edeb2fa69be750180bb5295e187e03a2de4fe Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Thu, 9 Jan 2025 08:30:37 +0100 Subject: [PATCH 05/32] DTO --- WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs | 59 ++++++++++++++++--- .../WF-WebAdmin/Converter/QuoteExtension.cs | 14 ++++- WF-WebAdmin/WF-WebAdmin/Model/Quote.cs | 15 ++++- 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs index 532e700..d2f3a58 100644 --- a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs +++ b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs @@ -5,14 +5,55 @@ namespace WF_WebAdmin.Converter { public class QuoteDTO { - private int id_quote; - private string content; - private int likes; - private string langue; - private bool isValide; - private string? reason; - private int id_caracter; - private int id_source; - private int? id_user_verif; + public int Id { get; set; } + public string Content { get; set; } + public int Likes { get; set; } + public string Langue { get; set; } + public bool IsValide { get; set; } + public string? Reason { get; set; } + public int IdCaracter { get; set; } + public int IdSource { get; set; } + public int? IdUserVerif { get; set; } + + public QuoteDTO(int id_quote, string content, int likes, string langue, bool isValide, string? reason, int id_caracter, int id_source, int? id_user_verif) + { + this.Id = id_quote; + } + + public int getId_quote() + { + return id_quote; + } + public string getContent() { + return content; + } + public int getLikes() + { + return likes; + } + public string getLangue() + { + return langue; + } + public bool getIsValide() + { + return isValide; + } + public string? getReason() + { + return reason; + } + public int getIdCaracter() + { + return id_caracter; + } + public int getIdSource() + { + return id_source; + } + public int? getIdUserVerif() + { + return id_user_verif; + } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs index a449430..c3401f3 100644 --- a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs +++ b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs @@ -1,7 +1,19 @@ -namespace WF_WebAdmin.Converter +using WF_WebAdmin.Model; + +namespace WF_WebAdmin.Converter { public class QuoteExtension { + public QuoteDTO QuoteToDTO(Quote q) + { + QuoteDTO quote = new QuoteDTO(q.Id, q.Content, q.Likes, q.Langue, q.IsValide, q.Reason, q.IdCaracter, q.IdSource, q.IdUserVerif); + return quote; + } + public Quote DTOToQuote(QuoteDTO q) + { + Quote quote = new Quote(); + return quote; + } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs index 53a25b2..4e3d711 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs @@ -10,6 +10,19 @@ public string? Reason { get; set; } public int IdCaracter { get; set; } public int IdSource { get; set; } - public int IdUserVerif { get; set; } + public int? IdUserVerif { get; set; } + + public Quote(int id, string content, int likes, string langue, bool isValide, string? reason, int idCaracter, int idSource, int idUserVerif) + { + Id = id; + Content = content; + Likes = likes; + Langue = langue; + IsValide = isValide; + Reason = reason; + IdCaracter = idCaracter; + IdSource = idSource; + IdUserVerif = idUserVerif; + } } } From 59a06339be22988b760b4fa09ea6901872b44550 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Thu, 9 Jan 2025 08:33:55 +0100 Subject: [PATCH 06/32] =?UTF-8?q?fusion=20de=20fonction=20pour=20la=20modi?= =?UTF-8?q?f=20du=20r=C3=B4le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WF-WebAdmin/Pages/DeleteUser.razor | 24 +++++++++---------- .../WF-WebAdmin/Pages/DeleteUser.razor.cs | 23 +++++++----------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor index fe1c3fa..6c180ac 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor @@ -4,9 +4,12 @@

Gestion des utilisateurs

+@if(users == null) +{ +

Aucun utilisateur présent sur le site

+} - -@if (users != null) +else {

Utilisateurs présents:

@foreach (var user in users) @@ -24,7 +27,7 @@ }

Email de l'utilisateur : @user.Email

-

Date de création de l'utilisateur : @user.DateCreation.ToShortDateString()

+

Date de création du compte : @user.DateCreation.ToShortDateString()

@if(user.Comments != null) { @@ -35,7 +38,7 @@ } else { -

Aucun commentaires

+

Aucun commentaire sur le site

} @@ -51,8 +54,8 @@
} - - @if (showPopup) + + @if (showPopupDelete) {
@@ -63,24 +66,21 @@
} - + @if (showPopupAdmin) {

Êtes-vous sûr de vouloir changer le rôle de cet utilisateur ?

- +
} } -else -{ -

Aucun utilisateurs présents sur le site

-} + @code { diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs index 8c8a98f..e2d86dc 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs @@ -9,7 +9,7 @@ namespace WF_WebAdmin.Pages private List users; - private bool showPopup = false; + private bool showPopupDelete = false; private User userToDelete = null; private bool showPopupAdmin = false; @@ -27,11 +27,11 @@ namespace WF_WebAdmin.Pages - + // ------- Popup remove user ------- private void ShowConfirmation(User user) { userToDelete = user; - showPopup = true; + showPopupDelete = true; } @@ -47,13 +47,12 @@ namespace WF_WebAdmin.Pages private void ClosePopup() { - showPopup = false; + showPopupDelete = false; + showPopupAdmin = false; } - - - + // ------- Popup admin ------- private void ShowConfirmationAdmin(User user) { userToAdmin = user; @@ -67,21 +66,15 @@ namespace WF_WebAdmin.Pages if (!userToAdmin.IsAdmin) { userToAdmin.IsAdmin = true; - ClosePopupAdmin(); + ClosePopup(); } else { userToAdmin.IsAdmin = false; - ClosePopupAdmin(); + ClosePopup(); } } - private void ClosePopupAdmin() - { - showPopupAdmin = false; - } - - } } From 4fdfc87290076714248535c7fe0035285233d331 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Thu, 9 Jan 2025 08:54:15 +0100 Subject: [PATCH 07/32] =?UTF-8?q?DTO=20user=20et=20Quote=20termin=C3=A9=20?= =?UTF-8?q?avec=20extensions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs | 7 --- .../WF-WebAdmin/Converter/AdminExtension.cs | 6 --- WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs | 44 ++++--------------- .../WF-WebAdmin/Converter/QuoteExtension.cs | 2 +- WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs | 20 +++++++++ .../WF-WebAdmin/Converter/UserExtension.cs | 19 ++++++++ WF-WebAdmin/WF-WebAdmin/Model/Quote.cs | 13 ++++++ WF-WebAdmin/WF-WebAdmin/Model/User.cs | 9 ++++ WF-WebAdmin/WF-WebAdmin/appsettings.json | 15 ++++--- 9 files changed, 79 insertions(+), 56 deletions(-) delete mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs delete mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/AdminExtension.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/UserExtension.cs diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs b/WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs deleted file mode 100644 index 4356cfe..0000000 --- a/WF-WebAdmin/WF-WebAdmin/Converter/AdminDTO.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace WF_WebAdmin.Converter -{ - public class AdminDTO - { - - } -} diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/AdminExtension.cs b/WF-WebAdmin/WF-WebAdmin/Converter/AdminExtension.cs deleted file mode 100644 index 9b6ef16..0000000 --- a/WF-WebAdmin/WF-WebAdmin/Converter/AdminExtension.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace WF_WebAdmin.Converter -{ - public class AdminExtension - { - } -} diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs index d2f3a58..f8b0fea 100644 --- a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs +++ b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs @@ -18,42 +18,14 @@ namespace WF_WebAdmin.Converter public QuoteDTO(int id_quote, string content, int likes, string langue, bool isValide, string? reason, int id_caracter, int id_source, int? id_user_verif) { this.Id = id_quote; - } - - public int getId_quote() - { - return id_quote; - } - public string getContent() { - return content; - } - public int getLikes() - { - return likes; - } - public string getLangue() - { - return langue; - } - public bool getIsValide() - { - return isValide; - } - public string? getReason() - { - return reason; - } - public int getIdCaracter() - { - return id_caracter; - } - public int getIdSource() - { - return id_source; - } - public int? getIdUserVerif() - { - return id_user_verif; + this.Content = content; + this.Likes = likes; + this.Langue = langue; + this.IsValide = isValide; + this.Reason = reason; + this.IdCaracter = id_caracter; + this.IdSource = id_source; + this.IdUserVerif = id_user_verif; } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs index c3401f3..0f3b187 100644 --- a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs +++ b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs @@ -12,7 +12,7 @@ namespace WF_WebAdmin.Converter public Quote DTOToQuote(QuoteDTO q) { - Quote quote = new Quote(); + Quote quote = new Quote(q.Id, q.Content, q.Likes, q.Langue, q.IsValide, q.Reason, q.IdCaracter, q.IdSource, q.IdUserVerif); return quote; } } diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs b/WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs new file mode 100644 index 0000000..e1b64da --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs @@ -0,0 +1,20 @@ +namespace WF_WebAdmin.Converter +{ + public class UserDTO + { + public int Id { get; set; } + public string Image { get; set; } + public string Name { get; set; } + public string Email { get; set; } + public DateTime DateCreation { get; set; } + + public UserDTO(int id, string image, string name, string email, DateTime dateCreation) + { + this.Id = id; + this.Image = image; + this.Name = name; + this.Email = email; + this.DateCreation = dateCreation; + } + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/UserExtension.cs b/WF-WebAdmin/WF-WebAdmin/Converter/UserExtension.cs new file mode 100644 index 0000000..4ff0937 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Converter/UserExtension.cs @@ -0,0 +1,19 @@ +using WF_WebAdmin.Model; + +namespace WF_WebAdmin.Converter +{ + public class UserExtension + { + public User UserToDTO(UserDTO u) + { + User user = new User(u.Id, u.Image, u.Name, u.Email, u.DateCreation); + return user; + } + + public UserDTO DTOToUser(User u) + { + UserDTO user = new UserDTO(u.Id, u.Image, u.Name, u.Email, u.DateCreation); + return user; + } + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs index 4e3d711..c640723 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs @@ -24,5 +24,18 @@ IdSource = idSource; IdUserVerif = idUserVerif; } + + public Quote(int id, string content, int likes, string langue, bool isValide, string? reason, int idCaracter, int idSource, int? idUserVerif) + { + Id = id; + Content = content; + Likes = likes; + Langue = langue; + IsValide = isValide; + Reason = reason; + IdCaracter = idCaracter; + IdSource = idSource; + IdUserVerif = idUserVerif; + } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Model/User.cs b/WF-WebAdmin/WF-WebAdmin/Model/User.cs index d599e5b..7598733 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/User.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/User.cs @@ -8,5 +8,14 @@ public string Email { get; set; } public DateTime DateCreation { get; set; } + + public User(int id, string image, string name, string email, DateTime dateCreation) + { + this.Id = id; + this.Image = image; + this.Name = name; + this.Email = email; + this.DateCreation = dateCreation; + } } } diff --git a/WF-WebAdmin/WF-WebAdmin/appsettings.json b/WF-WebAdmin/WF-WebAdmin/appsettings.json index 4d56694..3ec194b 100644 --- a/WF-WebAdmin/WF-WebAdmin/appsettings.json +++ b/WF-WebAdmin/WF-WebAdmin/appsettings.json @@ -1,9 +1,12 @@ { - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*", + "ConnectionStrings": { + "DefaultConnection": "Host=localhost;Port=5432;Database=wikifantasy3;Username=postgres;Password=postgres" } - }, - "AllowedHosts": "*" } From a52e0711134cb643bcff7cebcd37569c61574e11 Mon Sep 17 00:00:00 2001 From: "kentin.brongniart" Date: Thu, 9 Jan 2025 09:45:59 +0100 Subject: [PATCH 08/32] =?UTF-8?q?cr=C3=A9ation=20fausse=20basse=20de=20don?= =?UTF-8?q?n=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WF-WebAdmin/wwwroot/fake-dataAdmin.json | 8 ++ .../wwwroot/fake-dataCaracter.json | 52 ++++++++ .../wwwroot/fake-dataCommentaty.json | 9 ++ .../wwwroot/fake-dataDailyQuote.json | 5 + .../wwwroot/fake-dataFavorite.json | 6 + .../WF-WebAdmin/wwwroot/fake-dataImage.json | 82 ++++++++++++ .../wwwroot/fake-dataQuestion.json | 83 ++++++++++++ .../WF-WebAdmin/wwwroot/fake-dataQuiz.json | 10 ++ .../wwwroot/fake-dataQuiz_Question.json | 38 ++++++ .../WF-WebAdmin/wwwroot/fake-dataQuote.json | 126 +++++++++++++++--- .../wwwroot/fake-dataRecord_Quiz.json | 8 ++ .../WF-WebAdmin/wwwroot/fake-dataSource.json | 87 ++++++++++++ .../WF-WebAdmin/wwwroot/fake-dataUsers.json | 34 +++++ 13 files changed, 530 insertions(+), 18 deletions(-) create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataAdmin.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataCaracter.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataCommentaty.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataDailyQuote.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataFavorite.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataImage.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuestion.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz_Question.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataRecord_Quiz.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataSource.json create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataAdmin.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataAdmin.json new file mode 100644 index 0000000..ca8d360 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataAdmin.json @@ -0,0 +1,8 @@ +[ + { + "users": 1 + }, + { + "users": 4 + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataCaracter.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataCaracter.json new file mode 100644 index 0000000..4a79ed5 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataCaracter.json @@ -0,0 +1,52 @@ +[ + { + "id_caracter":82, + "caracter": "The Wolf", + "id_img": 1 + }, + { + "id_caracter":50, + "caracter": "Sirius Black", + "id_img": 2 + }, + { + "id_caracter":77, + "caracter": "Boromir", + "id_img": 3 + }, + { + "id_caracter": 29, + "caracter": "Maître Oogway", + "id_img": 4 + }, + { + "id_caracter":7, + "caracter": "Drago Malefoy", + "id_img": 5 + }, + { + "id_caracter":44, + "caracter": "T’Challa / Black Panther", + "id_img": 6 + }, + { + "id_caracter":53, + "caracter": "Butch", + "id_img": 7 + }, + { + "id_caracter": 39, + "caracter": "Coco", + "id_img": 8 + }, + { + "id_caracter": 34, + "caracter": "John Coffey", + "id_img": 9 + }, + { + "id_caracter": 38, + "caracter": "Harold", + "id_img": 10 + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataCommentaty.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataCommentaty.json new file mode 100644 index 0000000..351ff35 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataCommentaty.json @@ -0,0 +1,9 @@ +[ + { + "id_comment": 1, + "quote": 1, + "users": 1, + "dateC":"2024-10-10", + "comment": "coucou" + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataDailyQuote.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataDailyQuote.json new file mode 100644 index 0000000..e668fe0 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataDailyQuote.json @@ -0,0 +1,5 @@ +[ + { + "citation_id" : 1 + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataFavorite.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataFavorite.json new file mode 100644 index 0000000..ca20726 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataFavorite.json @@ -0,0 +1,6 @@ +[ + { + "users":1, + "quote":1 + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataImage.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataImage.json new file mode 100644 index 0000000..29201e4 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataImage.json @@ -0,0 +1,82 @@ +[ + { + "id_img": 1, + "imgPath": "https://tse4.mm.bing.net/th/id/OIP.fc5TQflh0cbxB1GUeOdk6gHaK8?w=123&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 2, + "imgPath": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 3, + "imgPath": "https://tse1.mm.bing.net/th/id/OIP._uHLsNbgnf1m1vK3ZWE2UAHaEo?w=217&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 4, + "imgPath": "https://tse4.mm.bing.net/th/id/OIP.QzDh_d2T5aADiDJ7uMFU6gHaHa?w=157&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 5, + "imgPath": "https://tse2.mm.bing.net/th/id/OIP.CthWIxuLm0a8THOguTDB_AAAAA?w=157&h=207&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 6, + "imgPath": "https://tse4.mm.bing.net/th/id/OIP.XNQPKwc1OUfvnSO9MsxDYgHaE7?w=202&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 7, + "imgPath": "https://tse1.mm.bing.net/th/id/OIP.luN_zVQJt2Kyf7H_kSrPyQHaJD?w=115&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 8, + "imgPath": "https://tse1.mm.bing.net/th/id/OIP.GPIbva8dEP6Kllx-sj5ysAHaK-?w=115&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 9, + "imgPath": "https://tse4.mm.bing.net/th/id/OIP.loqNhw71Vk_C-TiyWQJoKAHaKK?w=95&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 10, + "imgPath": "https://tse2.mm.bing.net/th/id/OIP._OiJHgI7cal4cWNHcCE9zAHaM2?w=115&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 11, + "imgPath": "https://tse2.mm.bing.net/th/id/OIP.B9RbuWnpmV-7fI8v-H0G8gHaEK?w=290&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 12, + "imgPath": "https://tse2.mm.bing.net/th/id/OIP.RrJkua2jY_o24eUG7wmk8QHaE-?w=232&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 13, + "imgPath": "https://tse3.mm.bing.net/th/id/OIP.-1Ds-2D5GPiu9uejDdmgNgHaH3?w=124&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 14, + "imgPath": "https://tse3.mm.bing.net/th/id/OIP.BeQYJEP1pQKzHDLGhTLBtgHaFj?w=243&h=182&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 15, + "imgPath": "https://tse3.mm.bing.net/th/id/OIP.lDzxwo1weGaA-hRMfV6bYwHaGp?w=194&h=174&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 16, + "imgPath": "https://tse2.mm.bing.net/th/id/OIP.3vXkEUJ9J8s-GsnBC6I3KAHaF0?w=185&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 17, + "imgPath": "https://tse4.mm.bing.net/th/id/OIP.omU-pPTNgHJEiTKJUpB1MAHaIw?w=114&h=180&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 18, + "imgPath": "https://tse2.mm.bing.net/th/id/OIP.Qoh2doQIigxyiOBuhgRx9gHaM7?w=115&h=186&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 19, + "imgPath": "https://tse3.mm.bing.net/th/id/OIP.hyDe8SvEEvDhmKfsQBqWEwHaJ8?w=194&h=261&c=7&r=0&o=5&pid=1.7" + }, + { + "id_img": 20, + "imgPath": "https://tse3.mm.bing.net/th/id/OIP.S4q6m2na1Rxkc7xZ1lcfKQHaJe?w=135&h=180&c=7&r=0&o=5&pid=1.7" + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuestion.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuestion.json new file mode 100644 index 0000000..5fb52e8 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuestion.json @@ -0,0 +1,83 @@ +[ + { + "id_question": 1, + "texte": "May the Force be with you.", + "answerA": "Star Wars", + "answerB": "Star Trek", + "answerC": "The Matrix", + "answerD": "Blade Runner", + "cAnswer": "Star Wars" + }, + { + "id_question": 2, + "texte": "I m gonna make him an offer he can t refuse.", + "answerA": "The Godfather", + "answerB": "Goodfellas", + "answerC": "Scarface", + "answerD": "The Sopranos", + "cAnswer": "The Godfather" + }, + { + "id_question": 3, + "texte": "To infinity and beyond!", + "answerA": "Toy Story", + "answerB": "The Incredibles", + "answerC": "Finding Nemo", + "answerD": "Shrek", + "cAnswer": "Toy Story" + }, + { + "id_question": 4, + "texte": "All we have to decide is what to do with the time that is given to us.", + "answerA": "The Lord of the Rings", + "answerB": "Harry Potter", + "answerC": "The Hobbit", + "answerD": "Narnia", + "cAnswer": "The Lord of the Rings" + }, + { + "id_question": 5, + "texte": "I am your father.", + "answerA": "Star Wars", + "answerB": "Star Wars", + "answerC": "Star Trek", + "answerD": "Guardians of the Galaxy", + "cAnswer": "Star Wars" + }, + { + "id_question": 6, + "texte": "It is a trap!", + "answerA": "Star Wars", + "answerB": "Battlestar Galactica", + "answerC": "Star Trek", + "answerD": "The Matrix", + "cAnswer": "Star Wars" + }, + { + "id_question": 7, + "texte": "Winter is coming.", + "answerA": "Game of Thrones", + "answerB": "The Witcher", + "answerC": "Vikings", + "answerD": "The Mandalorian", + "cAnswer": "Game of Thrones" + }, + { + "id_question": 8, + "texte": "Elementary, my dear Watson.", + "answerA": "Sherlock Holmes", + "answerB": "Agatha Christie", + "answerC": "Poirot", + "answerD": "The Hound of the Baskervilles", + "cAnswer": "Sherlock Holmes" + }, + { + "id_question": 9, + "texte": "Here is looking at you, kid.", + "answerA": "Casablanca", + "answerB": "Gone with the Wind", + "answerC": "Citizen Kane", + "answerD": "The Maltese Falcon", + "cAnswer": "Casablanca" + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json new file mode 100644 index 0000000..9400dd3 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json @@ -0,0 +1,10 @@ +[ + { + "id_quiz": 1, + "nb_quest": 4 + }, + { + "id_quiz": 2, + "nb_quest": 5 + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz_Question.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz_Question.json new file mode 100644 index 0000000..327365d --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz_Question.json @@ -0,0 +1,38 @@ +[ + { + "quiz":1, + "question":1 + }, + { + "quiz":1, + "question":2 + }, + { + "quiz":1, + "question":3 + }, + { + "quiz":1, + "question":4 + }, + { + "quiz":2, + "question":5 + }, + { + "quiz":2, + "question":6 + }, + { + "quiz":2, + "question":7 + }, + { + "quiz":2, + "question":8 + }, + { + "quiz":2, + "question":9 + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json index 1378868..39d4bd4 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json @@ -1,22 +1,112 @@ [ { - "Id": 1, - "Content": "'Dans le monde il n’y a pas d’un côté le bien et le mal, il y a une part de lumière et d’ombre en chacun de nous. Ce qui compte c’est celle que l’on choisit de montrer dans nos actes, ça c’est ce que l’on est vraiment.'", - "Charac": "Sirius Black", - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "TitleSrc": "Harry Potter et L’ordre du Phoenix", - "DateSrc": "2001-01-01", - "Like": 20, - "Langue": "fr" - }, - { - "Id": 2, - "Content": "'Une autre citation'", - "Charac": "Un personnage", - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.zR4rzkK7q2wCcNwZd6jjegHaIC?w=163&h=180&c=7&r=0&o=5&pid=1.7", - "TitleSrc": "Un super film", - "DateSrc": "2002-02-02", - "Like": 0, - "Langue": "fr" + "id_quote": "1", + "content": "Dans le monde il n’y a pas d’un côté le bien et le mal, il y a une part de lumière et d’ombre en chacun de nous. Ce qui compte c’est celle que l’on choisit de montrer dans nos actes, ça c’est ce que l’on est vraiment.", + "likes": 0, + "langue": "fr", + "isValide": true, + "reason": "insertion de test", + "id_caracter": 50, + "id_source": 38, + "id_user_verif": 1 + }, + { + "id_quote": "22", + "content": "Nous avons parié, mon père et moi. Je ne crois pas que tu tiendras dix minutes dans ce tournoi. Lui, il n’est pas d’accord, il croit que tu n’en tiendras pas cinq.", + "likes": 0, + "langue": "fr", + "isValide": true, + "reason": "insertion de test", + "id_caracter": 7, + "id_source": 58, + "id_user_verif": 1 + }, + { + "id_quote": "45", + "content": "Je vous aurais suivi mon frère, mon capitaine, mon roi.", + "likes": 0, + "langue": "fr", + "isValide": true, + "reason": "insertion de test", + "id_caracter": 77, + "id_source": 76, + "id_user_verif": 1 + }, + { + "id_quote": "90", + "content": "Si vous le voulez bien, on se taillera des pipes plus tard, les enfants.", + "likes": 0, + "langue": "fr", + "isValide": true, + "reason": "insertion de test", + "id_caracter": 82, + "id_source": 9, + "id_user_verif": 1 + }, + { + "id_quote": "91", + "content": "Je fais le mort dans la 5e.", + "likes": 0, + "langue": "fr", + "isValide": true, + "reason": "insertion de test", + "id_caracter": 53, + "id_source": 9, + "id_user_verif": 1 + }, + { + "id_quote": "110", + "content": "Il les a tuées avec leur amour. C’est comme ça tous les jours dans le monde entier.", + "likes": 0, + "langue": "fr", + "isValide": true, + "reason": "insertion de test", + "id_caracter": 34, + "id_source": 74, + "id_user_verif": 1 + }, + { + "id_quote": "118", + "content": "La vengeance est un déesse dévorante. Eux aussi en sont victimes… Je ne dois pas céder à son appel. La justice finira par triompher.", + "likes": 0, + "langue": "fr", + "isValide": false, + "reason": "insertion de test", + "id_caracter": 44, + "id_source": 30, + "id_user_verif": 1 + }, + { + "id_quote": "185", + "content": "Tu viens de me montrer au complet ?!", + "likes": 0, + "langue": "fr", + "isValide": false, + "reason": "insertion de test", + "id_caracter": 38, + "id_source": 10, + "id_user_verif": 1 + }, + { + "id_quote": "182", + "content": "Nouille ou pas nouille, tu te préoccupes trop de ce qui a été ou de ce qui sera.", + "likes": 0, + "langue": "fr", + "isValide": false, + "reason": "insertion de test", + "id_caracter": 29, + "id_source": 71, + "id_user_verif": 1 + }, + { + "id_quote": "175", + "content": "Arrête de faire ton Jean-Jacques !", + "likes": 0, + "langue": "fr", + "isValide": false, + "reason": "insertion de test", + "id_caracter": 39, + "id_source": 68, + "id_user_verif": 1 } ] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataRecord_Quiz.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataRecord_Quiz.json new file mode 100644 index 0000000..315a27e --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataRecord_Quiz.json @@ -0,0 +1,8 @@ +[ + { + "users":1, + "quiz":1, + "nbPoint":3, + "timeQ": 0 + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataSource.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataSource.json new file mode 100644 index 0000000..efc2ddb --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataSource.json @@ -0,0 +1,87 @@ +[ + { + "id_source": 1, + "title": "Cars", + "dateS": 2006 + }, + { + "id_source": 2, + "title": "Le Parrain, 3ème partie", + "dateS": 1972 + }, + { + "id_source": 3, + "title": "Hunger Games : la révolte - 1re partie", + "dateS": 2012 + }, + { + "id_source": 4, + "title": "Le hobbit : la désolation de Smaug", + "dateS": 2012 + }, + { + "id_source": 5, + "title": "Là-haut", + "dateS": 2009 + }, + { + "id_source": 6, + "title": "Raiponce", + "dateS": 2010 + }, + { + "id_source": 7, + "title": "Harry Potter et les reliques de la mort - 1re partie", + "dateS": 2001 + }, + { + "id_source": 8, + "title": "Le seigneur des anneaux : les deux tours", + "dateS": 2001 + }, + { + "id_source": 9, + "title": "Pulp Fiction", + "dateS": 1994 + }, + { + "id_source": 10, + "title": "Dragons", + "dateS": 2010 + }, + { + "id_source": 30, + "title": "Captain America : civil war", + "dateS": 2011 + }, + { + "id_source": 38, + "title": "Harry Potter et L’ordre du Phoenix", + "dateS": 2001 + }, + { + "id_source": 58, + "title": "Harry Potter et les reliques de la mort - 2e partie", + "dateS": 2001 + }, + { + "id_source": 68, + "title": "Coco", + "dateS": 2017 + }, + { + "id_source": 71, + "title": "Kung Fu Panda", + "dateS": 2008 + }, + { + "id_source": 74, + "title": "La Ligne Verte", + "dateS": 1999 + }, + { + "id_source": 76, + "title": "Le seigneur des anneaux : la communauté de l’anneau", + "dateS": 2001 + } +] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json new file mode 100644 index 0000000..5550b8b --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json @@ -0,0 +1,34 @@ +[ + { + "id_user": 1, + "username": "exploit", + "email": "exploit@gmail.com", + "password": "passwd", + "img": 1, + "creation": "2024-11-12" + }, + { + "id_user": 2, + "username": "Demo", + "email": "demo@gmail.com", + "password": "passwd", + "img": 2, + "creation": "2024-12-12" + }, + { + "id_user": 3, + "username": "testeur", + "email": "testeur@gmail.com", + "password": "passwd", + "img": 3, + "creation": "2024-08-02" + }, + { + "id_user": 4, + "username": "dev", + "email": "dev@gmail.com", + "password": "passwd", + "img": 4, + "creation": "2024-10-10" + } +] \ No newline at end of file From 226e2531b09c0195415ad85e63e0eea625570abf Mon Sep 17 00:00:00 2001 From: "kentin.brongniart" Date: Thu, 9 Jan 2025 09:47:04 +0100 Subject: [PATCH 09/32] =?UTF-8?q?cr=C3=A9ation=20fausse=20basse=20de=20don?= =?UTF-8?q?n=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs | 3 +- .../WF-WebAdmin/Pages/ValidQuote.razor.cs | 6 +- WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj | 2 +- .../wwwroot/fake-dataModifQuote.json | 90 ------------------- .../WF-WebAdmin/wwwroot/fake-dataUser.json | 31 ------- .../wwwroot/fake-dataValidQuote.json | 20 ----- 6 files changed, 5 insertions(+), 147 deletions(-) delete mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataModifQuote.json delete mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json delete mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataValidQuote.json diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs index d98f86e..b9e90bc 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs @@ -1,5 +1,4 @@ -using Blazored.LocalStorage; -using Blazorise.DataGrid; +using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; using WF_WebAdmin.Model; diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs index a42112a..931d835 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs @@ -12,9 +12,9 @@ namespace WF_WebAdmin.Pages public partial class ValidQuote { // Chaîne de connexion à adapter - private const string connectionString = - "Host=localhost;Port=5432;Database=wikifantasy3;Username=postgres;Password=postgres"; - + private const string connectionString = + "pgsql:host=localhost;dbname=dbkekentin;Username=kekentin;Password=passwd"; + //"Host=localhost;Port=5432;Database=wikifantasy3;Username=postgres;Password=postgres"; private List quotes; protected override async Task OnInitializedAsync() diff --git a/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj b/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj index e4eb494..a060d8e 100644 --- a/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj +++ b/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj @@ -1,4 +1,4 @@ - + net6.0 diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataModifQuote.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataModifQuote.json deleted file mode 100644 index 20f7d2a..0000000 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataModifQuote.json +++ /dev/null @@ -1,90 +0,0 @@ -[ - { - "Id": 1, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Content": "Harry POTTER JE SUIS TON PERE", - "Charac": "Sirius Black", - "TitleSrc": "Harry Potter", - "Langue": "fr", - "UserProposition": "demo", - "DateSrc": "2001-01-01", - "Like": 20 - }, - { - "Id": 2, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.zR4rzkK7q2wCcNwZd6jjegHaIC?w=163&h=180&c=7&r=0&o=5&pid=1.7", - "Content": "'Une autre citation'", - "Charac": "Un personnage", - "TitleSrc": "Un super film", - "Langue": "fr", - "DateSrc": "2002-02-02", - "Like": 0, - "UserProposition": "exploit" - }, - { - "Id": 1, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Content": "Harry POTTER JE SUIS TON PERE", - "Charac": "Sirius Black", - "TitleSrc": "Harry Potter", - "Langue": "fr", - "UserProposition": "demo", - "DateSrc": "2001-01-01", - "Like": 20 - }, - { - "Id": 2, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.zR4rzkK7q2wCcNwZd6jjegHaIC?w=163&h=180&c=7&r=0&o=5&pid=1.7", - "Content": "'Une autre citation'", - "Charac": "Un personnage", - "TitleSrc": "Un super film", - "Langue": "fr", - "DateSrc": "2002-02-02", - "Like": 0, - "UserProposition": "exploit" - }, - { - "Id": 1, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Content": "Harry POTTER JE SUIS TON PERE", - "Charac": "Sirius Black", - "TitleSrc": "Harry Potter", - "Langue": "fr", - "UserProposition": "demo", - "DateSrc": "2001-01-01", - "Like": 20 - }, - { - "Id": 2, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.zR4rzkK7q2wCcNwZd6jjegHaIC?w=163&h=180&c=7&r=0&o=5&pid=1.7", - "Content": "'Une autre citation'", - "Charac": "Un personnage", - "TitleSrc": "Un super film", - "Langue": "fr", - "DateSrc": "2002-02-02", - "Like": 0, - "UserProposition": "exploit" - }, - { - "Id": 1, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Content": "Harry POTTER JE SUIS TON PERE", - "Charac": "Sirius Black", - "TitleSrc": "Harry Potter", - "Langue": "fr", - "UserProposition": "demo", - "DateSrc": "2001-01-01", - "Like": 20 - }, - { - "Id": 2, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.zR4rzkK7q2wCcNwZd6jjegHaIC?w=163&h=180&c=7&r=0&o=5&pid=1.7", - "Content": "'Une autre citation'", - "Charac": "Un personnage", - "TitleSrc": "Un super film", - "Langue": "fr", - "DateSrc": "2002-02-02", - "Like": 0, - "UserProposition": "exploit" - } -] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json deleted file mode 100644 index 60632fc..0000000 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json +++ /dev/null @@ -1,31 +0,0 @@ -[ - { - "Id": 1, - "Image": "https://tse4.mm.bing.net/th/id/OIP.fc5TQflh0cbxB1GUeOdk6gHaK8?w=123&h=180&c=7&r=0&o=5&pid=1.7", - "Name": "Demo", - "Email": "demo@gmail.com", - "DateCreation": "2024-12-12" - - }, - { - "Id": 2, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "exploit", - "Email": "exploit@gmail.com", - "DateCreation": "2024-11-12" - }, - { - "Id": 3, - "Image": "https://tse4.mm.bing.net/th/id/OIP.XNQPKwc1OUfvnSO9MsxDYgHaE7?w=202&h=180&c=7&r=0&o=5&pid=1.7", - "Name": "testeur", - "Email": "testeur@gmail.com", - "DateCreation": "2024-08-02" - }, - { - "Id": 4, - "Image": "https://tse2.mm.bing.net/th/id/OIP.3vXkEUJ9J8s-GsnBC6I3KAHaF0?w=185&h=180&c=7&r=0&o=5&pid=1.7", - "Name": "dev", - "Email": "dev@gmail.com", - "DateCreation": "2024-10-10" - } -] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataValidQuote.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataValidQuote.json deleted file mode 100644 index e004ed9..0000000 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataValidQuote.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "Id": 1, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Content": "'Dans le monde il n’y a pas d’un côté le bien et le mal, il y a une part de lumière et d’ombre en chacun de nous. Ce qui compte c’est celle que l’on choisit de montrer dans nos actes, ça c’est ce que l’on est vraiment.'", - "Charac": "Sirius Black", - "TitleSrc": "Harry Potter et L’ordre du Phoenix", - "Langue": "fr", - "UserProposition": "demo" - }, - { - "Id": 2, - "ImgPath": "https://tse2.mm.bing.net/th/id/OIP.zR4rzkK7q2wCcNwZd6jjegHaIC?w=163&h=180&c=7&r=0&o=5&pid=1.7", - "Content": "'Une autre citation'", - "Charac": "Un personnage", - "TitleSrc": "Un super film", - "Langue": "fr", - "UserProposition": "exploit" - } -] \ No newline at end of file From b416e774afa2401ffe94138ba8a42136d4a539c3 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Thu, 9 Jan 2025 10:14:22 +0100 Subject: [PATCH 10/32] Ajout de la page login + affichage des commentaires par utilisateur --- WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs | 4 +- WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor | 2 +- .../WF-WebAdmin/Pages/DeleteUser.razor | 3 +- WF-WebAdmin/WF-WebAdmin/Pages/Login.razor | 81 +++++++++++++++++++ WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs | 13 +++ WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor | 11 ++- WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 2 +- .../WF-WebAdmin/wwwroot/fake-dataUser.json | 76 ++++++++--------- 8 files changed, 148 insertions(+), 44 deletions(-) create mode 100644 WF-WebAdmin/WF-WebAdmin/Pages/Login.razor create mode 100644 WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs b/WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs index c3251c3..acb43ef 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/Commentary.cs @@ -2,8 +2,8 @@ { public class Commentary { - public int Id { get; set; } - public int IdUser { get; set; } + //public int Id { get; set; } + //public int IdUser { get; set; } public string Text { get; set; } public DateTime DateCreation { get; set; } } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor index bba7495..7bc505b 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor @@ -1,4 +1,4 @@ -@page "/" +@page "/Accueil" Accueil diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor index 6c180ac..0b0ec58 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor @@ -31,9 +31,10 @@ else @if(user.Comments != null) { +

▶ Commentaire(s) posté(s) par @user.Name :

@foreach (var comment in user.Comments) { -

Commentaire (@comment.) : @comment.Text

+

@comment.DateCreation.ToShortDateString() - @comment.Text

} } else diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor new file mode 100644 index 0000000..f9f7369 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor @@ -0,0 +1,81 @@ +@page "/" +

▶ Connexion ◀

+ + + + + +@code { + private void ShowFullSite() + { + // Code pour afficher l'ensemble du menu + // Cela peut être un appel à une méthode ou un service qui change l'état de la visibilité du menu + } +} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs new file mode 100644 index 0000000..0f288f5 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs @@ -0,0 +1,13 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Configuration.UserSecrets; +using WF_WebAdmin.Model; + + + +namespace WF_WebAdmin.Pages +{ + public partial class Login + { + + } +} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor index d4c1b4f..2967cee 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor @@ -11,7 +11,13 @@
@@ -57,3 +63,4 @@ collapseNavMenu = !collapseNavMenu; } } + diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css index 9f8f5cf..7edc28f 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css @@ -86,7 +86,7 @@ button { border-radius: 25px; } -.pseudo, .mail, .idUser, .dateCrea, .idQuote, .contentQuote, .CaracterQuote, .SourceQuote, .langueQuote, .UserPropositionQuote { +.pseudo, .mail, .idUser, .dateCrea, .idQuote, .contentQuote, .CaracterQuote, .SourceQuote, .langueQuote, .UserPropositionQuote, titleComments, comments { margin-left: 10px; } diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json index 519f6ca..0547f7e 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json @@ -5,7 +5,17 @@ "Name": "Admin", "Email": "admin@gmail.com", "DateCreation": "2024-12-12", - "IsAdmin": true + "IsAdmin": true, + "Comments": [ + { + "Text": "Commentaire 1", + "DateCreation": "2024-12-12" + }, + { + "Text": "Commentaire 2", + "DateCreation": "2024-11-12" + } + ] }, { "Id": 2, @@ -21,7 +31,13 @@ "Name": "testeur", "Email": "testeur@gmail.com", "DateCreation": "2024-08-02", - "IsAdmin": false + "IsAdmin": false, + "Comments": [ + { + "Text": "Premier test effectué, tout semble OK.", + "DateCreation": "2024-08-02" + } + ] }, { "Id": 4, @@ -37,7 +53,13 @@ "Name": "jean_doe", "Email": "jean.doe@gmail.com", "DateCreation": "2024-06-25", - "IsAdmin": false + "IsAdmin": false, + "Comments": [ + { + "Text": "Utilisateur très actif, peut être un peu trop intrusif.", + "DateCreation": "2024-06-25" + } + ] }, { "Id": 6, @@ -69,7 +91,13 @@ "Name": "support_mark", "Email": "support.mark@gmail.com", "DateCreation": "2024-11-20", - "IsAdmin": false + "IsAdmin": false, + "Comments": [ + { + "Text": "Support rapide et efficace, mais manquant un peu de détails.", + "DateCreation": "2024-11-20" + } + ] }, { "Id": 10, @@ -85,7 +113,13 @@ "Name": "designer_steve", "Email": "designer.steve@gmail.com", "DateCreation": "2024-07-01", - "IsAdmin": false + "IsAdmin": false, + "Comments": [ + { + "Text": "Le design doit être retravaillé pour plus de clarté.", + "DateCreation": "2024-07-01" + } + ] }, { "Id": 12, @@ -126,37 +160,5 @@ "Email": "admin.kate@gmail.com", "DateCreation": "2024-04-16", "IsAdmin": true - }, - { - "Id": 17, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "support_olivia", - "Email": "support.olivia@gmail.com", - "DateCreation": "2024-07-30", - "IsAdmin": false - }, - { - "Id": 18, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "assistant_jack", - "Email": "assistant.jack@gmail.com", - "DateCreation": "2024-10-03", - "IsAdmin": false - }, - { - "Id": 19, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "developer_bob", - "Email": "developer.bob@gmail.com", - "DateCreation": "2024-06-01", - "IsAdmin": false - }, - { - "Id": 20, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "admin_sophie", - "Email": "admin.sophie@gmail.com", - "DateCreation": "2024-12-05", - "IsAdmin": true } ] \ No newline at end of file From 77d8653ffde8f7cb04473a4d4dc7ee5ec7a712d7 Mon Sep 17 00:00:00 2001 From: Louis GUICHARD-MONTGUERS Date: Thu, 9 Jan 2025 10:15:39 +0100 Subject: [PATCH 11/32] ajout --- .../WF-WebAdmin/Service/QuoteServiceLocal.cs | 119 ++++++++++++++++++ WF-WebAdmin/WF-WebAdmin/_Imports.razor | 1 + 2 files changed, 120 insertions(+) create mode 100644 WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceLocal.cs diff --git a/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceLocal.cs b/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceLocal.cs new file mode 100644 index 0000000..433e5d4 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceLocal.cs @@ -0,0 +1,119 @@ +using WF_WebAdmin.Converter; +using WF_WebAdmin.Model; +using Npgsql; + +namespace WF_WebAdmin.Service +{ + public class QuoteServiceLocal: IQuoteService + { + private readonly string? _connectionString = "Host=localhost;Port=5432;Username=loguichard3;Password=Reglisse15.;Database=dbloguichard3"; + + + + + public async Task AddQuoteAsync(Quote quote) + { + QuoteExtension extension = new QuoteExtension(); + QuoteDTO quoteDTO = extension.QuoteToDTO(quote); + + // Utilisation de NpgsqlConnection pour PostgreSQL + using (var connection = new NpgsqlConnection(_connectionString)) + { + // Définir la requête SQL d'insertion + var commandText = "INSERT INTO Quote (content, langue, reason, id_source, id_caracter, id_user_verif, img_path) " + + "VALUES (@content, @langue, @reason, @source, @character, @user, @img_path)"; + + // Créer une commande Npgsql + var command = new NpgsqlCommand(commandText, connection); + + // Ajouter des paramètres à la commande + command.Parameters.AddWithValue("@content", quote.Content); + command.Parameters.AddWithValue("@langue", quote.Langue); + command.Parameters.AddWithValue("@reason", "À vérifier"); // Vous pouvez changer ça si nécessaire + command.Parameters.AddWithValue("@source", quote.Source); + command.Parameters.AddWithValue("@character", quote.Character); + command.Parameters.AddWithValue("@user", quote.User); // Assurez-vous que `quote.User` est correctement défini + command.Parameters.AddWithValue("@img_path", quote.ImgPath); + + try + { + // Ouvrir la connexion à la base de données + await connection.OpenAsync(); + + // Exécuter la commande d'insertion + await command.ExecuteNonQueryAsync(); + } + catch (Exception ex) + { + // Gérer les erreurs ici (par exemple, afficher ou enregistrer les erreurs) + Console.WriteLine($"Une erreur est survenue lors de l'ajout de la citation : {ex.Message}"); + } + finally + { + // Fermer la connexion (automatiquement géré avec `using`, mais ajouté pour explicitement montrer le processus) + await connection.CloseAsync(); + } + } + + // Retourner l'objet DTO pour que vous puissiez l'utiliser ailleurs dans votre application + return quoteDTO; + } + } + + public Task RemoveQuote(Quote quote) + { + QuoteExtension extension = new QuoteExtension(); + QuoteDTO quoteDTO = extension.QuoteToDTO(quote); + + return Task.FromResult(quoteDTO); + } + + public Task validQuote(Quote quote) + { + QuoteExtension extension = new QuoteExtension(); + QuoteDTO quoteDTO = extension.QuoteToDTO(quote); + + return Task.FromResult(quoteDTO); + } + + public Task updateQuote(Quote quote) + { + QuoteExtension extension = new QuoteExtension(); + QuoteDTO quoteDTO = extension.QuoteToDTO(quote); + + return Task.FromResult(quoteDTO); + } + + public Task> getAllQuote() + { + + } + + public Task> getSomeQuote(int nb, int page) + { + + } + + public Task> getOnequote(int id) + { + + } + + public Task> reserchQuote(string reserch, List argument) + { + + } + + public Task> getAllQuoteInvalid() + { + + } + + public Task> getSomeQuoteInvalid(int nb, int page) + { + + } + + + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/_Imports.razor b/WF-WebAdmin/WF-WebAdmin/_Imports.razor index f261bea..cbc1f08 100644 --- a/WF-WebAdmin/WF-WebAdmin/_Imports.razor +++ b/WF-WebAdmin/WF-WebAdmin/_Imports.razor @@ -9,3 +9,4 @@ @using WF_WebAdmin @using WF_WebAdmin.Shared @using Blazorise.DataGrid + From 5ed7fa68d85589e6be28d776d7d7841370771005 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Thu, 9 Jan 2025 10:16:12 +0100 Subject: [PATCH 12/32] css login --- WF-WebAdmin/WF-WebAdmin/Pages/Login.razor | 53 -------------------- WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 52 ++++++++++++++++++- 2 files changed, 51 insertions(+), 54 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor index f9f7369..7fc91e3 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor @@ -18,59 +18,6 @@ @* *@ - @code { private void ShowFullSite() diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css index 7edc28f..98f5a67 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css @@ -121,4 +121,54 @@ button { gap: 10px; width: 300px; text-align: center; -} \ No newline at end of file +} + + +.buttonSubmitDiv { + text-align: center; +} + +h1 { + text-align: center; + font-size: 32px; + margin-top: 10%; +} + +p { + margin-top: 6%; + margin-bottom: 2%; + font-size: 20px; + font-family: "Lemon", serif; +} + +.login { + width: 35vw; + margin-left: 30.5vw; + margin-top: 3vh; + border-radius: 25px; + padding: 2vw; + background-color: #cfcfcf; +} + + +/*Page login*/ +.buttonSudmite { + border: none; + padding: 2%; + margin-top: 5%; + border-radius: 25px; + width: 50%; + font-size: 1.25em; + background-color: white; +} + +.connexion { + width: 94%; + height: 40px; + padding-left: 3%; + margin-left: 1%; + margin-top: -1%; + border-radius: 25px; + border: none; + font-size: 15px; +} From afa6845535563a1bebabe9392de641659c4bb885 Mon Sep 17 00:00:00 2001 From: Leni BEAULATON Date: Thu, 9 Jan 2025 10:20:23 +0100 Subject: [PATCH 13/32] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'WF-WebAdmin/?= =?UTF-8?q?WF-WebAdmin/wwwroot/fake-dataUsers.json'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WF-WebAdmin/wwwroot/fake-dataUsers.json | 196 +++++++++++++++--- 1 file changed, 163 insertions(+), 33 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json index 5550b8b..07db7bb 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json @@ -1,34 +1,164 @@ -[ - { - "id_user": 1, - "username": "exploit", - "email": "exploit@gmail.com", - "password": "passwd", - "img": 1, - "creation": "2024-11-12" - }, - { - "id_user": 2, - "username": "Demo", - "email": "demo@gmail.com", - "password": "passwd", - "img": 2, - "creation": "2024-12-12" - }, - { - "id_user": 3, - "username": "testeur", - "email": "testeur@gmail.com", - "password": "passwd", - "img": 3, - "creation": "2024-08-02" - }, - { - "id_user": 4, - "username": "dev", - "email": "dev@gmail.com", - "password": "passwd", - "img": 4, - "creation": "2024-10-10" - } +[ + { + "Id": 1, + "Image": "https://tse4.mm.bing.net/th/id/OIP.fc5TQflh0cbxB1GUeOdk6gHaK8?w=123&h=180&c=7&r=0&o=5&pid=1.7", + "Name": "Admin", + "Email": "admin@gmail.com", + "DateCreation": "2024-12-12", + "IsAdmin": true, + "Comments": [ + { + "Text": "Commentaire 1", + "DateCreation": "2024-12-12" + }, + { + "Text": "Commentaire 2", + "DateCreation": "2024-11-12" + } + ] + }, + { + "Id": 2, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "exploit", + "Email": "exploit@gmail.com", + "DateCreation": "2024-11-12", + "IsAdmin": true + }, + { + "Id": 3, + "Image": "https://tse4.mm.bing.net/th/id/OIP.XNQPKwc1OUfvnSO9MsxDYgHaE7?w=202&h=180&c=7&r=0&o=5&pid=1.7", + "Name": "testeur", + "Email": "testeur@gmail.com", + "DateCreation": "2024-08-02", + "IsAdmin": false, + "Comments": [ + { + "Text": "Premier test effectué, tout semble OK.", + "DateCreation": "2024-08-02" + } + ] + }, + { + "Id": 4, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev", + "Email": "dev@gmail.com", + "DateCreation": "2024-10-10", + "IsAdmin": false + }, + { + "Id": 5, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "jean_doe", + "Email": "jean.doe@gmail.com", + "DateCreation": "2024-06-25", + "IsAdmin": false, + "Comments": [ + { + "Text": "Utilisateur très actif, peut être un peu trop intrusif.", + "DateCreation": "2024-06-25" + } + ] + }, + { + "Id": 6, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "jane_smith", + "Email": "jane.smith@gmail.com", + "DateCreation": "2024-07-15", + "IsAdmin": false + }, + { + "Id": 7, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_joe", + "Email": "admin.joe@gmail.com", + "DateCreation": "2024-05-30", + "IsAdmin": true + }, + { + "Id": 8, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev_anna", + "Email": "dev.anna@gmail.com", + "DateCreation": "2024-09-05", + "IsAdmin": false + }, + { + "Id": 9, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "support_mark", + "Email": "support.mark@gmail.com", + "DateCreation": "2024-11-20", + "IsAdmin": false, + "Comments": [ + { + "Text": "Support rapide et efficace, mais manquant un peu de détails.", + "DateCreation": "2024-11-20" + } + ] + }, + { + "Id": 10, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev_susan", + "Email": "dev.susan@gmail.com", + "DateCreation": "2024-08-12", + "IsAdmin": false + }, + { + "Id": 11, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "designer_steve", + "Email": "designer.steve@gmail.com", + "DateCreation": "2024-07-01", + "IsAdmin": false, + "Comments": [ + { + "Text": "Le design doit être retravaillé pour plus de clarté.", + "DateCreation": "2024-07-01" + } + ] + }, + { + "Id": 12, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_lucas", + "Email": "admin.lucas@gmail.com", + "DateCreation": "2024-09-22", + "IsAdmin": true + }, + { + "Id": 13, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "manager_anna", + "Email": "manager.anna@gmail.com", + "DateCreation": "2024-05-01", + "IsAdmin": false + }, + { + "Id": 14, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "developer_mike", + "Email": "developer.mike@gmail.com", + "DateCreation": "2024-11-02", + "IsAdmin": false + }, + { + "Id": 15, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "test_user_01", + "Email": "test.user01@gmail.com", + "DateCreation": "2024-06-10", + "IsAdmin": false + }, + { + "Id": 16, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_kate", + "Email": "admin.kate@gmail.com", + "DateCreation": "2024-04-16", + "IsAdmin": true + } ] \ No newline at end of file From ce916e442201b56a575bcf54795586f4c3752381 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Thu, 9 Jan 2025 10:28:39 +0100 Subject: [PATCH 14/32] renommage --- .../wwwroot/{fake-dataUser.json => fake-dataUsers.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename WF-WebAdmin/WF-WebAdmin/wwwroot/{fake-dataUser.json => fake-dataUsers.json} (100%) diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json similarity index 100% rename from WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUser.json rename to WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json From 2d83bd8014007596ec1a6b5f681f76598eb47bcb Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Thu, 9 Jan 2025 10:32:39 +0100 Subject: [PATCH 15/32] pour la fusion --- .../WF-WebAdmin/wwwroot/fake-dataUsers.json | 164 ------------------ 1 file changed, 164 deletions(-) delete mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json deleted file mode 100644 index 0547f7e..0000000 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json +++ /dev/null @@ -1,164 +0,0 @@ -[ - { - "Id": 1, - "Image": "https://tse4.mm.bing.net/th/id/OIP.fc5TQflh0cbxB1GUeOdk6gHaK8?w=123&h=180&c=7&r=0&o=5&pid=1.7", - "Name": "Admin", - "Email": "admin@gmail.com", - "DateCreation": "2024-12-12", - "IsAdmin": true, - "Comments": [ - { - "Text": "Commentaire 1", - "DateCreation": "2024-12-12" - }, - { - "Text": "Commentaire 2", - "DateCreation": "2024-11-12" - } - ] - }, - { - "Id": 2, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "exploit", - "Email": "exploit@gmail.com", - "DateCreation": "2024-11-12", - "IsAdmin": true - }, - { - "Id": 3, - "Image": "https://tse4.mm.bing.net/th/id/OIP.XNQPKwc1OUfvnSO9MsxDYgHaE7?w=202&h=180&c=7&r=0&o=5&pid=1.7", - "Name": "testeur", - "Email": "testeur@gmail.com", - "DateCreation": "2024-08-02", - "IsAdmin": false, - "Comments": [ - { - "Text": "Premier test effectué, tout semble OK.", - "DateCreation": "2024-08-02" - } - ] - }, - { - "Id": 4, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "dev", - "Email": "dev@gmail.com", - "DateCreation": "2024-10-10", - "IsAdmin": false - }, - { - "Id": 5, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "jean_doe", - "Email": "jean.doe@gmail.com", - "DateCreation": "2024-06-25", - "IsAdmin": false, - "Comments": [ - { - "Text": "Utilisateur très actif, peut être un peu trop intrusif.", - "DateCreation": "2024-06-25" - } - ] - }, - { - "Id": 6, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "jane_smith", - "Email": "jane.smith@gmail.com", - "DateCreation": "2024-07-15", - "IsAdmin": false - }, - { - "Id": 7, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "admin_joe", - "Email": "admin.joe@gmail.com", - "DateCreation": "2024-05-30", - "IsAdmin": true - }, - { - "Id": 8, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "dev_anna", - "Email": "dev.anna@gmail.com", - "DateCreation": "2024-09-05", - "IsAdmin": false - }, - { - "Id": 9, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "support_mark", - "Email": "support.mark@gmail.com", - "DateCreation": "2024-11-20", - "IsAdmin": false, - "Comments": [ - { - "Text": "Support rapide et efficace, mais manquant un peu de détails.", - "DateCreation": "2024-11-20" - } - ] - }, - { - "Id": 10, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "dev_susan", - "Email": "dev.susan@gmail.com", - "DateCreation": "2024-08-12", - "IsAdmin": false - }, - { - "Id": 11, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "designer_steve", - "Email": "designer.steve@gmail.com", - "DateCreation": "2024-07-01", - "IsAdmin": false, - "Comments": [ - { - "Text": "Le design doit être retravaillé pour plus de clarté.", - "DateCreation": "2024-07-01" - } - ] - }, - { - "Id": 12, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "admin_lucas", - "Email": "admin.lucas@gmail.com", - "DateCreation": "2024-09-22", - "IsAdmin": true - }, - { - "Id": 13, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "manager_anna", - "Email": "manager.anna@gmail.com", - "DateCreation": "2024-05-01", - "IsAdmin": false - }, - { - "Id": 14, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "developer_mike", - "Email": "developer.mike@gmail.com", - "DateCreation": "2024-11-02", - "IsAdmin": false - }, - { - "Id": 15, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "test_user_01", - "Email": "test.user01@gmail.com", - "DateCreation": "2024-06-10", - "IsAdmin": false - }, - { - "Id": 16, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "admin_kate", - "Email": "admin.kate@gmail.com", - "DateCreation": "2024-04-16", - "IsAdmin": true - } -] \ No newline at end of file From 9c76e5204e9d8b1ef735bd48031229a581f66d08 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Thu, 9 Jan 2025 10:34:49 +0100 Subject: [PATCH 16/32] encore pour la fusion --- .../WF-WebAdmin/wwwroot/fake-dataUsers.json | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json new file mode 100644 index 0000000..0547f7e --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json @@ -0,0 +1,164 @@ +[ + { + "Id": 1, + "Image": "https://tse4.mm.bing.net/th/id/OIP.fc5TQflh0cbxB1GUeOdk6gHaK8?w=123&h=180&c=7&r=0&o=5&pid=1.7", + "Name": "Admin", + "Email": "admin@gmail.com", + "DateCreation": "2024-12-12", + "IsAdmin": true, + "Comments": [ + { + "Text": "Commentaire 1", + "DateCreation": "2024-12-12" + }, + { + "Text": "Commentaire 2", + "DateCreation": "2024-11-12" + } + ] + }, + { + "Id": 2, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "exploit", + "Email": "exploit@gmail.com", + "DateCreation": "2024-11-12", + "IsAdmin": true + }, + { + "Id": 3, + "Image": "https://tse4.mm.bing.net/th/id/OIP.XNQPKwc1OUfvnSO9MsxDYgHaE7?w=202&h=180&c=7&r=0&o=5&pid=1.7", + "Name": "testeur", + "Email": "testeur@gmail.com", + "DateCreation": "2024-08-02", + "IsAdmin": false, + "Comments": [ + { + "Text": "Premier test effectué, tout semble OK.", + "DateCreation": "2024-08-02" + } + ] + }, + { + "Id": 4, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev", + "Email": "dev@gmail.com", + "DateCreation": "2024-10-10", + "IsAdmin": false + }, + { + "Id": 5, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "jean_doe", + "Email": "jean.doe@gmail.com", + "DateCreation": "2024-06-25", + "IsAdmin": false, + "Comments": [ + { + "Text": "Utilisateur très actif, peut être un peu trop intrusif.", + "DateCreation": "2024-06-25" + } + ] + }, + { + "Id": 6, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "jane_smith", + "Email": "jane.smith@gmail.com", + "DateCreation": "2024-07-15", + "IsAdmin": false + }, + { + "Id": 7, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_joe", + "Email": "admin.joe@gmail.com", + "DateCreation": "2024-05-30", + "IsAdmin": true + }, + { + "Id": 8, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev_anna", + "Email": "dev.anna@gmail.com", + "DateCreation": "2024-09-05", + "IsAdmin": false + }, + { + "Id": 9, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "support_mark", + "Email": "support.mark@gmail.com", + "DateCreation": "2024-11-20", + "IsAdmin": false, + "Comments": [ + { + "Text": "Support rapide et efficace, mais manquant un peu de détails.", + "DateCreation": "2024-11-20" + } + ] + }, + { + "Id": 10, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev_susan", + "Email": "dev.susan@gmail.com", + "DateCreation": "2024-08-12", + "IsAdmin": false + }, + { + "Id": 11, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "designer_steve", + "Email": "designer.steve@gmail.com", + "DateCreation": "2024-07-01", + "IsAdmin": false, + "Comments": [ + { + "Text": "Le design doit être retravaillé pour plus de clarté.", + "DateCreation": "2024-07-01" + } + ] + }, + { + "Id": 12, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_lucas", + "Email": "admin.lucas@gmail.com", + "DateCreation": "2024-09-22", + "IsAdmin": true + }, + { + "Id": 13, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "manager_anna", + "Email": "manager.anna@gmail.com", + "DateCreation": "2024-05-01", + "IsAdmin": false + }, + { + "Id": 14, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "developer_mike", + "Email": "developer.mike@gmail.com", + "DateCreation": "2024-11-02", + "IsAdmin": false + }, + { + "Id": 15, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "test_user_01", + "Email": "test.user01@gmail.com", + "DateCreation": "2024-06-10", + "IsAdmin": false + }, + { + "Id": 16, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_kate", + "Email": "admin.kate@gmail.com", + "DateCreation": "2024-04-16", + "IsAdmin": true + } +] \ No newline at end of file From b4c50be5784163aade68e15ad8fa2a0fef8ff973 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Thu, 9 Jan 2025 11:01:38 +0100 Subject: [PATCH 17/32] correcton bug --- WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs | 2 +- WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs index e2d86dc..9d2a681 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs @@ -22,7 +22,7 @@ namespace WF_WebAdmin.Pages protected override async Task OnInitializedAsync() { - users = await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-dataUser.json"); + users = await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-dataUsers.json"); } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs index 6bb7933..727c394 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs @@ -17,7 +17,7 @@ namespace WF_WebAdmin.Pages protected override async Task OnInitializedAsync() { - quotes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataModifQuote.json"); + //quotes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataModifQuote.json"); } } } From d1c7001bf7d7056ae0a8cc41695acda0e1b0a03b Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Thu, 9 Jan 2025 11:32:30 +0100 Subject: [PATCH 18/32] changement de nom --- WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor index 2967cee..86c7ce7 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor @@ -1,6 +1,6 @@ 
- Wiki Fantasy + What the Fantasy From 37aaf55c4a1d5cf87a43a63306e9e209b691ee2c Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Fri, 10 Jan 2025 08:22:04 +0100 Subject: [PATCH 19/32] jsp --- .../WF-WebAdmin/Converter/DailyQuoteDTO.cs | 12 ++ .../Converter/DailyQuoteExtension.cs | 13 ++ WF-WebAdmin/WF-WebAdmin/Model/DailyQuote.cs | 12 ++ WF-WebAdmin/WF-WebAdmin/Model/Quote.cs | 21 +++ .../WF-WebAdmin/Pages/ValidQuote.razor.cs | 125 +----------------- .../WF-WebAdmin/Service/QuoteServiceStub.cs | 16 +++ 6 files changed, 75 insertions(+), 124 deletions(-) create mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/DailyQuoteDTO.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Converter/DailyQuoteExtension.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Model/DailyQuote.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceStub.cs diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/DailyQuoteDTO.cs b/WF-WebAdmin/WF-WebAdmin/Converter/DailyQuoteDTO.cs new file mode 100644 index 0000000..0fb7042 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Converter/DailyQuoteDTO.cs @@ -0,0 +1,12 @@ +namespace WF_WebAdmin.Converter +{ + public class DailyQuoteDTO + { + private int Id { get; set; } + + public DailyQuoteDTO(int id) + { + this.Id = id; + } + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/DailyQuoteExtension.cs b/WF-WebAdmin/WF-WebAdmin/Converter/DailyQuoteExtension.cs new file mode 100644 index 0000000..63ec57e --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Converter/DailyQuoteExtension.cs @@ -0,0 +1,13 @@ +using WF_WebAdmin.Model; + +namespace WF_WebAdmin.Converter +{ + public class DailyQuoteExtension + { + public DailyQuoteDTO DailyQuoteToDTO(DailyQuote dq) + { + DailyQuoteDTO dailyQuote = new DailyQuoteDTO(dq.Id); + return dailyQuote; + } + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Model/DailyQuote.cs b/WF-WebAdmin/WF-WebAdmin/Model/DailyQuote.cs new file mode 100644 index 0000000..a60d8a7 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Model/DailyQuote.cs @@ -0,0 +1,12 @@ +namespace WF_WebAdmin.Model +{ + public class DailyQuote + { + public int Id { get; set; } + + public DailyQuote(int Id) + { + this.Id = Id; + } + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs index 9fcb751..dc1b304 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs @@ -10,6 +10,27 @@ public DateTime DateSrc { get; set; } public int Like { get; set; } public string Langue { get; set; } +<<<<<<< Updated upstream public string UserProposition { get; set; } +======= + public bool IsValide { get; set; } + public string? Reason { get; set; } + public int IdCaracter { get; set; } + public int IdSource { get; set; } + public int? IdUserVerif { get; set; } + + public Quote(int id, string content, int likes, string langue, bool isValide, string? reason, int idCaracter, int idSource, int? idUserVerif) + { + Id = id; + Content = content; + Likes = likes; + Langue = langue; + IsValide = isValide; + Reason = reason; + IdCaracter = idCaracter; + IdSource = idSource; + IdUserVerif = idUserVerif; + } +>>>>>>> Stashed changes } } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs index a42112a..070ee4e 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs @@ -11,129 +11,6 @@ namespace WF_WebAdmin.Pages { public partial class ValidQuote { - // Chaîne de connexion à adapter - private const string connectionString = - "Host=localhost;Port=5432;Database=wikifantasy3;Username=postgres;Password=postgres"; - - private List quotes; - - protected override async Task OnInitializedAsync() - { - // On charge toutes les citations dont isValide = false - quotes = await LoadNotValidatedQuotesAsync(); - } - - /// - /// Charge toutes les citations non validées (isValide = false) - /// et mappe les colonnes vers ton modèle. - /// - private async Task> LoadNotValidatedQuotesAsync() - { - var result = new List(); - - try - { - using var con = new NpgsqlConnection(connectionString); - await con.OpenAsync(); - - // Sélection des colonnes réellement présentes en DB - // + placeholders pour les autres - var sql = @" - SELECT - id_quote AS Id, - content AS Content, - likes AS ""Like"", - langue AS Langue, - -- Champs pas vraiment en DB : placeholders - '' AS Charac, - '' AS ImgPath, - '' AS TitleSrc, - now() AS DateSrc, - '' AS UserProposition - FROM quote - WHERE isValide = false - "; - - using var cmd = new NpgsqlCommand(sql, con); - using var reader = await cmd.ExecuteReaderAsync(); - - while (await reader.ReadAsync()) - { - var q = new Quote - { - Id = reader.GetInt32(reader.GetOrdinal("Id")), - Content = reader.GetString(reader.GetOrdinal("Content")), - Like = reader.GetInt32(reader.GetOrdinal("Like")), - Langue = reader.GetString(reader.GetOrdinal("Langue")), - // placeholders - Charac = reader.GetString(reader.GetOrdinal("Charac")), - ImgPath = reader.GetString(reader.GetOrdinal("ImgPath")), - TitleSrc = reader.GetString(reader.GetOrdinal("TitleSrc")), - DateSrc = reader.GetDateTime(reader.GetOrdinal("DateSrc")), - UserProposition = reader.GetString(reader.GetOrdinal("UserProposition")) - }; - result.Add(q); - } - } - catch (Exception ex) - { - Console.WriteLine($"[Erreur] LoadNotValidatedQuotesAsync : {ex.Message}"); - } - - return result; - } - - /// - /// Met à jour isValide = true pour la citation. - /// - private async Task ValiderQuote(int quoteId) - { - try - { - using var con = new NpgsqlConnection(connectionString); - await con.OpenAsync(); - - var sql = "UPDATE quote SET isValide = true WHERE id_quote = @Id"; - using var cmd = new NpgsqlCommand(sql, con); - cmd.Parameters.AddWithValue("Id", quoteId); - - int rowsAffected = await cmd.ExecuteNonQueryAsync(); - if (rowsAffected > 0) - { - // Supprime la quote de la liste pour l'enlever de l'affichage - quotes.RemoveAll(q => q.Id == quoteId); - } - } - catch (Exception ex) - { - Console.WriteLine($"[Erreur] ValiderQuote : {ex.Message}"); - } - } - - /// - /// Supprime complètement la citation de la base. - /// - private async Task RejeterQuote(int quoteId) - { - try - { - using var con = new NpgsqlConnection(connectionString); - await con.OpenAsync(); - - var sql = "DELETE FROM quote WHERE id_quote = @Id"; - using var cmd = new NpgsqlCommand(sql, con); - cmd.Parameters.AddWithValue("Id", quoteId); - - int rowsAffected = await cmd.ExecuteNonQueryAsync(); - if (rowsAffected > 0) - { - quotes.RemoveAll(q => q.Id == quoteId); - } - } - catch (Exception ex) - { - Console.WriteLine($"[Erreur] RejeterQuote : {ex.Message}"); - } - } + } } diff --git a/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceStub.cs b/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceStub.cs new file mode 100644 index 0000000..e3e9f5d --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceStub.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNetCore.Components; +using WF_WebAdmin.Model; +using static System.Net.WebRequestMethods; + +namespace WF_WebAdmin.Service +{ + public class QuoteServiceStub : IQuoteService + { + [Inject] + public HttpClient Http { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } + + } +} From c5c2e597ae74f7c4573683e9b3051486c8474d30 Mon Sep 17 00:00:00 2001 From: "kentin.brongniart" Date: Fri, 10 Jan 2025 15:29:56 +0100 Subject: [PATCH 20/32] Debut correction bug --- WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs | 32 ++++++---- .../WF-WebAdmin/Converter/QuoteExtension.cs | 4 +- WF-WebAdmin/WF-WebAdmin/Model/Quote.cs | 28 ++++++++- WF-WebAdmin/WF-WebAdmin/Model/User.cs | 1 - .../WF-WebAdmin/Pages/ValidQuote.razor.cs | 15 ++++- .../WF-WebAdmin/Service/QuoteServiceLocal.cs | 35 ++++++++--- .../WF-WebAdmin/Service/QuoteServiceStub.cs | 59 ++++++++++++++++++- 7 files changed, 146 insertions(+), 28 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs index f8b0fea..092db9d 100644 --- a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs +++ b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteDTO.cs @@ -9,23 +9,35 @@ namespace WF_WebAdmin.Converter public string Content { get; set; } public int Likes { get; set; } public string Langue { get; set; } - public bool IsValide { get; set; } + public bool? IsValide { get; set; } public string? Reason { get; set; } - public int IdCaracter { get; set; } - public int IdSource { get; set; } + public int? IdCaracter { get; set; } + public string NameCharac { get; set; } + public int? IdSource { get; set; } + public string TitleSrc { get; set; } + public DateTime DateSrc { get; set; } public int? IdUserVerif { get; set; } + public string NameUser { get; set; } + public int? IdImg { get; set; } + public string ImgPath { get; set; } - public QuoteDTO(int id_quote, string content, int likes, string langue, bool isValide, string? reason, int id_caracter, int id_source, int? id_user_verif) + public QuoteDTO(int id_quote,string content,int likes,string langue,bool? isValide,string? reason,int? id_caracter,string name_charac,int? id_source,string title,DateTime date,int? id_user_verif,string name_user ,int? id_img,string img_path) { this.Id = id_quote; - this.Content = content; + this.Content = content; this.Likes = likes; this.Langue = langue; this.IsValide = isValide; - this.Reason = reason; - this.IdCaracter = id_caracter; - this.IdSource = id_source; - this.IdUserVerif = id_user_verif; - } + this.Reason = reason; + this.IdCaracter = id_caracter; + this.NameCharac = name_charac; + this.IdSource = id_source; + this.TitleSrc = title; + this.DateSrc = date; + this.IdUserVerif = id_user_verif; + this.NameUser = name_user; + this.IdImg = id_img; + this.ImgPath =img_path; + } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs index 0f3b187..088520a 100644 --- a/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs +++ b/WF-WebAdmin/WF-WebAdmin/Converter/QuoteExtension.cs @@ -6,13 +6,13 @@ namespace WF_WebAdmin.Converter { public QuoteDTO QuoteToDTO(Quote q) { - QuoteDTO quote = new QuoteDTO(q.Id, q.Content, q.Likes, q.Langue, q.IsValide, q.Reason, q.IdCaracter, q.IdSource, q.IdUserVerif); + QuoteDTO quote = new QuoteDTO(q.Id, q.Content, q.Like, q.Langue, null,null, null,q.Charac,null,q.TitleSrc,q.DateSrc,null,q.UserProposition,null,q.ImgPath); return quote; } public Quote DTOToQuote(QuoteDTO q) { - Quote quote = new Quote(q.Id, q.Content, q.Likes, q.Langue, q.IsValide, q.Reason, q.IdCaracter, q.IdSource, q.IdUserVerif); + Quote quote = new Quote(q.Id, q.Content,q.NameCharac,q.ImgPath,q.TitleSrc,q.DateSrc,q.Likes,q.Langue,q.NameUser); return quote; } } diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs index c640723..5a56083 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/Quote.cs @@ -1,7 +1,32 @@ -namespace WF_WebAdmin.Model +using Microsoft.AspNetCore.DataProtection.KeyManagement; + +namespace WF_WebAdmin.Model { public class Quote { + public int Id { get; set; } + public string Content { get; set; } + public int Like { get; set; } + public string Langue { get; set; } + public string Charac { get; set; } + public string ImgPath { get; set; } + public string TitleSrc { get; set; } + public DateTime DateSrc { get; set; } + public string UserProposition { get; set; } + + public Quote(int id, string content, string charac, string imgPath, string titleSrc, DateTime dateSrc, int like, string langue, string userProposition) + { + Id = id; + Content = content; + Charac = charac; + ImgPath = imgPath; + TitleSrc = titleSrc; + DateSrc = dateSrc; + Like = like; + Langue = langue; + UserProposition = userProposition; + } + /* public int Id { get; set; } public string Content { get; set; } public int Likes { get; set; } @@ -37,5 +62,6 @@ IdSource = idSource; IdUserVerif = idUserVerif; } + */ } } diff --git a/WF-WebAdmin/WF-WebAdmin/Model/User.cs b/WF-WebAdmin/WF-WebAdmin/Model/User.cs index 6d74ac9..7598733 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/User.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/User.cs @@ -3,7 +3,6 @@ public class User { public int Id { get; set; } - public string Image { get; set; } public string Name { get; set; } public string Email { get; set; } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs index 070ee4e..95b04d5 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor.cs @@ -10,7 +10,18 @@ using System.Linq; namespace WF_WebAdmin.Pages { public partial class ValidQuote - { - + { + private Quote[] quotes; + + [Inject] + public HttpClient Http { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } + + protected override async Task OnInitializedAsync() + { + quotes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataQuote.json"); + } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceLocal.cs b/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceLocal.cs index 433e5d4..600c0d1 100644 --- a/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceLocal.cs +++ b/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceLocal.cs @@ -26,6 +26,8 @@ namespace WF_WebAdmin.Service // Créer une commande Npgsql var command = new NpgsqlCommand(commandText, connection); + + /* // Ajouter des paramètres à la commande command.Parameters.AddWithValue("@content", quote.Content); command.Parameters.AddWithValue("@langue", quote.Langue); @@ -34,6 +36,8 @@ namespace WF_WebAdmin.Service command.Parameters.AddWithValue("@character", quote.Character); command.Parameters.AddWithValue("@user", quote.User); // Assurez-vous que `quote.User` est correctement défini command.Parameters.AddWithValue("@img_path", quote.ImgPath); + */ + try { @@ -58,7 +62,7 @@ namespace WF_WebAdmin.Service // Retourner l'objet DTO pour que vous puissiez l'utiliser ailleurs dans votre application return quoteDTO; } - } + public Task RemoveQuote(Quote quote) { @@ -84,36 +88,49 @@ namespace WF_WebAdmin.Service return Task.FromResult(quoteDTO); } + + + + + + public Task addQuote(Quote quote) + { + throw new NotImplementedException(); + } + + public Task removeQuote(Quote quote) + { + throw new NotImplementedException(); + } + public Task> getAllQuote() { - + throw new NotImplementedException(); } public Task> getSomeQuote(int nb, int page) { - + throw new NotImplementedException(); } public Task> getOnequote(int id) { - + throw new NotImplementedException(); } public Task> reserchQuote(string reserch, List argument) { - + throw new NotImplementedException(); } public Task> getAllQuoteInvalid() { - + throw new NotImplementedException(); } public Task> getSomeQuoteInvalid(int nb, int page) { - + throw new NotImplementedException(); } - - } } diff --git a/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceStub.cs b/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceStub.cs index c603989..5989b12 100644 --- a/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceStub.cs +++ b/WF-WebAdmin/WF-WebAdmin/Service/QuoteServiceStub.cs @@ -10,7 +10,60 @@ namespace WF_WebAdmin.Service public HttpClient Http { get; set; } [Inject] - public NavigationManager NavigationManager { get; set; } - - + public NavigationManager NavigationManager { get; set; } + + + + + + public Task addQuote(Quote quote) + { + throw new NotImplementedException(); + } + + public Task> getAllQuote() + { + throw new NotImplementedException(); + } + + public Task> getAllQuoteInvalid() + { + throw new NotImplementedException(); + } + + public Task> getOnequote(int id) + { + throw new NotImplementedException(); + } + + public Task> getSomeQuote(int nb, int page) + { + throw new NotImplementedException(); + } + + public Task> getSomeQuoteInvalid(int nb, int page) + { + throw new NotImplementedException(); + } + + public Task removeQuote(Quote quote) + { + throw new NotImplementedException(); + } + + public Task> reserchQuote(string reserch, List argument) + { + throw new NotImplementedException(); + } + + public Task updateQuote(Quote quote) + { + throw new NotImplementedException(); + } + + public Task validQuote(Quote quote) + { + throw new NotImplementedException(); + } + } } From d6e6f2a11c5838aac5e5efc1c735a82992b68fd9 Mon Sep 17 00:00:00 2001 From: tomivt Date: Fri, 10 Jan 2025 21:07:32 +0100 Subject: [PATCH 21/32] Add datagrid + fake data --- WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs | 22 +- WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor | 4 - WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor | 25 +- .../WF-WebAdmin/Pages/ValidQuiz.razor.cs | 19 +- WF-WebAdmin/WF-WebAdmin/Program.cs | 1 + .../WF-WebAdmin/Service/QuizService.cs | 25 ++ WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor | 5 - .../WF-WebAdmin/wwwroot/fake-dataQuiz.json | 282 ++++++++++++++++++ 8 files changed, 357 insertions(+), 26 deletions(-) delete mode 100644 WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor create mode 100644 WF-WebAdmin/WF-WebAdmin/Service/QuizService.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs b/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs index a5ecef4..c6035df 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs @@ -1,12 +1,14 @@ -namespace WF_WebAdmin.Model; - -public class Quiz +namespace WF_WebAdmin.Model { - public int Id { get; set; } - public string Question { get; set; } - public string AnswerA { get; set; } - public string AnswerB { get; set; } - public string AnswerC { get; set; } - public string AnswerD { get; set; } - public string CAnswer { get; set; } + public class Quiz + { + public int Id { get; set; } + public string Question { get; set; } + public string AnswerA { get; set; } + public string AnswerB { get; set; } + public string AnswerC { get; set; } + public string AnswerD { get; set; } + public string CAnswer { get; set; } + public string UserProposition { get; set; } + } } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor deleted file mode 100644 index 4a38264..0000000 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor +++ /dev/null @@ -1,4 +0,0 @@ -@page "/Quiz" - - -

Quiz

diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor index ad96674..5868126 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor @@ -3,9 +3,26 @@

Quiz à valider

-@if (quizzes is null) +@if (quizzes == null) { -

- Chargement des quiz -

+

Chargement des quiz ...

+} +else +{ +

Quizs en attente de validation :

+ + + + + + + + + + + + } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs index c419e91..8c10d74 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs @@ -1,11 +1,24 @@ -using Npgsql; +using Blazorise.DataGrid; +using Microsoft.AspNetCore.Components; using WF_WebAdmin.Model; namespace WF_WebAdmin.Pages - { public partial class ValidQuiz { - private List quizzes; + private Quiz[] quizzes; + private int totalQuizzes; + + [Inject] + public HttpClient Http { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } + + protected override async Task OnInitializedAsync() + { + quizzes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataQuiz.json"); + } + } } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Program.cs b/WF-WebAdmin/WF-WebAdmin/Program.cs index fa0d376..8a75e47 100644 --- a/WF-WebAdmin/WF-WebAdmin/Program.cs +++ b/WF-WebAdmin/WF-WebAdmin/Program.cs @@ -17,6 +17,7 @@ builder.Services.AddHttpClient(); builder.Services .AddBlazorise() .AddBootstrapProviders() + .AddHttpClient() .AddFontAwesomeIcons(); var app = builder.Build(); diff --git a/WF-WebAdmin/WF-WebAdmin/Service/QuizService.cs b/WF-WebAdmin/WF-WebAdmin/Service/QuizService.cs new file mode 100644 index 0000000..2a6c75f --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Service/QuizService.cs @@ -0,0 +1,25 @@ +using WF_WebAdmin.Model; + +namespace WF_WebAdmin.Service; + +public class QuizService +{ + public List GetQuizToConfirm() + { + var res = new List(); + + return res; + } + + public bool AddQuiz(Quiz quiz) + { + var res = false; + return res; + } + + public bool RemoveQuiz(Quiz quiz) + { + var res = false; + return res; + } +} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor index d4c1b4f..54e7668 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor @@ -14,11 +14,6 @@ Accueil
-
- - Quiz - -
Validation de citations diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json new file mode 100644 index 0000000..24eb012 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json @@ -0,0 +1,282 @@ +[ + { + "id": 1, + "question": "Voluptate nulla laborum pariatur excepteur consequat officia ea esse ut nisi amet non.", + "answerA": "sit ullamco", + "answerB": "deserunt reprehenderit", + "answerC": "cupidatat deserunt", + "answerD": "ullamco aliqua", + "cAnswer": "B", + "userProposition": "Lori Myers" + }, + { + "id": 2, + "question": "Ea elit esse minim aute aliquip cillum amet cupidatat fugiat exercitation.", + "answerA": "ullamco excepteur", + "answerB": "aliquip occaecat", + "answerC": "incididunt duis", + "answerD": "sunt dolor", + "cAnswer": "A", + "userProposition": "Louella Robinson" + }, + { + "id": 3, + "question": "Aute commodo est proident sunt nulla est cillum eiusmod est voluptate dolore sit aliqua incididunt.", + "answerA": "reprehenderit mollit", + "answerB": "laboris consectetur", + "answerC": "cillum deserunt", + "answerD": "deserunt fugiat", + "cAnswer": "B", + "userProposition": "Richmond Joyner" + }, + { + "id": 4, + "question": "Fugiat duis excepteur non amet tempor deserunt ut occaecat cupidatat eiusmod et amet enim.", + "answerA": "amet aute", + "answerB": "excepteur ad", + "answerC": "laboris veniam", + "answerD": "veniam in", + "cAnswer": "B", + "userProposition": "Brady Patrick" + }, + { + "id": 5, + "question": "Occaecat minim velit dolor est ad ut irure eu labore velit in dolore exercitation.", + "answerA": "eu aliqua", + "answerB": "labore ipsum", + "answerC": "labore reprehenderit", + "answerD": "anim excepteur", + "cAnswer": "C", + "userProposition": "Mavis Boone" + }, + { + "id": 6, + "question": "Non laboris adipisicing anim fugiat labore excepteur tempor elit in.", + "answerA": "in excepteur", + "answerB": "nostrud dolor", + "answerC": "nisi aliqua", + "answerD": "sint nisi", + "cAnswer": "C", + "userProposition": "Douglas Dejesus" + }, + { + "id": 7, + "question": "Lorem proident exercitation elit fugiat do amet aute labore consectetur pariatur consequat.", + "answerA": "eiusmod nulla", + "answerB": "eu id", + "answerC": "proident tempor", + "answerD": "amet proident", + "cAnswer": "A", + "userProposition": "Mia Peterson" + }, + { + "id": 8, + "question": "Incididunt magna commodo laborum do incididunt commodo proident non cillum magna elit irure voluptate.", + "answerA": "laborum fugiat", + "answerB": "laboris est", + "answerC": "in ea", + "answerD": "duis ullamco", + "cAnswer": "A", + "userProposition": "Juliet Fox" + }, + { + "id": 9, + "question": "Qui labore fugiat sint Lorem ut minim in ex dolor.", + "answerA": "et deserunt", + "answerB": "labore sit", + "answerC": "in eiusmod", + "answerD": "amet incididunt", + "cAnswer": "C", + "userProposition": "Earnestine Poole" + }, + { + "id": 10, + "question": "Voluptate pariatur ipsum magna sint Lorem adipisicing.", + "answerA": "sint velit", + "answerB": "non culpa", + "answerC": "nisi ut", + "answerD": "excepteur labore", + "cAnswer": "B", + "userProposition": "Alexis Cross" + }, + { + "id": 11, + "question": "In labore sunt est cupidatat cillum.", + "answerA": "ut ad", + "answerB": "non deserunt", + "answerC": "do officia", + "answerD": "ut nostrud", + "cAnswer": "C", + "userProposition": "Brooks Martinez" + }, + { + "id": 12, + "question": "Irure occaecat sit laborum nulla ea dolore et aliqua sunt Lorem enim esse.", + "answerA": "excepteur occaecat", + "answerB": "pariatur in", + "answerC": "reprehenderit excepteur", + "answerD": "laborum adipisicing", + "cAnswer": "D", + "userProposition": "Shields Roth" + }, + { + "id": 13, + "question": "Laboris sint in sit exercitation nisi id cillum ex ea culpa fugiat in cupidatat.", + "answerA": "labore mollit", + "answerB": "in veniam", + "answerC": "labore eiusmod", + "answerD": "consequat veniam", + "cAnswer": "B", + "userProposition": "Carmella Chase" + }, + { + "id": 14, + "question": "Proident dolor Lorem anim proident laborum sint minim sit laborum aliquip.", + "answerA": "velit exercitation", + "answerB": "voluptate esse", + "answerC": "occaecat cupidatat", + "answerD": "enim adipisicing", + "cAnswer": "D", + "userProposition": "Johns Solomon" + }, + { + "id": 15, + "question": "Do magna dolore enim laborum consequat reprehenderit nisi consequat nostrud.", + "answerA": "proident do", + "answerB": "labore minim", + "answerC": "in elit", + "answerD": "in irure", + "cAnswer": "A", + "userProposition": "Alana Moore" + }, + { + "id": 16, + "question": "Culpa anim id elit dolore veniam.", + "answerA": "ipsum nisi", + "answerB": "officia voluptate", + "answerC": "in excepteur", + "answerD": "ullamco non", + "cAnswer": "B", + "userProposition": "Russo Rios" + }, + { + "id": 17, + "question": "Ea est consectetur exercitation aute ut mollit pariatur irure aute adipisicing dolore.", + "answerA": "fugiat elit", + "answerB": "pariatur nulla", + "answerC": "exercitation ipsum", + "answerD": "exercitation laboris", + "cAnswer": "A", + "userProposition": "Bobbi Lara" + }, + { + "id": 18, + "question": "Laborum consectetur incididunt ad fugiat fugiat proident culpa mollit laborum.", + "answerA": "elit duis", + "answerB": "amet aute", + "answerC": "culpa nostrud", + "answerD": "do pariatur", + "cAnswer": "D", + "userProposition": "Lewis Mullins" + }, + { + "id": 19, + "question": "Culpa anim aliquip mollit non labore.", + "answerA": "labore incididunt", + "answerB": "laborum non", + "answerC": "sunt laborum", + "answerD": "est sunt", + "cAnswer": "B", + "userProposition": "Mccray Mccoy" + }, + { + "id": 20, + "question": "Ex exercitation deserunt aute cillum dolor.", + "answerA": "proident magna", + "answerB": "pariatur exercitation", + "answerC": "ipsum veniam", + "answerD": "culpa quis", + "cAnswer": "C", + "userProposition": "Moss Jefferson" + }, + { + "id": 21, + "question": "Do mollit aute dolore anim id non aliqua.", + "answerA": "ipsum aute", + "answerB": "irure ex", + "answerC": "ex duis", + "answerD": "ipsum cupidatat", + "cAnswer": "B", + "userProposition": "Roth Valdez" + }, + { + "id": 22, + "question": "Commodo sunt reprehenderit tempor sit ut ea Lorem esse minim elit et sunt sint qui.", + "answerA": "et do", + "answerB": "officia culpa", + "answerC": "et commodo", + "answerD": "irure tempor", + "cAnswer": "D", + "userProposition": "Adrienne Carpenter" + }, + { + "id": 23, + "question": "Excepteur cupidatat ut sit commodo magna elit.", + "answerA": "pariatur tempor", + "answerB": "proident non", + "answerC": "velit elit", + "answerD": "pariatur fugiat", + "cAnswer": "D", + "userProposition": "Mcknight Cain" + }, + { + "id": 24, + "question": "Laborum eu nisi consequat voluptate in laboris cillum in aute sint excepteur aliqua Lorem in.", + "answerA": "pariatur in", + "answerB": "voluptate qui", + "answerC": "et cillum", + "answerD": "adipisicing id", + "cAnswer": "D", + "userProposition": "Gay Barlow" + }, + { + "id": 25, + "question": "Laborum ullamco occaecat excepteur deserunt nostrud dolor.", + "answerA": "magna labore", + "answerB": "ullamco veniam", + "answerC": "reprehenderit irure", + "answerD": "magna dolore", + "cAnswer": "B", + "userProposition": "Hannah Battle" + }, + { + "id": 26, + "question": "Commodo in amet laboris Lorem et qui anim ea ullamco dolor dolor commodo.", + "answerA": "amet nulla", + "answerB": "laborum mollit", + "answerC": "amet in", + "answerD": "irure amet", + "cAnswer": "D", + "userProposition": "Dawson Mcpherson" + }, + { + "id": 27, + "question": "Veniam non consectetur sit cillum.", + "answerA": "aliqua cupidatat", + "answerB": "nostrud culpa", + "answerC": "anim ullamco", + "answerD": "adipisicing et", + "cAnswer": "A", + "userProposition": "Reeves Love" + }, + { + "id": 28, + "question": "Ullamco laboris voluptate nostrud commodo Lorem enim ad ipsum.", + "answerA": "id aute", + "answerB": "aliquip incididunt", + "answerC": "duis elit", + "answerD": "mollit ad", + "cAnswer": "B", + "userProposition": "Michael Holmes" + } +] \ No newline at end of file From 2621e27bd7b0bde94915296de9ff02a228507f5d Mon Sep 17 00:00:00 2001 From: tomivt Date: Mon, 13 Jan 2025 09:35:45 +0100 Subject: [PATCH 22/32] Add table + buttons --- WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor | 52 +++++++++++++----- .../WF-WebAdmin/Pages/ValidQuiz.razor.cs | 11 ++++ WF-WebAdmin/WF-WebAdmin/wwwroot/check.png | Bin 0 -> 6831 bytes WF-WebAdmin/WF-WebAdmin/wwwroot/cross.png | Bin 0 -> 4169 bytes WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 36 +++++++++++- 5 files changed, 85 insertions(+), 14 deletions(-) create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/check.png create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/cross.png diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor index 5868126..592f043 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor @@ -1,4 +1,5 @@ @page "/ValidQuiz" +@using System.Dynamic @using WF_WebAdmin.Model

Quiz à valider

@@ -11,18 +12,43 @@ else {

Quizs en attente de validation :

- - - - - - - - - - + + + + + + + + + + + + + + + + @foreach (Quiz quiz in quizzes) + { + + + + + + + + + +
+ + +
+ + } + +
#QuestionRéponse ARéponse BRéponse CRéponse DRéponse CorrecteUtilisateurActions
@quiz.Id@quiz.Question@quiz.AnswerA@quiz.AnswerB@quiz.AnswerC@quiz.AnswerD@quiz.CAnswer@quiz.UserProposition
} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs index 8c10d74..e133a94 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs @@ -19,6 +19,17 @@ namespace WF_WebAdmin.Pages { quizzes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataQuiz.json"); } + + private void ValidateQuiz(Quiz quiz) + { + // Action to validate the quiz + Console.WriteLine($"Quiz {quiz.Id} validated!"); + } + private void RejectQuiz(Quiz quiz) + { + // Action to reject the quiz + Console.WriteLine($"Quiz {quiz.Id} rejected!"); + } } } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/check.png b/WF-WebAdmin/WF-WebAdmin/wwwroot/check.png new file mode 100644 index 0000000000000000000000000000000000000000..c3fedbe1373516df916d67e9ea0f2d246ddf7cf3 GIT binary patch literal 6831 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 Date: Tue, 14 Jan 2025 09:38:31 +0100 Subject: [PATCH 23/32] Remove @ + Add OnButtonClicked methods --- WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor | 6 +++--- WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs | 12 ++++++++++-- WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 4 ---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor index 592f043..6daa2b4 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor @@ -27,7 +27,7 @@ else - @foreach (Quiz quiz in quizzes) + @foreach (var quiz in quizzes) { @quiz.Id @@ -39,10 +39,10 @@ else @quiz.CAnswer @quiz.UserProposition
- -
diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs index e133a94..d907e84 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs @@ -19,16 +19,24 @@ namespace WF_WebAdmin.Pages { quizzes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataQuiz.json"); } + + private void OnValidButton(Quiz quiz) + { + ValidateQuiz(quiz); + } private void ValidateQuiz(Quiz quiz) { - // Action to validate the quiz Console.WriteLine($"Quiz {quiz.Id} validated!"); } + private void OnRejectButton(Quiz quiz) + { + RejectQuiz(quiz); + } + private void RejectQuiz(Quiz quiz) { - // Action to reject the quiz Console.WriteLine($"Quiz {quiz.Id} rejected!"); } } diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css index ccc0d2b..2a7524c 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css @@ -129,10 +129,6 @@ table { width: 100%; } -tr { - background-color: lightgrey; -} - td { padding: 10px 20px; border: none; From 033894993aee065f6f1d0e41fda75b563062bb64 Mon Sep 17 00:00:00 2001 From: tomivt Date: Fri, 10 Jan 2025 21:07:32 +0100 Subject: [PATCH 24/32] Add datagrid + fake data --- WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs | 22 +- WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor | 4 - WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor | 25 +- .../WF-WebAdmin/Pages/ValidQuiz.razor.cs | 19 +- WF-WebAdmin/WF-WebAdmin/Program.cs | 1 + .../WF-WebAdmin/Service/QuizService.cs | 25 ++ WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor | 5 - .../WF-WebAdmin/wwwroot/fake-dataQuiz.json | 290 +++++++++++++++++- 8 files changed, 356 insertions(+), 35 deletions(-) delete mode 100644 WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor create mode 100644 WF-WebAdmin/WF-WebAdmin/Service/QuizService.cs diff --git a/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs b/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs index a5ecef4..c6035df 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/Quiz.cs @@ -1,12 +1,14 @@ -namespace WF_WebAdmin.Model; - -public class Quiz +namespace WF_WebAdmin.Model { - public int Id { get; set; } - public string Question { get; set; } - public string AnswerA { get; set; } - public string AnswerB { get; set; } - public string AnswerC { get; set; } - public string AnswerD { get; set; } - public string CAnswer { get; set; } + public class Quiz + { + public int Id { get; set; } + public string Question { get; set; } + public string AnswerA { get; set; } + public string AnswerB { get; set; } + public string AnswerC { get; set; } + public string AnswerD { get; set; } + public string CAnswer { get; set; } + public string UserProposition { get; set; } + } } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor deleted file mode 100644 index 4a38264..0000000 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Quiz.razor +++ /dev/null @@ -1,4 +0,0 @@ -@page "/Quiz" - - -

Quiz

diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor index ad96674..5868126 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor @@ -3,9 +3,26 @@

Quiz à valider

-@if (quizzes is null) +@if (quizzes == null) { -

- Chargement des quiz -

+

Chargement des quiz ...

+} +else +{ +

Quizs en attente de validation :

+ + + + + + + + + + + + } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs index c419e91..8c10d74 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs @@ -1,11 +1,24 @@ -using Npgsql; +using Blazorise.DataGrid; +using Microsoft.AspNetCore.Components; using WF_WebAdmin.Model; namespace WF_WebAdmin.Pages - { public partial class ValidQuiz { - private List quizzes; + private Quiz[] quizzes; + private int totalQuizzes; + + [Inject] + public HttpClient Http { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } + + protected override async Task OnInitializedAsync() + { + quizzes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataQuiz.json"); + } + } } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Program.cs b/WF-WebAdmin/WF-WebAdmin/Program.cs index d106ef6..7381387 100644 --- a/WF-WebAdmin/WF-WebAdmin/Program.cs +++ b/WF-WebAdmin/WF-WebAdmin/Program.cs @@ -18,6 +18,7 @@ builder.Services.AddHttpClient(); builder.Services .AddBlazorise() .AddBootstrapProviders() + .AddHttpClient() .AddFontAwesomeIcons(); var app = builder.Build(); diff --git a/WF-WebAdmin/WF-WebAdmin/Service/QuizService.cs b/WF-WebAdmin/WF-WebAdmin/Service/QuizService.cs new file mode 100644 index 0000000..2a6c75f --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Service/QuizService.cs @@ -0,0 +1,25 @@ +using WF_WebAdmin.Model; + +namespace WF_WebAdmin.Service; + +public class QuizService +{ + public List GetQuizToConfirm() + { + var res = new List(); + + return res; + } + + public bool AddQuiz(Quiz quiz) + { + var res = false; + return res; + } + + public bool RemoveQuiz(Quiz quiz) + { + var res = false; + return res; + } +} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor index 86c7ce7..a650684 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor @@ -20,11 +20,6 @@ Accueil
-
- - Quiz - -
Validation de citations diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json index 9400dd3..24eb012 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuiz.json @@ -1,10 +1,282 @@ -[ - { - "id_quiz": 1, - "nb_quest": 4 - }, - { - "id_quiz": 2, - "nb_quest": 5 - } +[ + { + "id": 1, + "question": "Voluptate nulla laborum pariatur excepteur consequat officia ea esse ut nisi amet non.", + "answerA": "sit ullamco", + "answerB": "deserunt reprehenderit", + "answerC": "cupidatat deserunt", + "answerD": "ullamco aliqua", + "cAnswer": "B", + "userProposition": "Lori Myers" + }, + { + "id": 2, + "question": "Ea elit esse minim aute aliquip cillum amet cupidatat fugiat exercitation.", + "answerA": "ullamco excepteur", + "answerB": "aliquip occaecat", + "answerC": "incididunt duis", + "answerD": "sunt dolor", + "cAnswer": "A", + "userProposition": "Louella Robinson" + }, + { + "id": 3, + "question": "Aute commodo est proident sunt nulla est cillum eiusmod est voluptate dolore sit aliqua incididunt.", + "answerA": "reprehenderit mollit", + "answerB": "laboris consectetur", + "answerC": "cillum deserunt", + "answerD": "deserunt fugiat", + "cAnswer": "B", + "userProposition": "Richmond Joyner" + }, + { + "id": 4, + "question": "Fugiat duis excepteur non amet tempor deserunt ut occaecat cupidatat eiusmod et amet enim.", + "answerA": "amet aute", + "answerB": "excepteur ad", + "answerC": "laboris veniam", + "answerD": "veniam in", + "cAnswer": "B", + "userProposition": "Brady Patrick" + }, + { + "id": 5, + "question": "Occaecat minim velit dolor est ad ut irure eu labore velit in dolore exercitation.", + "answerA": "eu aliqua", + "answerB": "labore ipsum", + "answerC": "labore reprehenderit", + "answerD": "anim excepteur", + "cAnswer": "C", + "userProposition": "Mavis Boone" + }, + { + "id": 6, + "question": "Non laboris adipisicing anim fugiat labore excepteur tempor elit in.", + "answerA": "in excepteur", + "answerB": "nostrud dolor", + "answerC": "nisi aliqua", + "answerD": "sint nisi", + "cAnswer": "C", + "userProposition": "Douglas Dejesus" + }, + { + "id": 7, + "question": "Lorem proident exercitation elit fugiat do amet aute labore consectetur pariatur consequat.", + "answerA": "eiusmod nulla", + "answerB": "eu id", + "answerC": "proident tempor", + "answerD": "amet proident", + "cAnswer": "A", + "userProposition": "Mia Peterson" + }, + { + "id": 8, + "question": "Incididunt magna commodo laborum do incididunt commodo proident non cillum magna elit irure voluptate.", + "answerA": "laborum fugiat", + "answerB": "laboris est", + "answerC": "in ea", + "answerD": "duis ullamco", + "cAnswer": "A", + "userProposition": "Juliet Fox" + }, + { + "id": 9, + "question": "Qui labore fugiat sint Lorem ut minim in ex dolor.", + "answerA": "et deserunt", + "answerB": "labore sit", + "answerC": "in eiusmod", + "answerD": "amet incididunt", + "cAnswer": "C", + "userProposition": "Earnestine Poole" + }, + { + "id": 10, + "question": "Voluptate pariatur ipsum magna sint Lorem adipisicing.", + "answerA": "sint velit", + "answerB": "non culpa", + "answerC": "nisi ut", + "answerD": "excepteur labore", + "cAnswer": "B", + "userProposition": "Alexis Cross" + }, + { + "id": 11, + "question": "In labore sunt est cupidatat cillum.", + "answerA": "ut ad", + "answerB": "non deserunt", + "answerC": "do officia", + "answerD": "ut nostrud", + "cAnswer": "C", + "userProposition": "Brooks Martinez" + }, + { + "id": 12, + "question": "Irure occaecat sit laborum nulla ea dolore et aliqua sunt Lorem enim esse.", + "answerA": "excepteur occaecat", + "answerB": "pariatur in", + "answerC": "reprehenderit excepteur", + "answerD": "laborum adipisicing", + "cAnswer": "D", + "userProposition": "Shields Roth" + }, + { + "id": 13, + "question": "Laboris sint in sit exercitation nisi id cillum ex ea culpa fugiat in cupidatat.", + "answerA": "labore mollit", + "answerB": "in veniam", + "answerC": "labore eiusmod", + "answerD": "consequat veniam", + "cAnswer": "B", + "userProposition": "Carmella Chase" + }, + { + "id": 14, + "question": "Proident dolor Lorem anim proident laborum sint minim sit laborum aliquip.", + "answerA": "velit exercitation", + "answerB": "voluptate esse", + "answerC": "occaecat cupidatat", + "answerD": "enim adipisicing", + "cAnswer": "D", + "userProposition": "Johns Solomon" + }, + { + "id": 15, + "question": "Do magna dolore enim laborum consequat reprehenderit nisi consequat nostrud.", + "answerA": "proident do", + "answerB": "labore minim", + "answerC": "in elit", + "answerD": "in irure", + "cAnswer": "A", + "userProposition": "Alana Moore" + }, + { + "id": 16, + "question": "Culpa anim id elit dolore veniam.", + "answerA": "ipsum nisi", + "answerB": "officia voluptate", + "answerC": "in excepteur", + "answerD": "ullamco non", + "cAnswer": "B", + "userProposition": "Russo Rios" + }, + { + "id": 17, + "question": "Ea est consectetur exercitation aute ut mollit pariatur irure aute adipisicing dolore.", + "answerA": "fugiat elit", + "answerB": "pariatur nulla", + "answerC": "exercitation ipsum", + "answerD": "exercitation laboris", + "cAnswer": "A", + "userProposition": "Bobbi Lara" + }, + { + "id": 18, + "question": "Laborum consectetur incididunt ad fugiat fugiat proident culpa mollit laborum.", + "answerA": "elit duis", + "answerB": "amet aute", + "answerC": "culpa nostrud", + "answerD": "do pariatur", + "cAnswer": "D", + "userProposition": "Lewis Mullins" + }, + { + "id": 19, + "question": "Culpa anim aliquip mollit non labore.", + "answerA": "labore incididunt", + "answerB": "laborum non", + "answerC": "sunt laborum", + "answerD": "est sunt", + "cAnswer": "B", + "userProposition": "Mccray Mccoy" + }, + { + "id": 20, + "question": "Ex exercitation deserunt aute cillum dolor.", + "answerA": "proident magna", + "answerB": "pariatur exercitation", + "answerC": "ipsum veniam", + "answerD": "culpa quis", + "cAnswer": "C", + "userProposition": "Moss Jefferson" + }, + { + "id": 21, + "question": "Do mollit aute dolore anim id non aliqua.", + "answerA": "ipsum aute", + "answerB": "irure ex", + "answerC": "ex duis", + "answerD": "ipsum cupidatat", + "cAnswer": "B", + "userProposition": "Roth Valdez" + }, + { + "id": 22, + "question": "Commodo sunt reprehenderit tempor sit ut ea Lorem esse minim elit et sunt sint qui.", + "answerA": "et do", + "answerB": "officia culpa", + "answerC": "et commodo", + "answerD": "irure tempor", + "cAnswer": "D", + "userProposition": "Adrienne Carpenter" + }, + { + "id": 23, + "question": "Excepteur cupidatat ut sit commodo magna elit.", + "answerA": "pariatur tempor", + "answerB": "proident non", + "answerC": "velit elit", + "answerD": "pariatur fugiat", + "cAnswer": "D", + "userProposition": "Mcknight Cain" + }, + { + "id": 24, + "question": "Laborum eu nisi consequat voluptate in laboris cillum in aute sint excepteur aliqua Lorem in.", + "answerA": "pariatur in", + "answerB": "voluptate qui", + "answerC": "et cillum", + "answerD": "adipisicing id", + "cAnswer": "D", + "userProposition": "Gay Barlow" + }, + { + "id": 25, + "question": "Laborum ullamco occaecat excepteur deserunt nostrud dolor.", + "answerA": "magna labore", + "answerB": "ullamco veniam", + "answerC": "reprehenderit irure", + "answerD": "magna dolore", + "cAnswer": "B", + "userProposition": "Hannah Battle" + }, + { + "id": 26, + "question": "Commodo in amet laboris Lorem et qui anim ea ullamco dolor dolor commodo.", + "answerA": "amet nulla", + "answerB": "laborum mollit", + "answerC": "amet in", + "answerD": "irure amet", + "cAnswer": "D", + "userProposition": "Dawson Mcpherson" + }, + { + "id": 27, + "question": "Veniam non consectetur sit cillum.", + "answerA": "aliqua cupidatat", + "answerB": "nostrud culpa", + "answerC": "anim ullamco", + "answerD": "adipisicing et", + "cAnswer": "A", + "userProposition": "Reeves Love" + }, + { + "id": 28, + "question": "Ullamco laboris voluptate nostrud commodo Lorem enim ad ipsum.", + "answerA": "id aute", + "answerB": "aliquip incididunt", + "answerC": "duis elit", + "answerD": "mollit ad", + "cAnswer": "B", + "userProposition": "Michael Holmes" + } ] \ No newline at end of file From e54f60b8c8859dc1029cc8f5f7c1f7b6e49092c9 Mon Sep 17 00:00:00 2001 From: tomivt Date: Mon, 13 Jan 2025 09:35:45 +0100 Subject: [PATCH 25/32] Add table + buttons --- WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor | 52 +++++++++++++----- .../WF-WebAdmin/Pages/ValidQuiz.razor.cs | 11 ++++ WF-WebAdmin/WF-WebAdmin/wwwroot/check.png | Bin 0 -> 6831 bytes WF-WebAdmin/WF-WebAdmin/wwwroot/cross.png | Bin 0 -> 4169 bytes WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 35 +++++++++++- 5 files changed, 84 insertions(+), 14 deletions(-) create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/check.png create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/cross.png diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor index 5868126..592f043 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor @@ -1,4 +1,5 @@ @page "/ValidQuiz" +@using System.Dynamic @using WF_WebAdmin.Model

Quiz à valider

@@ -11,18 +12,43 @@ else {

Quizs en attente de validation :

- - - - - - - - - - + + + + + + + + + + + + + + + + @foreach (Quiz quiz in quizzes) + { + + + + + + + + + +
+ + +
+ + } + +
#QuestionRéponse ARéponse BRéponse CRéponse DRéponse CorrecteUtilisateurActions
@quiz.Id@quiz.Question@quiz.AnswerA@quiz.AnswerB@quiz.AnswerC@quiz.AnswerD@quiz.CAnswer@quiz.UserProposition
} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs index 8c10d74..e133a94 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs @@ -19,6 +19,17 @@ namespace WF_WebAdmin.Pages { quizzes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataQuiz.json"); } + + private void ValidateQuiz(Quiz quiz) + { + // Action to validate the quiz + Console.WriteLine($"Quiz {quiz.Id} validated!"); + } + private void RejectQuiz(Quiz quiz) + { + // Action to reject the quiz + Console.WriteLine($"Quiz {quiz.Id} rejected!"); + } } } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/check.png b/WF-WebAdmin/WF-WebAdmin/wwwroot/check.png new file mode 100644 index 0000000000000000000000000000000000000000..c3fedbe1373516df916d67e9ea0f2d246ddf7cf3 GIT binary patch literal 6831 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 Date: Tue, 14 Jan 2025 09:38:31 +0100 Subject: [PATCH 26/32] Remove @ + Add OnButtonClicked methods --- WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor | 6 +++--- WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs | 12 ++++++++++-- WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 4 ---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor index 592f043..6daa2b4 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor @@ -27,7 +27,7 @@ else - @foreach (Quiz quiz in quizzes) + @foreach (var quiz in quizzes) { @quiz.Id @@ -39,10 +39,10 @@ else @quiz.CAnswer @quiz.UserProposition
- -
diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs index e133a94..d907e84 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs @@ -19,16 +19,24 @@ namespace WF_WebAdmin.Pages { quizzes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataQuiz.json"); } + + private void OnValidButton(Quiz quiz) + { + ValidateQuiz(quiz); + } private void ValidateQuiz(Quiz quiz) { - // Action to validate the quiz Console.WriteLine($"Quiz {quiz.Id} validated!"); } + private void OnRejectButton(Quiz quiz) + { + RejectQuiz(quiz); + } + private void RejectQuiz(Quiz quiz) { - // Action to reject the quiz Console.WriteLine($"Quiz {quiz.Id} rejected!"); } } diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css index dd3446f..64631a6 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css @@ -128,10 +128,6 @@ table { width: 100%; } -tr { - background-color: lightgrey; -} - td { padding: 10px 20px; border: none; From 6c95137bf8233992000de5bb31100e6fac473d53 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Tue, 14 Jan 2025 10:06:40 +0100 Subject: [PATCH 27/32] Login en cours --- WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs | 12 +- .../WF-WebAdmin/Converter/UserExtension.cs | 4 +- WF-WebAdmin/WF-WebAdmin/Model/User.cs | 10 +- WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs | 28 ++++ .../WF-WebAdmin/Pages/DeleteUser.razor | 3 +- .../WF-WebAdmin/Pages/DeleteUser.razor.cs | 2 +- WF-WebAdmin/WF-WebAdmin/Pages/Login.razor | 27 +-- WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs | 39 +++++ .../WF-WebAdmin/Pages/ValidQuote.razor | 8 +- .../WF-WebAdmin/Shared/MainLayout.razor | 14 +- .../WF-WebAdmin/Shared/MainLayout.razor.cs | 21 +++ WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 6 +- .../wwwroot/fake-dataUserLogin.json | 155 ++++++++++++++++++ 13 files changed, 297 insertions(+), 32 deletions(-) create mode 100644 WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor.cs create mode 100644 WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs b/WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs index e1b64da..53a6032 100644 --- a/WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs +++ b/WF-WebAdmin/WF-WebAdmin/Converter/UserDTO.cs @@ -1,16 +1,20 @@ -namespace WF_WebAdmin.Converter +using WF_WebAdmin.Model; + +namespace WF_WebAdmin.Converter { public class UserDTO { - public int Id { get; set; } public string Image { get; set; } public string Name { get; set; } public string Email { get; set; } public DateTime DateCreation { get; set; } - public UserDTO(int id, string image, string name, string email, DateTime dateCreation) + public Boolean IsAdmin { get; set; } + public List Comments { get; set; } + + public UserDTO(string image, string name, string email, DateTime dateCreation) { - this.Id = id; + this.Image = image; this.Name = name; this.Email = email; diff --git a/WF-WebAdmin/WF-WebAdmin/Converter/UserExtension.cs b/WF-WebAdmin/WF-WebAdmin/Converter/UserExtension.cs index 4ff0937..ebcf0e4 100644 --- a/WF-WebAdmin/WF-WebAdmin/Converter/UserExtension.cs +++ b/WF-WebAdmin/WF-WebAdmin/Converter/UserExtension.cs @@ -6,13 +6,13 @@ namespace WF_WebAdmin.Converter { public User UserToDTO(UserDTO u) { - User user = new User(u.Id, u.Image, u.Name, u.Email, u.DateCreation); + User user = new User(u.Image, u.Name, u.Email, u.DateCreation,u.IsAdmin); return user; } public UserDTO DTOToUser(User u) { - UserDTO user = new UserDTO(u.Id, u.Image, u.Name, u.Email, u.DateCreation); + UserDTO user = new UserDTO(u.Image, u.Name, u.Email, u.DateCreation); return user; } } diff --git a/WF-WebAdmin/WF-WebAdmin/Model/User.cs b/WF-WebAdmin/WF-WebAdmin/Model/User.cs index 7598733..599ee8e 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/User.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/User.cs @@ -2,20 +2,24 @@ { public class User { - public int Id { get; set; } public string Image { get; set; } public string Name { get; set; } public string Email { get; set; } public DateTime DateCreation { get; set; } + public Boolean IsAdmin { get; set; } - public User(int id, string image, string name, string email, DateTime dateCreation) + public List Comments { get; set; } + + public User(string image, string name, string email, DateTime dateCreation, bool isAdmin) { - this.Id = id; this.Image = image; this.Name = name; this.Email = email; this.DateCreation = dateCreation; + IsAdmin = isAdmin; } + + public User() { } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs b/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs new file mode 100644 index 0000000..52748e0 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs @@ -0,0 +1,28 @@ +namespace WF_WebAdmin.Model +{ + public class UserLogin + { + public string Image { get; set; } + public string Name { get; set; } + public string Email { get; set; } + public DateTime DateCreation { get; set; } + + public Boolean IsAdmin { get; set; } + + public List Comments { get; set; } + + public string Mdp { get; set; } + + public UserLogin(string image, string name, string email, DateTime dateCreation, bool isAdmin, string mdp) + { + this.Image = image; + this.Name = name; + this.Email = email; + this.DateCreation = dateCreation; + this.IsAdmin = isAdmin; + this.Mdp = mdp; + } + + public UserLogin() { } + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor index 0b0ec58..c0c86ce 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor @@ -16,7 +16,6 @@ else {
-

Identifiant d'utilisateur : @user.Id

@if (user.IsAdmin) {

Nom d'utilisateur : @user.Name (Administrateur)

@@ -39,7 +38,7 @@ else } else { -

Aucun commentaire sur le site

+

Aucun commentaire sur le site

} diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs index 9d2a681..b14bdec 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs @@ -40,7 +40,7 @@ namespace WF_WebAdmin.Pages { if (userToDelete != null) { - users.RemoveAll(u => u.Id == userToDelete.Id); + users.RemoveAll(u => u.Name == userToDelete.Name); ClosePopup(); } } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor index 7fc91e3..37073ca 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor @@ -2,27 +2,28 @@

▶ Connexion ◀

@code { - private void ShowFullSite() - { - // Code pour afficher l'ensemble du menu - // Cela peut être un appel à une méthode ou un service qui change l'état de la visibilité du menu - } + } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs index 0f288f5..79cb348 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs @@ -8,6 +8,45 @@ namespace WF_WebAdmin.Pages { public partial class Login { + private UserLogin userLogin = new UserLogin(); + private string TestConnexion = "Pas connexion"; + + private List usersConnexion; + [Inject] + public HttpClient Http { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } + + protected override async Task OnInitializedAsync() + { + usersConnexion = await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-dataUserLogin.json"); + } + + + public void validlogin() + { + if (!string.IsNullOrEmpty(userLogin.Name)) + { + foreach (var user in usersConnexion) + { + if(userLogin.Name == user.Name) + { + if(user.IsAdmin) + { + TestConnexion = $"Connecté en tant que {user.Name}"; + } + else + { + TestConnexion = "Connexion échouée, pas admin"; + } + + } + } + + } + + } } } \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor index 57f8ecc..0f7606d 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuote.razor @@ -7,10 +7,10 @@ {

Chargement des citations...

} -else if (quotes.Count == 0) +@* else if (quotes.Count == 0) {

Aucune citation en attente de validation.

-} +} *@ else {

Citations en attente de validation :

@@ -28,8 +28,8 @@ else

Date de source : @quote.DateSrc.ToShortDateString()

Utilisateur : @quote.UserProposition

- - + @* + *@
} } diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor index 2c7f47e..dbc4566 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor @@ -9,10 +9,22 @@
- About + @if(usersConnexion != null) + { + + }
@Body
+ + diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor.cs b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor.cs new file mode 100644 index 0000000..56a4e6c --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor.cs @@ -0,0 +1,21 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Mvc; +using WF_WebAdmin.Model; + +namespace WF_WebAdmin.Shared +{ + public partial class MainLayout + { + private List usersConnexion; + [Inject] + public HttpClient Http { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } + + protected override async Task OnInitializedAsync() + { + usersConnexion = await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-dataUsers.json"); + } + } +} diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css index 98f5a67..ec81895 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css @@ -1,4 +1,5 @@ @import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); +@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100..900;1,100..900&display=swap'); html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; @@ -132,13 +133,13 @@ h1 { text-align: center; font-size: 32px; margin-top: 10%; + font-family: "Roboto", serif; } p { - margin-top: 6%; margin-bottom: 2%; font-size: 20px; - font-family: "Lemon", serif; + font-family: "Roboto", serif; } .login { @@ -160,6 +161,7 @@ p { width: 50%; font-size: 1.25em; background-color: white; + font-family: "Roboto", serif; } .connexion { diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json new file mode 100644 index 0000000..ed4c598 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json @@ -0,0 +1,155 @@ +[ + { + "Id": 1, + "Image": "https://tse4.mm.bing.net/th/id/OIP.fc5TQflh0cbxB1GUeOdk6gHaK8?w=123&h=180&c=7&r=0&o=5&pid=1.7", + "Name": "Admin", + "Email": "admin@gmail.com", + "DateCreation": "2024-12-12", + "IsAdmin": true, + "Mdp" : "test" + }, + { + "Id": 2, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "exploit", + "Email": "exploit@gmail.com", + "DateCreation": "2024-11-12", + "IsAdmin": true + }, + { + "Id": 3, + "Image": "https://tse4.mm.bing.net/th/id/OIP.XNQPKwc1OUfvnSO9MsxDYgHaE7?w=202&h=180&c=7&r=0&o=5&pid=1.7", + "Name": "testeur", + "Email": "testeur@gmail.com", + "DateCreation": "2024-08-02", + "IsAdmin": false, + "Comments": [ + { + "Text": "Premier test effectué, tout semble OK.", + "DateCreation": "2024-08-02" + } + ] + }, + { + "Id": 4, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev", + "Email": "dev@gmail.com", + "DateCreation": "2024-10-10", + "IsAdmin": false + }, + { + "Id": 5, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "jean_doe", + "Email": "jean.doe@gmail.com", + "DateCreation": "2024-06-25", + "IsAdmin": false, + "Comments": [ + { + "Text": "Utilisateur très actif, peut être un peu trop intrusif.", + "DateCreation": "2024-06-25" + } + ] + }, + { + "Id": 6, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "jane_smith", + "Email": "jane.smith@gmail.com", + "DateCreation": "2024-07-15", + "IsAdmin": false + }, + { + "Id": 7, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_joe", + "Email": "admin.joe@gmail.com", + "DateCreation": "2024-05-30", + "IsAdmin": true + }, + { + "Id": 8, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev_anna", + "Email": "dev.anna@gmail.com", + "DateCreation": "2024-09-05", + "IsAdmin": false + }, + { + "Id": 9, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "support_mark", + "Email": "support.mark@gmail.com", + "DateCreation": "2024-11-20", + "IsAdmin": false, + "Comments": [ + { + "Text": "Support rapide et efficace, mais manquant un peu de détails.", + "DateCreation": "2024-11-20" + } + ] + }, + { + "Id": 10, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "dev_susan", + "Email": "dev.susan@gmail.com", + "DateCreation": "2024-08-12", + "IsAdmin": false + }, + { + "Id": 11, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "designer_steve", + "Email": "designer.steve@gmail.com", + "DateCreation": "2024-07-01", + "IsAdmin": false, + "Comments": [ + { + "Text": "Le design doit être retravaillé pour plus de clarté.", + "DateCreation": "2024-07-01" + } + ] + }, + { + "Id": 12, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_lucas", + "Email": "admin.lucas@gmail.com", + "DateCreation": "2024-09-22", + "IsAdmin": true + }, + { + "Id": 13, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "manager_anna", + "Email": "manager.anna@gmail.com", + "DateCreation": "2024-05-01", + "IsAdmin": false + }, + { + "Id": 14, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "developer_mike", + "Email": "developer.mike@gmail.com", + "DateCreation": "2024-11-02", + "IsAdmin": false + }, + { + "Id": 15, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "test_user_01", + "Email": "test.user01@gmail.com", + "DateCreation": "2024-06-10", + "IsAdmin": false + }, + { + "Id": 16, + "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", + "Name": "admin_kate", + "Email": "admin.kate@gmail.com", + "DateCreation": "2024-04-16", + "IsAdmin": true + } +] \ No newline at end of file From c7ba93c33b700d9e088bac7e177b5ac66355d17e Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Tue, 14 Jan 2025 11:29:51 +0100 Subject: [PATCH 28/32] Login avec connexion (fake) --- WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs | 10 +- WF-WebAdmin/WF-WebAdmin/Pages/Login.razor | 10 +- WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs | 20 ++- WF-WebAdmin/WF-WebAdmin/Program.cs | 3 +- .../WF-WebAdmin/Shared/MainLayout.razor | 18 ++- .../WF-WebAdmin/Shared/MainLayout.razor.cs | 22 +-- WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 7 + .../wwwroot/fake-dataUserLogin.json | 149 +----------------- .../WF-WebAdmin/wwwroot/fake-dataUsers.json | 30 ++-- 9 files changed, 76 insertions(+), 193 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs b/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs index 52748e0..a2e9bb7 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs @@ -2,23 +2,19 @@ { public class UserLogin { + public int Id { get; set; } public string Image { get; set; } public string Name { get; set; } - public string Email { get; set; } - public DateTime DateCreation { get; set; } public Boolean IsAdmin { get; set; } - public List Comments { get; set; } - public string Mdp { get; set; } - public UserLogin(string image, string name, string email, DateTime dateCreation, bool isAdmin, string mdp) + public UserLogin(int id,string image, string name, bool isAdmin, string mdp) { + Id = id; this.Image = image; this.Name = name; - this.Email = email; - this.DateCreation = dateCreation; this.IsAdmin = isAdmin; this.Mdp = mdp; } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor index 37073ca..908ce74 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor @@ -1,4 +1,6 @@ @page "/" +@using WF_WebAdmin.Model +@inject UserLogin uLogin

▶ Connexion ◀

diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs index 79cb348..6f6c59f 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs @@ -10,7 +10,7 @@ namespace WF_WebAdmin.Pages { private UserLogin userLogin = new UserLogin(); - private string TestConnexion = "Pas connexion"; + private string ErrorConnexion; private List usersConnexion; [Inject] @@ -21,27 +21,33 @@ namespace WF_WebAdmin.Pages protected override async Task OnInitializedAsync() { - usersConnexion = await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-dataUserLogin.json"); + usersConnexion = await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-dataUsers.json"); } public void validlogin() { - if (!string.IsNullOrEmpty(userLogin.Name)) + if (!string.IsNullOrEmpty(userLogin.Name) || !string.IsNullOrEmpty(userLogin.Mdp)) { foreach (var user in usersConnexion) { - if(userLogin.Name == user.Name) + if(userLogin.Name == user.Name && userLogin.Mdp == user.Mdp) { if(user.IsAdmin) { - TestConnexion = $"Connecté en tant que {user.Name}"; + ErrorConnexion = $"Connecté en tant que {user.Name} (Ca doit disparaitre dans le futur)"; + uLogin.Id = user.Id; + break; } else { - TestConnexion = "Connexion échouée, pas admin"; + ErrorConnexion = "Connexion échouée, le nom ou le mot de passe sont incorrectes"; } - + + } + else + { + ErrorConnexion = "Connexion échouée, le nom ou le mot de passe sont incorrectes"; } } diff --git a/WF-WebAdmin/WF-WebAdmin/Program.cs b/WF-WebAdmin/WF-WebAdmin/Program.cs index d106ef6..aa99ff6 100644 --- a/WF-WebAdmin/WF-WebAdmin/Program.cs +++ b/WF-WebAdmin/WF-WebAdmin/Program.cs @@ -4,6 +4,7 @@ using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; using WF_WebAdmin.Data; +using WF_WebAdmin.Model; var builder = WebApplication.CreateBuilder(args); @@ -13,7 +14,7 @@ builder.Services.AddServerSideBlazor(); builder.Services.AddSingleton(); builder.Services.AddHttpClient(); - +builder.Services.AddSingleton(); builder.Services .AddBlazorise() diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor index dbc4566..942b447 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor @@ -1,5 +1,7 @@ -@inherits LayoutComponentBase - +@using WF_WebAdmin.Model +@inherits LayoutComponentBase +@inject UserLogin uLogin + WF-WebAdmin
@@ -8,10 +10,14 @@
-
- @if(usersConnexion != null) - { - +
+ @if (!string.IsNullOrEmpty(uLogin.Name)) + { + + } + else + { + }
diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor.cs b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor.cs index 56a4e6c..f7cb295 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor.cs @@ -1,21 +1,25 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Mvc; +using System; using WF_WebAdmin.Model; + namespace WF_WebAdmin.Shared { public partial class MainLayout { - private List usersConnexion; - [Inject] - public HttpClient Http { get; set; } + //private List usersConnexion; + + //[Inject] + //public HttpClient Http { get; set; } - [Inject] - public NavigationManager NavigationManager { get; set; } + //[Inject] + //public NavigationManager NavigationManager { get; set; } - protected override async Task OnInitializedAsync() - { - usersConnexion = await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-dataUsers.json"); - } + //protected override async Task OnInitializedAsync() + //{ + + // usersConnexion = await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-dataUsers.json"); + //} } } diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css index ec81895..721ef6a 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css @@ -174,3 +174,10 @@ p { border: none; font-size: 15px; } + + + + +.ErrorMsg { + color: red; +} \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json index ed4c598..241a266 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json @@ -3,153 +3,14 @@ "Id": 1, "Image": "https://tse4.mm.bing.net/th/id/OIP.fc5TQflh0cbxB1GUeOdk6gHaK8?w=123&h=180&c=7&r=0&o=5&pid=1.7", "Name": "Admin", - "Email": "admin@gmail.com", - "DateCreation": "2024-12-12", "IsAdmin": true, - "Mdp" : "test" - }, - { - "Id": 2, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "exploit", - "Email": "exploit@gmail.com", - "DateCreation": "2024-11-12", - "IsAdmin": true - }, - { - "Id": 3, - "Image": "https://tse4.mm.bing.net/th/id/OIP.XNQPKwc1OUfvnSO9MsxDYgHaE7?w=202&h=180&c=7&r=0&o=5&pid=1.7", - "Name": "testeur", - "Email": "testeur@gmail.com", - "DateCreation": "2024-08-02", - "IsAdmin": false, - "Comments": [ - { - "Text": "Premier test effectué, tout semble OK.", - "DateCreation": "2024-08-02" - } - ] - }, - { - "Id": 4, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "dev", - "Email": "dev@gmail.com", - "DateCreation": "2024-10-10", - "IsAdmin": false - }, - { - "Id": 5, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "jean_doe", - "Email": "jean.doe@gmail.com", - "DateCreation": "2024-06-25", - "IsAdmin": false, - "Comments": [ - { - "Text": "Utilisateur très actif, peut être un peu trop intrusif.", - "DateCreation": "2024-06-25" - } - ] + "Mdp" : "passwd" }, { - "Id": 6, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "jane_smith", - "Email": "jane.smith@gmail.com", - "DateCreation": "2024-07-15", - "IsAdmin": false - }, - { - "Id": 7, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "admin_joe", - "Email": "admin.joe@gmail.com", - "DateCreation": "2024-05-30", - "IsAdmin": true - }, - { - "Id": 8, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "dev_anna", - "Email": "dev.anna@gmail.com", - "DateCreation": "2024-09-05", - "IsAdmin": false - }, - { - "Id": 9, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "support_mark", - "Email": "support.mark@gmail.com", - "DateCreation": "2024-11-20", - "IsAdmin": false, - "Comments": [ - { - "Text": "Support rapide et efficace, mais manquant un peu de détails.", - "DateCreation": "2024-11-20" - } - ] - }, - { - "Id": 10, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "dev_susan", - "Email": "dev.susan@gmail.com", - "DateCreation": "2024-08-12", - "IsAdmin": false - }, - { - "Id": 11, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "designer_steve", - "Email": "designer.steve@gmail.com", - "DateCreation": "2024-07-01", - "IsAdmin": false, - "Comments": [ - { - "Text": "Le design doit être retravaillé pour plus de clarté.", - "DateCreation": "2024-07-01" - } - ] - }, - { - "Id": 12, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "admin_lucas", - "Email": "admin.lucas@gmail.com", - "DateCreation": "2024-09-22", - "IsAdmin": true - }, - { - "Id": 13, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "manager_anna", - "Email": "manager.anna@gmail.com", - "DateCreation": "2024-05-01", - "IsAdmin": false - }, - { - "Id": 14, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "developer_mike", - "Email": "developer.mike@gmail.com", - "DateCreation": "2024-11-02", - "IsAdmin": false - }, - { - "Id": 15, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "test_user_01", - "Email": "test.user01@gmail.com", - "DateCreation": "2024-06-10", - "IsAdmin": false - }, - { - "Id": 16, + "Id": 2, "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", - "Name": "admin_kate", - "Email": "admin.kate@gmail.com", - "DateCreation": "2024-04-16", - "IsAdmin": true + "Name": "exploit", + "IsAdmin": false, + "Mdp": "passwd" } ] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json index ec07099..d995d42 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json @@ -5,25 +5,27 @@ "Name": "Admin", "Email": "admin@gmail.com", "DateCreation": "2024-12-12", - "IsAdmin": true, - "Comments": [ - { - "Text": "Commentaire 1", - "DateCreation": "2024-12-12" - }, - { - "Text": "Commentaire 2", - "DateCreation": "2024-11-12" - } - ] - }, - { + "IsAdmin": true, + "Comments": [ + { + "Text": "Commentaire 1", + "DateCreation": "2024-12-12" + }, + { + "Text": "Commentaire 2", + "DateCreation": "2024-11-12" + } + ], + "Mdp": "passwd" + }, + { "Id": 2, "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7", "Name": "exploit", "Email": "exploit@gmail.com", "DateCreation": "2024-11-12", - "IsAdmin": true + "IsAdmin": false, + "Mdp": "passwd" }, { "Id": 3, From 60eeea39209d8e1bdc730c6fad617ad260d26bd8 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Tue, 14 Jan 2025 17:13:21 +0100 Subject: [PATCH 29/32] Login fonctionne --- WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs | 8 +- WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs | 1 + WF-WebAdmin/WF-WebAdmin/Pages/Login.razor | 5 +- WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs | 14 ++- .../WF-WebAdmin/Pages/ModifQuote.razor | 2 +- WF-WebAdmin/WF-WebAdmin/Program.cs | 2 +- .../WF-WebAdmin/Shared/MainLayout.razor | 46 ++++---- WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor | 104 +++++++++--------- .../wwwroot/fake-dataUserLogin.json | 2 +- .../WF-WebAdmin/wwwroot/fake-dataUsers.json | 2 +- 10 files changed, 100 insertions(+), 86 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs b/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs index a2e9bb7..b8f12b1 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs @@ -1,15 +1,13 @@ -namespace WF_WebAdmin.Model +using System; +namespace WF_WebAdmin.Model { public class UserLogin { public int Id { get; set; } public string Image { get; set; } - public string Name { get; set; } - + public string Name { get; set;} public Boolean IsAdmin { get; set; } - public string Mdp { get; set; } - public UserLogin(int id,string image, string name, bool isAdmin, string mdp) { Id = id; diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs index b9e90bc..0e69dcf 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs @@ -18,6 +18,7 @@ namespace WF_WebAdmin.Pages protected override async Task OnInitializedAsync() { quotes = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataQuote.json"); + } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor index 908ce74..bc7c735 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor @@ -1,6 +1,6 @@ @page "/" @using WF_WebAdmin.Model -@inject UserLogin uLogin +

▶ Connexion ◀