From 7125f7499194ec274c9914a079194c131ea33613 Mon Sep 17 00:00:00 2001
From: V J <Vianney.JOURDY@etu.uca.fr>
Date: Wed, 3 May 2023 11:31:34 +0200
Subject: [PATCH] =?UTF-8?q?manager=20r=C3=A9ussi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MangaMap/App.xaml.cs              | 2 +-
 MangaMap/Model/Admin.cs           | 5 ++++-
 MangaMap/Model/Manager.cs         | 7 -------
 MangaMap/Model/Personne.cs        | 4 ----
 MangaMap/Model/Utilisateur.cs     | 8 ++++----
 MangaMap/Views/signUpPage.xaml    | 6 ++++++
 MangaMap/Views/signUpPage.xaml.cs | 6 +++++-
 7 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/MangaMap/App.xaml.cs b/MangaMap/App.xaml.cs
index 96e485a..24756ad 100644
--- a/MangaMap/App.xaml.cs
+++ b/MangaMap/App.xaml.cs
@@ -5,8 +5,8 @@ namespace MangaMap;
 
 public partial class App : Application
 {
-
 	public Manager MyManager { get; private set; } = new Manager();
+
 	public App()
 	{
 		InitializeComponent();
diff --git a/MangaMap/Model/Admin.cs b/MangaMap/Model/Admin.cs
index 9905621..9ae0a3a 100644
--- a/MangaMap/Model/Admin.cs
+++ b/MangaMap/Model/Admin.cs
@@ -9,8 +9,11 @@ namespace MangaMap.Model
 {
     public class Admin : Personne
     {
-        public Admin(string mdp, string email, string pseudo) : base(mdp, email, pseudo)
+        public Admin(string motDePasse, string email, string pseudo)
         {
+            MotDePasse = motDePasse;
+            Email = email;
+            Pseudo = pseudo;
         }
 
         public int Id { get; private set; }
diff --git a/MangaMap/Model/Manager.cs b/MangaMap/Model/Manager.cs
index dd9511d..db9593a 100644
--- a/MangaMap/Model/Manager.cs
+++ b/MangaMap/Model/Manager.cs
@@ -11,12 +11,8 @@ namespace MangaMap.Model
 
         public List<Admin> Admins { get; private set; }
         public List<Utilisateur> Utilisateurs { get; private set; }
-
         public List<Oeuvre> Oeuvres { get; private set; }
 
-
-
-
         public Manager() { 
             Admins = new List<Admin>();
             Utilisateurs = new List<Utilisateur>();
@@ -27,8 +23,5 @@ namespace MangaMap.Model
         {
             Utilisateurs.Add(u);
         }
-
-
-
     }
 }
diff --git a/MangaMap/Model/Personne.cs b/MangaMap/Model/Personne.cs
index b044450..313fcfa 100644
--- a/MangaMap/Model/Personne.cs
+++ b/MangaMap/Model/Personne.cs
@@ -53,9 +53,5 @@ namespace MangaMap.Model
 
             return false;
         }
-
-       
-
-
     }
 }
diff --git a/MangaMap/Model/Utilisateur.cs b/MangaMap/Model/Utilisateur.cs
index 6564567..c86579f 100644
--- a/MangaMap/Model/Utilisateur.cs
+++ b/MangaMap/Model/Utilisateur.cs
@@ -16,11 +16,11 @@ namespace MangaMap.Model
         public List<Oeuvre> ListeOeuvrePourPlusTard { get; private set; }
         public List<Oeuvre> ListeOeuvreFavorites { get; private set; }
 
-        public Utilisateur(string nom, string prenom, int age)
+        public Utilisateur(string email, string pseudo, string mdp, string nom, string prenom, int age)
         {
-            this.Email = "rr";
-            this.Pseudo = "55";
-            this.MotDePasse = "45";
+            Email = email;
+            Pseudo = pseudo;
+            MotDePasse = mdp;
             this.nom = nom;
             this.prenom = prenom;
             this.age = age;
diff --git a/MangaMap/Views/signUpPage.xaml b/MangaMap/Views/signUpPage.xaml
index cf42d95..4808c1a 100644
--- a/MangaMap/Views/signUpPage.xaml
+++ b/MangaMap/Views/signUpPage.xaml
@@ -10,6 +10,12 @@
 
         <Label Text="S'inscrire a MapManga" FontSize="Large" Margin="0,0,0,20" TextColor="#ffffff"/>
 
+        <Entry x:Name="nameEntry" Placeholder="Nom" Margin="0,0,0,10" Background="#EFF0F2" TextColor="{StaticResource Black}"/>
+
+        <Entry x:Name="firstNameEntry" Placeholder="Prénom" Margin="0,0,0,10" Background="#EFF0F2" TextColor="{StaticResource Black}"/>
+
+        <Entry x:Name="ageEntry" Placeholder="Âge" Margin="0,0,0,10" Background="#EFF0F2" TextColor="{StaticResource Black}"/>
+
         <Entry x:Name="emailEntry" Placeholder="Email" Margin="0,0,0,10" BackgroundColor="#EFF0F2" TextColor="{StaticResource Black}"/>
 
         <Entry x:Name="usernameEntry" Placeholder="Nom d'utilisateur" Margin="0,0,0,10" BackgroundColor="#EFF0F2" TextColor="{StaticResource Black}"/>
diff --git a/MangaMap/Views/signUpPage.xaml.cs b/MangaMap/Views/signUpPage.xaml.cs
index e3ba14a..190f906 100644
--- a/MangaMap/Views/signUpPage.xaml.cs
+++ b/MangaMap/Views/signUpPage.xaml.cs
@@ -16,7 +16,11 @@ public partial class signUpPage : ContentPage
     async void OnSignUpClicked(object sender, System.EventArgs e)
     {
         // Récupérer les valeurs des entrées
+        string nom = nameEntry.Text;
+        string prénom = firstNameEntry.Text;
+        int age = Convert.ToInt32(ageEntry.Text);
         string email = emailEntry.Text;
+        string pseudo = usernameEntry.Text;
         string password = passwordEntry.Text;
         string confirmPassword = confirmPasswordEntry.Text;
 
@@ -52,7 +56,7 @@ public partial class signUpPage : ContentPage
             await Navigation.PushAsync(new homePage());
         }
 
-        Utilisateur util = new Utilisateur("Ryan", "Garcia", 12);
+        Utilisateur util = new Utilisateur(email, pseudo, password, nom, prénom, age);
         my_manager.ajouterUtilisateur(util);
 
     }