From f712a13cdb569171aabb69700e4fb68df399270e Mon Sep 17 00:00:00 2001
From: Roxane <Roxane@DESKTOP-TIBPOA2>
Date: Tue, 23 May 2023 19:15:00 +0200
Subject: [PATCH 01/23] start bonding myProfil

---
 MCTG/Views/MyProfil.xaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/MCTG/Views/MyProfil.xaml b/MCTG/Views/MyProfil.xaml
index 43c7c1d..6d5004f 100644
--- a/MCTG/Views/MyProfil.xaml
+++ b/MCTG/Views/MyProfil.xaml
@@ -24,7 +24,7 @@
         <local:ContainerBase.MyContent>
 
             <ScrollView>
-                <StackLayout BindingContext="User"><!--Attention debut de binding-->
+                <StackLayout ><!--Attention debut de binding-->
                     <Label Text="Mon profil" TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Gray100}}"
                            FontAttributes="Bold"
                            FontSize="24" Padding="15, 15, 20, 5"/>
@@ -46,7 +46,9 @@
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
-                                   Margin="50,10,0,20"/>
+                                   Margin="50,10,0,20"
+                                   IsEnabled="False"
+                                   Text="truc@gmail"/>
                             <Label Text="Pseudo :"
                                    Padding="50,0,0,0"
                                    FontSize="18"/>

From 5a255642b5f0e7c84d61977b36c9a72e4d299873 Mon Sep 17 00:00:00 2001
From: Roxane <Roxane@DESKTOP-TIBPOA2>
Date: Tue, 23 May 2023 20:49:07 +0200
Subject: [PATCH 02/23] binding name, surname and mail of user in profil view

---
 MCTG/Model/User/User.cs            | 22 +++++++++++++++++++++-
 MCTG/Views/App.xaml.cs             |  3 +++
 MCTG/Views/ContainerFlyout.xaml    |  2 +-
 MCTG/Views/ContainerFlyout.xaml.cs | 14 ++++++++++++--
 MCTG/Views/MyProfil.xaml           |  7 ++++---
 MCTG/Views/MyProfil.xaml.cs        | 12 ++++++++++++
 MCTG/Views/Views.csproj            |  1 +
 7 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/MCTG/Model/User/User.cs b/MCTG/Model/User/User.cs
index 013bbe1..cbcb5e5 100644
--- a/MCTG/Model/User/User.cs
+++ b/MCTG/Model/User/User.cs
@@ -8,6 +8,7 @@ using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Text;
 using System.Runtime.Serialization;
+using System.ComponentModel;
 
 namespace Model
 {
@@ -16,7 +17,7 @@ namespace Model
     /// This user can login with an Id and a password
     /// </summary>
     [DataContract(Name = "user")]
-    public class User : IEquatable<User>
+    public class User : IEquatable<User> , INotifyPropertyChanged
     {
         #region Private Attributes
 
@@ -26,6 +27,8 @@ namespace Model
         [DataMember] private string picture = "";
         [DataMember] private int password ;
         [DataMember] private List<Priority> priorities;
+
+        public event PropertyChangedEventHandler? PropertyChanged;
         #endregion
 
         #region Properties
@@ -44,6 +47,7 @@ namespace Model
                     throw new ArgumentException("Impossible d'avoir un champ Nom vide!");
                 }
                 name = value;
+                OnPropertyChanged();
             }
         }
 
@@ -61,6 +65,7 @@ namespace Model
                     throw new ArgumentException("Impossible d'avoir un champ Prénom vide!");
                 }
                 surname = value;
+                OnPropertyChanged();
             }
         }
 
@@ -130,6 +135,21 @@ namespace Model
             throw new NotImplementedException();
         }
 
+
+        protected void OnPropertyChanged ([CallerMemberName] string? propertyName = null)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public override string ToString()
+        {
+            return $"{Name} {Surname}"; 
+        }
+
+
+
+
         #endregion
 
 
diff --git a/MCTG/Views/App.xaml.cs b/MCTG/Views/App.xaml.cs
index 304aed5..59c681f 100644
--- a/MCTG/Views/App.xaml.cs
+++ b/MCTG/Views/App.xaml.cs
@@ -4,10 +4,13 @@ using Microsoft.UI.Windowing;
 using Windows.Graphics;
 #endif
 
+using DataPersistence;
+
 namespace Views
 {
     public partial class App : Application
     {
+        public DataManager DataMgr { get; private set; } = new DataManager(new Stubs());
         const int WindowWidth = 1200;
         const int WindowHeight = 800;
 
diff --git a/MCTG/Views/ContainerFlyout.xaml b/MCTG/Views/ContainerFlyout.xaml
index 77a742e..0001b22 100644
--- a/MCTG/Views/ContainerFlyout.xaml
+++ b/MCTG/Views/ContainerFlyout.xaml
@@ -28,7 +28,7 @@
                     Style="{StaticResource button2}"
                     IsVisible="{Binding IsNotConnected, Source={x:Reference fl}}"
                     IsEnabled="{Binding IsNotConnected, Source={x:Reference fl}}"/>
-            <Label Text="Jean-Baptiste De La Fontaine"
+            <Label Text="{Binding user}"
                    HorizontalOptions="Center" Margin="15"
                    FontSize="20" FontAttributes="Bold" HorizontalTextAlignment="Center"
                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
diff --git a/MCTG/Views/ContainerFlyout.xaml.cs b/MCTG/Views/ContainerFlyout.xaml.cs
index 78f4031..cde4145 100644
--- a/MCTG/Views/ContainerFlyout.xaml.cs
+++ b/MCTG/Views/ContainerFlyout.xaml.cs
@@ -1,11 +1,21 @@
+using DataPersistence;
+using Model;
+
 namespace Views;
 
 public partial class ContainerFlyout : ContentView
 {
-	public ContainerFlyout()
+    public DataManager DataMgr => (App.Current as App).DataMgr;
+    public User user { get; private set; }
+
+
+    public ContainerFlyout()
 	{
+        
 		InitializeComponent();
-	}
+        BindingContext = this;
+        user = DataMgr.Data[nameof(User)].Cast<User>().Last();
+}
 
     // Bind MyFlyoutContent
     public static readonly BindableProperty MyFlyoutContentProperty =
diff --git a/MCTG/Views/MyProfil.xaml b/MCTG/Views/MyProfil.xaml
index 6d5004f..892693f 100644
--- a/MCTG/Views/MyProfil.xaml
+++ b/MCTG/Views/MyProfil.xaml
@@ -24,7 +24,7 @@
         <local:ContainerBase.MyContent>
 
             <ScrollView>
-                <StackLayout ><!--Attention debut de binding-->
+                <StackLayout >
                     <Label Text="Mon profil" TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Gray100}}"
                            FontAttributes="Bold"
                            FontSize="24" Padding="15, 15, 20, 5"/>
@@ -41,14 +41,15 @@
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
-                                   Margin="50,10,0,20"/>
+                                   Margin="50,10,0,20"
+                                   Text="{Binding Surname} "/>
                             <Label Text="Mail :"
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
                                    Margin="50,10,0,20"
                                    IsEnabled="False"
-                                   Text="truc@gmail"/>
+                                   Text="{Binding Mail}"/>
                             <Label Text="Pseudo :"
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
diff --git a/MCTG/Views/MyProfil.xaml.cs b/MCTG/Views/MyProfil.xaml.cs
index fff0b87..314d681 100644
--- a/MCTG/Views/MyProfil.xaml.cs
+++ b/MCTG/Views/MyProfil.xaml.cs
@@ -1,9 +1,21 @@
+using DataPersistence;
+using Model;
+
 namespace Views;
 
 public partial class MyProfil : ContentPage
 {
+	public DataManager DataMgr = (App.Current as App).DataMgr;
+    public User user { get; private set; }
+
+
 	public MyProfil()
 	{
+		DataMgr = new DataManager(new Stubs());
+
+		user = DataMgr.Data[nameof(User)].Cast<User>().Last();
 		InitializeComponent();
+
+		BindingContext = user;
 	}
 }
\ No newline at end of file
diff --git a/MCTG/Views/Views.csproj b/MCTG/Views/Views.csproj
index faaaace..b062494 100644
--- a/MCTG/Views/Views.csproj
+++ b/MCTG/Views/Views.csproj
@@ -57,6 +57,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <ProjectReference Include="..\DataPersistence\DataPersistence.csproj" />
 	  <ProjectReference Include="..\Model\Model.csproj" />
 	</ItemGroup>
 

From 82255808a95dc6d2799b1848c64d2d30e247bd50 Mon Sep 17 00:00:00 2001
From: Roxane ROSSETTO <rorossetto>
Date: Wed, 24 May 2023 11:42:44 +0200
Subject: [PATCH 03/23] implementation of a void constructor of user and a copy
 constructor. Binding between flyoutContainer and MyProfil views

---
 MCTG/DataPersistence/Stubs.cs      | 238 ++++++++++++++---------------
 MCTG/Model/Recipes/Review.cs       |   3 +-
 MCTG/Model/User/User.cs            |  47 ++++--
 MCTG/Views/App.xaml.cs             |   7 +-
 MCTG/Views/ContainerFlyout.xaml    |  12 +-
 MCTG/Views/ContainerFlyout.xaml.cs |  16 +-
 MCTG/Views/MyProfil.xaml           |  15 +-
 MCTG/Views/MyProfil.xaml.cs        |  26 +++-
 8 files changed, 199 insertions(+), 165 deletions(-)

diff --git a/MCTG/DataPersistence/Stubs.cs b/MCTG/DataPersistence/Stubs.cs
index 1539bc5..2b32fec 100644
--- a/MCTG/DataPersistence/Stubs.cs
+++ b/MCTG/DataPersistence/Stubs.cs
@@ -1,132 +1,132 @@
-using Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DataPersistence
-{
-    /// <summary>
-    /// The subs class is a group of prefabricated object that can only be loaded. It only use is for testing.
-    /// </summary>
-    public class Stubs : IDataManager
-    {
-        public Dictionary<string, List<object>> Load()
-        {
-            PasswordManager passwordManager = new PasswordManager();
-
-            Dictionary<string, List<object>> data = new Dictionary<string, List<object>>
-            {
-                {
-                    #region Data: Recipes
-                    nameof(Recipe),
-                    new List<object>(new[]
-                    {
-                        new Recipe(
-                            title: "Cookies classiques", id: null,
-                            preparationSteps: new[]
-                            {
-                                new PreparationStep(1, "Faire cuire."),
-                                new PreparationStep(2, "Manger.")
-                            }),
-                        new Recipe(
-                            title: "Cookies au chocolat", id: null,
-                            preparationSteps: new[]
-                            {
-                                new PreparationStep(1, "Moulinez la pâte."),
-                                new PreparationStep(2, "Faire cuire pendant une bonne heure."),
-                                new PreparationStep(3, "Sortir du four et mettre dans un plat.")
-                            }),
-                        new Recipe(
-                            title: "Gateau nature", id: null,
-                            preparationSteps: new[]
-                            {
-                                new PreparationStep(1, "Achetez les ingrédients."),
-                                new PreparationStep(2, "Préparez le matériel. Ustensiles et tout."),
-                                new PreparationStep(3, "Pleurez.")
-                            }),
-                        new Recipe(
-                            title: "Gateau au pommes", id: null,
-                            preparationSteps: new[]
-                            {
-                                new PreparationStep(1, "Achetez les légumes."),
-                                new PreparationStep(2, "Préparez le plat. Ustensiles et préchauffez le four."),
-                                new PreparationStep(3, "Coupez les pommes en morceaux et disposez-les sur le plat."),
-                                new PreparationStep(4, "Mettez enfin le plat au four, puis une fois cuit, dégustez !")
-                            }),
-                        new Recipe(
-                            title: "Gateau au chocolat", id: null,
-                            preparationSteps: new[]
-                            {
-                                new PreparationStep(1, "Ajouter les oeufs."),
-                                new PreparationStep(2, "Ajouter la farine."),
-                                new PreparationStep(3, "Ajouter 100g de chocolat fondu."),
-                                new PreparationStep(4, "Mélanger le tout."),
-                                new PreparationStep(5, "Faire cuire 45h au four traditionnel.")
-                            }),
-                        new Recipe(
-                            title: "Dinde au jambon", id: null,
-                            preparationSteps: new[]
-                            {
-                                new PreparationStep(1, "Faire une cuisson bien sec de la dinde à la poêle"),
-                                new PreparationStep(2, "Mettre la dinde au frigo."),
-                                new PreparationStep(3, "Mettre le jambon dans le micro-onde."),
-                                new PreparationStep(4, "Faire chauffer 3min."),
-                                new PreparationStep(5, "Présentez sur un plat la dinde et le jambon : Miam !")
-                            }),
-                        new Recipe(
-                            title: "Poulet au curry", id: null,
-                            preparationSteps: new[]
-                            {
-                                new PreparationStep(1, "Trouvez des épices de curry."),
-                                new PreparationStep(2, "Trouvez maintenant du poulet."),
-                                new PreparationStep(3, "Coupez la tête du poulet et posez-la dans un plat."),
-                                new PreparationStep(4, "Parsemez d'épices curry la tête de la poule."),
-                                new PreparationStep(5, "Mettre le tout au four traditionnel 30min."),
-                                new PreparationStep(6, "Dégustez en famille !")
-                            })
-                    })
-                    #endregion
-                },
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataPersistence
+{
+    /// <summary>
+    /// The subs class is a group of prefabricated object that can only be loaded. It only use is for testing.
+    /// </summary>
+    public class Stubs : IDataManager
+    {
+        public Dictionary<string, List<object>> Load()
+        {
+
+            Dictionary<string, List<object>> data = new Dictionary<string, List<object>>
+            {
                 {
-                    #region Data: User
-                    nameof(User),
+                    #region Data: Recipes
+                    nameof(Recipe),
+                    new List<object>(new[]
+                    {
+                        new Recipe(
+                            title: "Cookies classiques", id: null,
+                            preparationSteps: new[]
+                            {
+                                new PreparationStep(1, "Faire cuire."),
+                                new PreparationStep(2, "Manger.")
+                            }),
+                        new Recipe(
+                            title: "Cookies au chocolat", id: null,
+                            preparationSteps: new[]
+                            {
+                                new PreparationStep(1, "Moulinez la pâte."),
+                                new PreparationStep(2, "Faire cuire pendant une bonne heure."),
+                                new PreparationStep(3, "Sortir du four et mettre dans un plat.")
+                            }),
+                        new Recipe(
+                            title: "Gateau nature", id: null,
+                            preparationSteps: new[]
+                            {
+                                new PreparationStep(1, "Achetez les ingrédients."),
+                                new PreparationStep(2, "Préparez le matériel. Ustensiles et tout."),
+                                new PreparationStep(3, "Pleurez.")
+                            }),
+                        new Recipe(
+                            title: "Gateau au pommes", id: null,
+                            preparationSteps: new[]
+                            {
+                                new PreparationStep(1, "Achetez les légumes."),
+                                new PreparationStep(2, "Préparez le plat. Ustensiles et préchauffez le four."),
+                                new PreparationStep(3, "Coupez les pommes en morceaux et disposez-les sur le plat."),
+                                new PreparationStep(4, "Mettez enfin le plat au four, puis une fois cuit, dégustez !")
+                            }),
+                        new Recipe(
+                            title: "Gateau au chocolat", id: null,
+                            preparationSteps: new[]
+                            {
+                                new PreparationStep(1, "Ajouter les oeufs."),
+                                new PreparationStep(2, "Ajouter la farine."),
+                                new PreparationStep(3, "Ajouter 100g de chocolat fondu."),
+                                new PreparationStep(4, "Mélanger le tout."),
+                                new PreparationStep(5, "Faire cuire 45h au four traditionnel.")
+                            }),
+                        new Recipe(
+                            title: "Dinde au jambon", id: null,
+                            preparationSteps: new[]
+                            {
+                                new PreparationStep(1, "Faire une cuisson bien sec de la dinde à la poêle"),
+                                new PreparationStep(2, "Mettre la dinde au frigo."),
+                                new PreparationStep(3, "Mettre le jambon dans le micro-onde."),
+                                new PreparationStep(4, "Faire chauffer 3min."),
+                                new PreparationStep(5, "Présentez sur un plat la dinde et le jambon : Miam !")
+                            }),
+                        new Recipe(
+                            title: "Poulet au curry", id: null,
+                            preparationSteps: new[]
+                            {
+                                new PreparationStep(1, "Trouvez des épices de curry."),
+                                new PreparationStep(2, "Trouvez maintenant du poulet."),
+                                new PreparationStep(3, "Coupez la tête du poulet et posez-la dans un plat."),
+                                new PreparationStep(4, "Parsemez d'épices curry la tête de la poule."),
+                                new PreparationStep(5, "Mettre le tout au four traditionnel 30min."),
+                                new PreparationStep(6, "Dégustez en famille !")
+                            })
+                    })
+                    #endregion
+                },
+                {
+                    #region Data: User
+                    nameof(User),
                     new List<object>(new[]
                     {
                         new User(
                             name: "Admin",
                             surname: "Admin",
                             mail: "admin@mctg.fr",
-                            password: passwordManager.HashPassword("admin")),
+                            password: "admin"),
                         new User(
                             name: "Pedros",
                             surname: "Amigos",
                             mail: "pedrosamigos@hotmail.com",
-                            password: passwordManager.HashPassword("pamigos"))
+                            password: "pamigos")
+                    
                     })
                     #endregion
-                }
-            };
-
-            return data;
-        }
-
-        #region Not supported methods
-        public void Save(Dictionary<string, List<object>> elements)
-        {
-            throw new NotSupportedException();
-        }
-
-        public void Export<T>(T obj, string pathToExport) where T : class
-        {
-            throw new NotSupportedException();
-        }
-
-        public KeyValuePair<string, T> Import<T>(string pathToImport) where T : class
-        {
-            throw new NotSupportedException();
-        }
-        #endregion
-    }
-}
+                }
+            };
+
+            return data;
+        }
+
+        #region Not supported methods
+        public void Save(Dictionary<string, List<object>> elements)
+        {
+            throw new NotSupportedException();
+        }
+
+        public void Export<T>(T obj, string pathToExport) where T : class
+        {
+            throw new NotSupportedException();
+        }
+
+        public KeyValuePair<string, T> Import<T>(string pathToImport) where T : class
+        {
+            throw new NotSupportedException();
+        }
+        #endregion
+    }
+}
diff --git a/MCTG/Model/Recipes/Review.cs b/MCTG/Model/Recipes/Review.cs
index b98d498..d560d23 100644
--- a/MCTG/Model/Recipes/Review.cs
+++ b/MCTG/Model/Recipes/Review.cs
@@ -66,8 +66,7 @@ namespace Model
         }
 
         public Review(int stars, string content)
-            : this(new User("admin", "admin", "admin@mctg.fr", new PasswordManager().HashPassword("admin")),
-                  null, stars, content)
+            : this(new User(), null, stars, content)
         {
         }
 
diff --git a/MCTG/Model/User/User.cs b/MCTG/Model/User/User.cs
index cbcb5e5..d8e4e09 100644
--- a/MCTG/Model/User/User.cs
+++ b/MCTG/Model/User/User.cs
@@ -17,7 +17,7 @@ namespace Model
     /// This user can login with an Id and a password
     /// </summary>
     [DataContract(Name = "user")]
-    public class User : IEquatable<User> , INotifyPropertyChanged
+    public class User : IEquatable<User> , INotifyPropertyChanged 
     {
         #region Private Attributes
 
@@ -40,12 +40,9 @@ namespace Model
         public string Name
         {
             get { return name; }
-            private set
+            set
             {
-                if (string.IsNullOrWhiteSpace(value))
-                {
-                    throw new ArgumentException("Impossible d'avoir un champ Nom vide!");
-                }
+             
                 name = value;
                 OnPropertyChanged();
             }
@@ -58,12 +55,9 @@ namespace Model
         public string Surname
         {
             get { return surname; }
-            private set
+            set
             {
-                if (string.IsNullOrWhiteSpace(value))
-                {
-                    throw new ArgumentException("Impossible d'avoir un champ Prénom vide!");
-                }
+             
                 surname = value;
                 OnPropertyChanged();
             }
@@ -147,7 +141,7 @@ namespace Model
             return $"{Name} {Surname}"; 
         }
 
-
+        public IPasswordManager psswMgr { get; private set; }
 
 
         #endregion
@@ -161,12 +155,13 @@ namespace Model
         /// <param name="name">The name of the user</param>
         /// <param name="surname">The surname of the user</param>
         /// <param name="mail">The user needs an email to login. </param>
-        public User(string name, string surname, string mail, int password)
+        public User(string name, string surname, string mail, string password, IPasswordManager passwordManager )
         {
             Name = name;
             Surname = surname;
             Mail = mail;
-            Password = password;
+            psswMgr = passwordManager;
+            Password = psswMgr.HashPassword(password);
             priorities = new List<Priority> {
                 Priority.Gourmet,
                 Priority.Economic,
@@ -176,8 +171,30 @@ namespace Model
             ProfilPict = picture;
 
         }
+        public User(string name, string surname, string mail, string password)
+            : this(name, surname,mail, password, new PasswordManager())
+        {
+
+        }
+
+
+        public User()
+            : this("John", "Doe", "truc@gmail.com", "mdp")
+        {
+
+        }
+
+        public User (User user)
+        {
+            Name = user.Name;
+            Surname = user.Surname;
+            Mail = user.Mail;
+            psswMgr = user.psswMgr;
+            Password = user.Password;
+            priorities = user.Priorities;
+            ProfilPict = user.ProfilPict;
+        }
 
-    
 
         #endregion
 
diff --git a/MCTG/Views/App.xaml.cs b/MCTG/Views/App.xaml.cs
index 59c681f..0ae3fef 100644
--- a/MCTG/Views/App.xaml.cs
+++ b/MCTG/Views/App.xaml.cs
@@ -5,17 +5,20 @@ using Windows.Graphics;
 #endif
 
 using DataPersistence;
-
+using Model;
+
 namespace Views
 {
     public partial class App : Application
     {
         public DataManager DataMgr { get; private set; } = new DataManager(new Stubs());
+        public User user { get; set; }
         const int WindowWidth = 1200;
         const int WindowHeight = 800;
 
         public App()
-        {
+        {
+            user = DataMgr.Data[nameof(User)].Cast<User>().Last();
             InitializeComponent();
 
             Microsoft.Maui.Handlers.WindowHandler.Mapper.AppendToMapping(nameof(IWindow), (handler, view) =>
diff --git a/MCTG/Views/ContainerFlyout.xaml b/MCTG/Views/ContainerFlyout.xaml
index 0001b22..07193e3 100644
--- a/MCTG/Views/ContainerFlyout.xaml
+++ b/MCTG/Views/ContainerFlyout.xaml
@@ -28,11 +28,19 @@
                     Style="{StaticResource button2}"
                     IsVisible="{Binding IsNotConnected, Source={x:Reference fl}}"
                     IsEnabled="{Binding IsNotConnected, Source={x:Reference fl}}"/>
-            <Label Text="{Binding user}"
-                   HorizontalOptions="Center" Margin="15"
+            <StackLayout BindingContext="{Binding user}">
+                <Label Text="{Binding Name}"
+                   HorizontalOptions="Center" Margin="0,15"
                    FontSize="20" FontAttributes="Bold" HorizontalTextAlignment="Center"
                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
                    IsVisible="{Binding IsNotConnected, Converter={toolkit:InvertedBoolConverter} ,Source={x:Reference fl}}"/>
+                <Label Text="{Binding Surname}"
+                   HorizontalOptions="Center" 
+                   FontSize="20" FontAttributes="Bold" HorizontalTextAlignment="Center"
+                   TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
+                   IsVisible="{Binding IsNotConnected, Converter={toolkit:InvertedBoolConverter} ,Source={x:Reference fl}}"/>
+            </StackLayout>
+            
 
         </VerticalStackLayout>
 
diff --git a/MCTG/Views/ContainerFlyout.xaml.cs b/MCTG/Views/ContainerFlyout.xaml.cs
index cde4145..6fcb273 100644
--- a/MCTG/Views/ContainerFlyout.xaml.cs
+++ b/MCTG/Views/ContainerFlyout.xaml.cs
@@ -5,17 +5,17 @@ namespace Views;
 
 public partial class ContainerFlyout : ContentView
 {
-    public DataManager DataMgr => (App.Current as App).DataMgr;
-    public User user { get; private set; }
+    public DataManager DataMgr => (App.Current as App).DataMgr;
+    public User user => (App.Current as App).user;
 
 
     public ContainerFlyout()
-	{
-        
-		InitializeComponent();
-        BindingContext = this;
-        user = DataMgr.Data[nameof(User)].Cast<User>().Last();
-}
+	{
+        InitializeComponent();
+        BindingContext = this;
+
+
+    }
 
     // Bind MyFlyoutContent
     public static readonly BindableProperty MyFlyoutContentProperty =
diff --git a/MCTG/Views/MyProfil.xaml b/MCTG/Views/MyProfil.xaml
index 892693f..a51bc9c 100644
--- a/MCTG/Views/MyProfil.xaml
+++ b/MCTG/Views/MyProfil.xaml
@@ -36,30 +36,27 @@
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
-                                   Margin="50,10,0,20"/>
+                                   Margin="50,10,0,20"
+                                   Text="{Binding userBis.Name}"/>
                             <Label Text="Prénom :"
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
                                    Margin="50,10,0,20"
-                                   Text="{Binding Surname} "/>
+                                   Text="{Binding userBis.Surname} "/>
                             <Label Text="Mail :"
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
                                    Margin="50,10,0,20"
                                    IsEnabled="False"
-                                   Text="{Binding Mail}"/>
-                            <Label Text="Pseudo :"
-                                   Padding="50,0,0,0"
-                                   FontSize="18"/>
-                            <Entry BackgroundColor="#D1E8E2"
-                                   Margin="50,10,0,50"/>
+                                   Text="{Binding user.Mail}"/>
                             <Button BackgroundColor="#bdf5bd"
                                     Text="Valider"
                                     Margin="40,0,0,0"
                                     TextColor="Black"
-                                    MaximumWidthRequest="100"/>
+                                    MaximumWidthRequest="100"
+                                    Clicked="Validation_Click"/>
 
 
 
diff --git a/MCTG/Views/MyProfil.xaml.cs b/MCTG/Views/MyProfil.xaml.cs
index 314d681..3e89c68 100644
--- a/MCTG/Views/MyProfil.xaml.cs
+++ b/MCTG/Views/MyProfil.xaml.cs
@@ -1,21 +1,31 @@
+using CommunityToolkit.Maui.Behaviors;
 using DataPersistence;
 using Model;
-
+using System.Diagnostics;
+
 namespace Views;
 
 public partial class MyProfil : ContentPage
 {
-	public DataManager DataMgr = (App.Current as App).DataMgr;
-    public User user { get; private set; }
-
+	public DataManager DataMgr => (App.Current as App).DataMgr;
+	public User user => (App.Current as App).user;
+	public User userBis {get; set; }
 
 	public MyProfil()
 	{
-		DataMgr = new DataManager(new Stubs());
-
-		user = DataMgr.Data[nameof(User)].Cast<User>().Last();
+		userBis = new User(user);
 		InitializeComponent();
 
-		BindingContext = user;
+		BindingContext = this;
+    }
+
+
+    public void Validation_Click(object sender, EventArgs e)
+	{
+		if (String.IsNullOrEmpty(userBis.Name) || String.IsNullOrEmpty(userBis.Surname)){
+			return;
+		}
+		user.Name = userBis.Name;
+		user.Surname = userBis.Surname;
 	}
 }
\ No newline at end of file

From 9a03d8c117f7220d278a5612ed2488d6bfff8465 Mon Sep 17 00:00:00 2001
From: Roxane ROSSETTO <rorossetto>
Date: Wed, 24 May 2023 11:49:11 +0200
Subject: [PATCH 04/23] there was an error with unit test of user, because of
 constructor changement

---
 MCTG/Tests/Model_UnitTests/test_unit_user.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MCTG/Tests/Model_UnitTests/test_unit_user.cs b/MCTG/Tests/Model_UnitTests/test_unit_user.cs
index 5df6579..02cbcdb 100644
--- a/MCTG/Tests/Model_UnitTests/test_unit_user.cs
+++ b/MCTG/Tests/Model_UnitTests/test_unit_user.cs
@@ -13,7 +13,7 @@ namespace Model_UnitTests
         public void TestConstructUser()
         {
             PasswordManager passwordManager = new PasswordManager();
-            User user = new User("Bob", "Dylan", "bd@gmail.com", passwordManager.HashPassword("bobby"));
+            User user = new User("Bob", "Dylan", "bd@gmail.com", "bobby");
             Assert.Equal("Bob", user.Name);
             Assert.Equal("Dylan", user.Surname);
             Assert.Equal("bd@gmail.com", user.Mail);

From 47ef6838a4907d4856047e66f4f48f01bfbded1c Mon Sep 17 00:00:00 2001
From: Roxane ROSSETTO <rorossetto>
Date: Wed, 24 May 2023 15:05:19 +0200
Subject: [PATCH 05/23] urge

---
 MCTG/Views/App.xaml.cs             | 82 +++++++++++++--------------
 MCTG/Views/ContainerFlyout.xaml.cs | 90 +++++++++++++++---------------
 MCTG/Views/MyProfil.xaml           | 61 +++++++++-----------
 MCTG/Views/MyProfil.xaml.cs        | 30 +++++-----
 MCTG/Views/Views.csproj            |  3 +
 5 files changed, 129 insertions(+), 137 deletions(-)

diff --git a/MCTG/Views/App.xaml.cs b/MCTG/Views/App.xaml.cs
index 0ae3fef..be9eef9 100644
--- a/MCTG/Views/App.xaml.cs
+++ b/MCTG/Views/App.xaml.cs
@@ -1,44 +1,44 @@
-#if WINDOWS
-using Microsoft.UI;
-using Microsoft.UI.Windowing;
-using Windows.Graphics;
-#endif
-
-using DataPersistence;
+#if WINDOWS
+using Microsoft.UI;
+using Microsoft.UI.Windowing;
+using Windows.Graphics;
+#endif
+
+using DataPersistence;
 using Model;
 
-namespace Views
-{
-    public partial class App : Application
-    {
-        public DataManager DataMgr { get; private set; } = new DataManager(new Stubs());
-        public User user { get; set; }
-        const int WindowWidth = 1200;
-        const int WindowHeight = 800;
-
-        public App()
+namespace Views
+{
+    public partial class App : Application
+    {
+        public DataManager DataMgr { get; private set; } = new DataManager(new Stubs());
+        public User user { get; set; }
+        const int WindowWidth = 1200;
+        const int WindowHeight = 800;
+
+        public App()
         {
-            user = DataMgr.Data[nameof(User)].Cast<User>().Last();
-            InitializeComponent();
-
-            Microsoft.Maui.Handlers.WindowHandler.Mapper.AppendToMapping(nameof(IWindow), (handler, view) =>
-            {
-#if WINDOWS
-                var mauiWindow = handler.VirtualView;
-                var nativeWindow = handler.PlatformView;
-                nativeWindow.Activate();
-                IntPtr windowHandle = WinRT.Interop.WindowNative.GetWindowHandle(nativeWindow);
-                WindowId windowId = Microsoft.UI.Win32Interop.GetWindowIdFromWindow(windowHandle);
-                AppWindow appWindow = Microsoft.UI.Windowing.AppWindow.GetFromWindowId(windowId);
-                appWindow.Resize(new SizeInt32(WindowWidth, WindowHeight));
-#endif
-            });
-
-
-            /* - Comment(ctrl-k + ctrl-c)/Uncomment(ctrl-k + ctrl-u) to change page  - */
-            UserAppTheme = AppTheme.Light;
-            MainPage = new MyProfil();
-            //MainPage = new MyPosts();
-        }
-    }
-}
+            user = DataMgr.Data[nameof(User)].Cast<User>().Last();
+            InitializeComponent();
+
+            Microsoft.Maui.Handlers.WindowHandler.Mapper.AppendToMapping(nameof(IWindow), (handler, view) =>
+            {
+#if WINDOWS
+                var mauiWindow = handler.VirtualView;
+                var nativeWindow = handler.PlatformView;
+                nativeWindow.Activate();
+                IntPtr windowHandle = WinRT.Interop.WindowNative.GetWindowHandle(nativeWindow);
+                WindowId windowId = Microsoft.UI.Win32Interop.GetWindowIdFromWindow(windowHandle);
+                AppWindow appWindow = Microsoft.UI.Windowing.AppWindow.GetFromWindowId(windowId);
+                appWindow.Resize(new SizeInt32(WindowWidth, WindowHeight));
+#endif
+            });
+
+
+            /* - Comment(ctrl-k + ctrl-c)/Uncomment(ctrl-k + ctrl-u) to change page  - */
+            UserAppTheme = AppTheme.Light;
+            MainPage = new AddRecipe();
+            //MainPage = new MyPosts();
+        }
+    }
+}
diff --git a/MCTG/Views/ContainerFlyout.xaml.cs b/MCTG/Views/ContainerFlyout.xaml.cs
index 6fcb273..09e2b29 100644
--- a/MCTG/Views/ContainerFlyout.xaml.cs
+++ b/MCTG/Views/ContainerFlyout.xaml.cs
@@ -1,49 +1,49 @@
-using DataPersistence;
-using Model;
-
-namespace Views;
-
-public partial class ContainerFlyout : ContentView
-{
+using DataPersistence;
+using Model;
+
+namespace Views;
+
+public partial class ContainerFlyout : ContentView
+{
     public DataManager DataMgr => (App.Current as App).DataMgr;
-    public User user => (App.Current as App).user;
-
-
-    public ContainerFlyout()
+    public User user => (App.Current as App).user;
+
+
+    public ContainerFlyout()
 	{
         InitializeComponent();
         BindingContext = this;
-
-
-    }
-
-    // Bind MyFlyoutContent
-    public static readonly BindableProperty MyFlyoutContentProperty =
-        BindableProperty.Create("MyFlyoutContent", typeof(View), typeof(ContainerFlyout), new Grid());
-
-    public View MyFlyoutContent
-    {
-        get => (View)GetValue(MyFlyoutContentProperty);
-        set => SetValue(MyFlyoutContentProperty, value);
-    }
-
-    // Bind IsNotConnected
-    public static readonly BindableProperty IsNotConnectedProperty =
-        BindableProperty.Create("IsNotConnected", typeof(bool), typeof(Button), true);
-
-    public bool IsNotConnected
-    {
-        get => (bool)GetValue(IsNotConnectedProperty);
-        set => SetValue(IsNotConnectedProperty, value);
-    }
-
-    // bind NeedReturn
-    public static readonly BindableProperty NeedReturnProperty =
-        BindableProperty.Create("NeedReturn", typeof(bool), typeof(Border), false);
-
-    public bool NeedReturn
-    {
-        get => (bool)GetValue(NeedReturnProperty);
-        set => SetValue(NeedReturnProperty, value);
-    }
-}
+
+
+    }
+
+    // Bind MyFlyoutContent
+    public static readonly BindableProperty MyFlyoutContentProperty =
+        BindableProperty.Create("MyFlyoutContent", typeof(View), typeof(ContainerFlyout), new Grid());
+
+    public View MyFlyoutContent
+    {
+        get => (View)GetValue(MyFlyoutContentProperty);
+        set => SetValue(MyFlyoutContentProperty, value);
+    }
+
+    // Bind IsNotConnected
+    public static readonly BindableProperty IsNotConnectedProperty =
+        BindableProperty.Create("IsNotConnected", typeof(bool), typeof(Button), true);
+
+    public bool IsNotConnected
+    {
+        get => (bool)GetValue(IsNotConnectedProperty);
+        set => SetValue(IsNotConnectedProperty, value);
+    }
+
+    // bind NeedReturn
+    public static readonly BindableProperty NeedReturnProperty =
+        BindableProperty.Create("NeedReturn", typeof(bool), typeof(Border), false);
+
+    public bool NeedReturn
+    {
+        get => (bool)GetValue(NeedReturnProperty);
+        set => SetValue(NeedReturnProperty, value);
+    }
+}
diff --git a/MCTG/Views/MyProfil.xaml b/MCTG/Views/MyProfil.xaml
index a51bc9c..e40d9dc 100644
--- a/MCTG/Views/MyProfil.xaml
+++ b/MCTG/Views/MyProfil.xaml
@@ -14,8 +14,8 @@
 
             <Grid RowDefinitions="250, *, *" VerticalOptions="Fill">
                 <VerticalStackLayout Grid.Row="1">
-                    <Button Text="Mes informations" ImageSource="person_default.png" Style="{StaticResource button1}" Grid.Row="1"/>
-                    <Button Text="Modifier" ImageSource="settings_icon.png" Style="{StaticResource button1}" Grid.Row="2"/>
+                    <Button Text="Mes Recettes" ImageSource="person_default.png" Style="{StaticResource button1}" Grid.Row="1"/>
+                    <Button Text="Ajouter Recette" ImageSource="settings_icon.png" Style="{StaticResource button1}" Grid.Row="2"/>
                 </VerticalStackLayout>
             </Grid>
 
@@ -25,6 +25,7 @@
 
             <ScrollView>
                 <StackLayout >
+                    <!--user's informations-->
                     <Label Text="Mon profil" TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Gray100}}"
                            FontAttributes="Bold"
                            FontSize="24" Padding="15, 15, 20, 5"/>
@@ -52,14 +53,12 @@
                                    IsEnabled="False"
                                    Text="{Binding user.Mail}"/>
                             <Button BackgroundColor="#bdf5bd"
-                                    Text="Valider"
+                                    Text="Modifier"
                                     Margin="40,0,0,0"
                                     TextColor="Black"
                                     MaximumWidthRequest="100"
                                     Clicked="Validation_Click"/>
-
-
-
+                            <!--liste drag and drop-->
                         </VerticalStackLayout>
                         <VerticalStackLayout Padding="100,0,0,0">
                             <Label Text="Priorités du compte : " TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Gray100}}"
@@ -67,44 +66,34 @@
                             <Grid BackgroundColor="#D1E8E2"
                                   MinimumHeightRequest="300"
                                   Padding="20">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Label Text="Recettes économiques" Grid.Row="0" Padding="5,0,0,0"/>
-                            <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="1" />
-                            <Label Text="Recettes rapides" Grid.Row="2"/>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Label Text="Recettes économiques" Grid.Row="0" Padding="5,0,0,0"/>
+                                <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="1" />
+                                <Label Text="Recettes rapides" Grid.Row="2"/>
                                 <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="3" />
-                            <Label Text="Recettes simples" Grid.Row="4"/>
+                                <Label Text="Recettes simples" Grid.Row="4"/>
                                 <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="5" />
-                            <Label Text="Recettes légères" Grid.Row="6"/>
+                                <Label Text="Recettes légères" Grid.Row="6"/>
                                 <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="7" />
-                            <Label Text="Recettes gourmandes" Grid.Row="8"/>
+                                <Label Text="Recettes gourmandes" Grid.Row="8"/>
                             </Grid>
-
-                            
                         </VerticalStackLayout>
-                        
-                        
                     </HorizontalStackLayout>
-                   
-
-                  
                 </StackLayout>
             </ScrollView>
-
         </local:ContainerBase.MyContent>
-
     </local:ContainerBase>
-
 </ContentPage>
diff --git a/MCTG/Views/MyProfil.xaml.cs b/MCTG/Views/MyProfil.xaml.cs
index 3e89c68..85fd391 100644
--- a/MCTG/Views/MyProfil.xaml.cs
+++ b/MCTG/Views/MyProfil.xaml.cs
@@ -1,21 +1,21 @@
 using CommunityToolkit.Maui.Behaviors;
-using DataPersistence;
-using Model;
+using DataPersistence;
+using Model;
 using System.Diagnostics;
 
-namespace Views;
-
-public partial class MyProfil : ContentPage
-{
+namespace Views;
+
+public partial class MyProfil : ContentPage
+{
 	public DataManager DataMgr => (App.Current as App).DataMgr;
-	public User user => (App.Current as App).user;
-	public User userBis {get; set; }
-
-	public MyProfil()
-	{
-		userBis = new User(user);
-		InitializeComponent();
-
+	public User user => (App.Current as App).user;
+	public User userBis {get; set; }
+
+	public MyProfil()
+	{
+		userBis = new User(user);
+		InitializeComponent();
+
 		BindingContext = this;
     }
 
@@ -27,5 +27,5 @@ public partial class MyProfil : ContentPage
 		}
 		user.Name = userBis.Name;
 		user.Surname = userBis.Surname;
-	}
+	}
 }
\ No newline at end of file
diff --git a/MCTG/Views/Views.csproj b/MCTG/Views/Views.csproj
index b062494..c5fb545 100644
--- a/MCTG/Views/Views.csproj
+++ b/MCTG/Views/Views.csproj
@@ -62,6 +62,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="AddRecipe.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="ContainerBase.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From 9eef461a44d4bf5d948771a772f95865d7d3eb66 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Wed, 24 May 2023 15:07:27 +0200
Subject: [PATCH 06/23] working on MasterManager

---
 MCTG/ConsoleApp/Menu/ConnectionMenu.cs        |  3 +-
 .../Menu/{ => Core}/Entry.EntryStep.cs        |  2 +-
 MCTG/ConsoleApp/Menu/{ => Core}/Entry.cs      |  5 +--
 MCTG/ConsoleApp/Menu/{ => Core}/IMenu.cs      |  2 +-
 MCTG/ConsoleApp/Menu/{ => Core}/Menu.cs       |  6 ++--
 MCTG/ConsoleApp/Menu/{ => Core}/PlainText.cs  | 16 ++++-----
 MCTG/ConsoleApp/Menu/{ => Core}/Selector.cs   |  7 ++--
 MCTG/ConsoleApp/Menu/MainMenu.cs              |  3 +-
 MCTG/ConsoleApp/Menu/SearcherRecipe.cs        |  2 +-
 MCTG/ConsoleApp/MenuManager.cs                | 11 +++---
 MCTG/Model/Managers/MasterManager.cs          | 36 +++++++++++++++++++
 MCTG/Model/User/User.cs                       |  3 --
 12 files changed, 67 insertions(+), 29 deletions(-)
 rename MCTG/ConsoleApp/Menu/{ => Core}/Entry.EntryStep.cs (98%)
 rename MCTG/ConsoleApp/Menu/{ => Core}/Entry.cs (98%)
 rename MCTG/ConsoleApp/Menu/{ => Core}/IMenu.cs (95%)
 rename MCTG/ConsoleApp/Menu/{ => Core}/Menu.cs (95%)
 rename MCTG/ConsoleApp/Menu/{ => Core}/PlainText.cs (96%)
 rename MCTG/ConsoleApp/Menu/{ => Core}/Selector.cs (91%)
 create mode 100644 MCTG/Model/Managers/MasterManager.cs

diff --git a/MCTG/ConsoleApp/Menu/ConnectionMenu.cs b/MCTG/ConsoleApp/Menu/ConnectionMenu.cs
index d4c9949..ef410d2 100644
--- a/MCTG/ConsoleApp/Menu/ConnectionMenu.cs
+++ b/MCTG/ConsoleApp/Menu/ConnectionMenu.cs
@@ -3,7 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using ConsoleApp.Menu.Core;
+
 namespace ConsoleApp.Menu
 {
     internal class ConnectionMenu : Entry
diff --git a/MCTG/ConsoleApp/Menu/Entry.EntryStep.cs b/MCTG/ConsoleApp/Menu/Core/Entry.EntryStep.cs
similarity index 98%
rename from MCTG/ConsoleApp/Menu/Entry.EntryStep.cs
rename to MCTG/ConsoleApp/Menu/Core/Entry.EntryStep.cs
index b58a707..4193cb3 100644
--- a/MCTG/ConsoleApp/Menu/Entry.EntryStep.cs
+++ b/MCTG/ConsoleApp/Menu/Core/Entry.EntryStep.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ConsoleApp.Menu
+namespace ConsoleApp.Menu.Core
 {
     internal abstract partial class Entry
     {
diff --git a/MCTG/ConsoleApp/Menu/Entry.cs b/MCTG/ConsoleApp/Menu/Core/Entry.cs
similarity index 98%
rename from MCTG/ConsoleApp/Menu/Entry.cs
rename to MCTG/ConsoleApp/Menu/Core/Entry.cs
index 3a84fff..c1702d3 100644
--- a/MCTG/ConsoleApp/Menu/Entry.cs
+++ b/MCTG/ConsoleApp/Menu/Core/Entry.cs
@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
-namespace ConsoleApp.Menu
+using ConsoleApp.Menu.Core;
+
+namespace ConsoleApp.Menu.Core
 {
     /// <summary>
     /// Define an Entry menu.
diff --git a/MCTG/ConsoleApp/Menu/IMenu.cs b/MCTG/ConsoleApp/Menu/Core/IMenu.cs
similarity index 95%
rename from MCTG/ConsoleApp/Menu/IMenu.cs
rename to MCTG/ConsoleApp/Menu/Core/IMenu.cs
index 120a387..813d91e 100644
--- a/MCTG/ConsoleApp/Menu/IMenu.cs
+++ b/MCTG/ConsoleApp/Menu/Core/IMenu.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ConsoleApp.Menu
+namespace ConsoleApp.Menu.Core
 {
     /// <summary>
     /// Define a console menu with element selection.
diff --git a/MCTG/ConsoleApp/Menu/Menu.cs b/MCTG/ConsoleApp/Menu/Core/Menu.cs
similarity index 95%
rename from MCTG/ConsoleApp/Menu/Menu.cs
rename to MCTG/ConsoleApp/Menu/Core/Menu.cs
index 68962db..668b1ae 100644
--- a/MCTG/ConsoleApp/Menu/Menu.cs
+++ b/MCTG/ConsoleApp/Menu/Core/Menu.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ConsoleApp.Menu
+namespace ConsoleApp.Menu.Core
 {
     /// <summary>
     /// Define a selection menu.
@@ -44,7 +44,7 @@ namespace ConsoleApp.Menu
             {
                 _currentLine = value;
                 if (_currentLine <= 0) _currentLine = 0;
-                else if (_currentLine >= _selectList.Count) _currentLine = _selectList.Count-1;
+                else if (_currentLine >= _selectList.Count) _currentLine = _selectList.Count - 1;
             }
         }
 
@@ -75,7 +75,7 @@ namespace ConsoleApp.Menu
         /// </summary>
         /// <param name="title">The title of the menu.</param>
         /// <param name="selections">The selections of the menu.</param>
-        protected Menu(string title, params Selector<T>[] selections ) : this(title)
+        protected Menu(string title, params Selector<T>[] selections) : this(title)
         {
             if (selections == null || selections.Length == 0)
             {
diff --git a/MCTG/ConsoleApp/Menu/PlainText.cs b/MCTG/ConsoleApp/Menu/Core/PlainText.cs
similarity index 96%
rename from MCTG/ConsoleApp/Menu/PlainText.cs
rename to MCTG/ConsoleApp/Menu/Core/PlainText.cs
index d5deee1..6439c62 100644
--- a/MCTG/ConsoleApp/Menu/PlainText.cs
+++ b/MCTG/ConsoleApp/Menu/Core/PlainText.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
-namespace ConsoleApp.Menu
+
+namespace ConsoleApp.Menu.Core
 {
     /// <summary>
     /// Define a Plain text menu.
@@ -36,16 +36,16 @@ namespace ConsoleApp.Menu
         public StringBuilder InputStr { get; set; }
 
         public void DisableWriteMode()
-        { 
-            // Plain text does not need to do anything for this.
+        {
+            // Plain text does not need to do anything for this.
         }
         public void EnableWriteMode()
-        { 
-            // Plain text does not need to do anything for this.
+        {
+            // Plain text does not need to do anything for this.
         }
         public void SelectNext()
-        { 
-            // Plain text does not need to do anything for this.
+        {
+            // Plain text does not need to do anything for this.
         }
         public void SelectPrevious()
         {
diff --git a/MCTG/ConsoleApp/Menu/Selector.cs b/MCTG/ConsoleApp/Menu/Core/Selector.cs
similarity index 91%
rename from MCTG/ConsoleApp/Menu/Selector.cs
rename to MCTG/ConsoleApp/Menu/Core/Selector.cs
index f8f71e0..6dce8f0 100644
--- a/MCTG/ConsoleApp/Menu/Selector.cs
+++ b/MCTG/ConsoleApp/Menu/Core/Selector.cs
@@ -7,7 +7,7 @@ using System.Reflection.Emit;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ConsoleApp.Menu
+namespace ConsoleApp.Menu.Core
 {
     /// <summary>
     /// The selector of a menu.
@@ -22,7 +22,8 @@ namespace ConsoleApp.Menu
         /// <summary>
         /// The string that are displayed on the menu.
         /// </summary>
-        public string Line { 
+        public string Line
+        {
             get => _line;
             private set
             {
@@ -57,7 +58,7 @@ namespace ConsoleApp.Menu
         {
             if (other == null) return false;
             if (other == this) return true;
-            return other.Line.Equals(this.Line);
+            return other.Line.Equals(Line);
         }
 
         public override bool Equals(object? obj)
diff --git a/MCTG/ConsoleApp/Menu/MainMenu.cs b/MCTG/ConsoleApp/Menu/MainMenu.cs
index 8dcbb8b..9bdc7ad 100644
--- a/MCTG/ConsoleApp/Menu/MainMenu.cs
+++ b/MCTG/ConsoleApp/Menu/MainMenu.cs
@@ -5,7 +5,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using ConsoleApp.Menu.Core;
+
 namespace ConsoleApp.Menu
 {
     /// <summary>
diff --git a/MCTG/ConsoleApp/Menu/SearcherRecipe.cs b/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
index b7dea49..b3460b8 100644
--- a/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
+++ b/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading.Tasks;
-
+using ConsoleApp.Menu.Core;
 using Model;
 
 namespace ConsoleApp.Menu
diff --git a/MCTG/ConsoleApp/MenuManager.cs b/MCTG/ConsoleApp/MenuManager.cs
index 20cf567..7fb9a70 100644
--- a/MCTG/ConsoleApp/MenuManager.cs
+++ b/MCTG/ConsoleApp/MenuManager.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using ConsoleApp.Menu.Core;
 
 namespace ConsoleApp
 {
@@ -23,7 +24,7 @@ namespace ConsoleApp
         /// <summary>
         /// Each menu called are push in this stack. Then, to return back, we pop this stack to retrive the previous menu.
         /// </summary>
-        public Stack<Menu.IMenu> MenuCallStack { get; set; }
+        public Stack<IMenu> MenuCallStack { get; set; }
         #endregion
 
         #region Constructors
@@ -32,11 +33,11 @@ namespace ConsoleApp
         /// </summary>
         /// <param name="dataManager">The data manager needed by the menus inside.</param>
         /// <param name="firstMenu">The starting menu, the first that will be push on the call stack.</param>
-        public MenuManager(DataManager dataManager, Menu.IMenu firstMenu)
+        public MenuManager(DataManager dataManager, IMenu firstMenu)
         {
             DataManager = dataManager;
 
-            MenuCallStack = new Stack<Menu.IMenu>();
+            MenuCallStack = new Stack<IMenu>();
             MenuCallStack.Push(firstMenu);
         }
 
@@ -55,7 +56,7 @@ namespace ConsoleApp
         public void Loop()
         {
             ConsoleKeyInfo cki;
-            Menu.IMenu menuOnHead;
+            IMenu menuOnHead;
             do
             {
                 menuOnHead = MenuCallStack.Peek();
@@ -72,7 +73,7 @@ namespace ConsoleApp
                         menuOnHead.SelectPrevious();
                         break;
                     case ConsoleKey.Enter:
-                        Menu.IMenu? retMenu = menuOnHead.Return();
+                        IMenu? retMenu = menuOnHead.Return();
                         if (retMenu is null) MenuCallStack.Pop();
                         else MenuCallStack.Push(retMenu);
                         break;
diff --git a/MCTG/Model/Managers/MasterManager.cs b/MCTG/Model/Managers/MasterManager.cs
new file mode 100644
index 0000000..a093e71
--- /dev/null
+++ b/MCTG/Model/Managers/MasterManager.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.Managers
+{
+    public class MasterManager
+    {
+        public static User? CurrentConnectedUser;
+        public static RecipeCollection? Recipes;
+        public static List<User>? Users;
+
+        public DataManager DataMgr { get; private set; }
+
+        public MasterManager(IDataManager dataManager)
+        {
+            DataMgr = new DataManager(dataManager);
+            Recipes = DataMgr.GetRecipes("all recipes");
+            Users = DataMgr.GetUsers();
+            CurrentConnectedUser = null;
+        }
+
+        public bool LogIn(string mail, string password)
+        {
+            if (Users is null)
+                throw new ArgumentNullException();
+
+            User user = (User)(from u in Users
+                               where u.Mail == mail
+                               select u);
+        }
+    }
+}
diff --git a/MCTG/Model/User/User.cs b/MCTG/Model/User/User.cs
index f335472..22ed1ba 100644
--- a/MCTG/Model/User/User.cs
+++ b/MCTG/Model/User/User.cs
@@ -131,7 +131,6 @@ namespace Model
 
         #endregion
 
-
         #region Constructors
 
         /// <summary>
@@ -159,7 +158,5 @@ namespace Model
     
 
         #endregion
-
-
     }
 }

From 96954e6c9472ef54733e5de93644dbd4de3e4685 Mon Sep 17 00:00:00 2001
From: Roxane ROSSETTO <rorossetto>
Date: Wed, 24 May 2023 15:09:13 +0200
Subject: [PATCH 07/23] implementation of an addRecipe

---
 MCTG/Views/AddRecipe.xaml    | 80 ++++++++++++++++++++++++++++++++++++
 MCTG/Views/AddRecipe.xaml.cs | 18 ++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 MCTG/Views/AddRecipe.xaml
 create mode 100644 MCTG/Views/AddRecipe.xaml.cs

diff --git a/MCTG/Views/AddRecipe.xaml b/MCTG/Views/AddRecipe.xaml
new file mode 100644
index 0000000..05d250d
--- /dev/null
+++ b/MCTG/Views/AddRecipe.xaml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Views.AddRecipe"
+             Title="AddRecipe"
+             xmlns:local="clr-namespace:Views">
+    <VerticalStackLayout>
+        <local:MiniHeader
+            TitleMini="Ajouter une recette"
+            NeedReturn="True"
+            HeightRequest="100"/>
+        <Grid ColumnDefinitions="auto, *"
+              RowDefinitions="auto,auto,auto,auto,auto,auto, auto, auto, auto"
+              Margin="50,20,20,20">
+            <Label Text="Titre de la recette :"/>
+            <Entry Placeholder="Saisie du texte de la recette correspondante" 
+                   Grid.Row="1"
+                   Margin="10"/>
+            <Label Text="Type de la recette" Grid.Row="2"/>
+            <CheckBox x:Name="CheckEntree" Grid.Row="3" Margin="10,0,20,0" />
+            <Label Text="Entrée" Grid.Row="3" Margin="40,20"/>
+            <CheckBox x:Name="CheckPlat" Grid.Row="3" Margin="90,0" />
+            <Label Text="Plat" Grid.Row="3" Margin="120,20"/>
+            <CheckBox x:Name="CheckDessert" Grid.Row="3" Margin="155,0" />
+            <Label Text="Dessert" Grid.Row="3" Margin="185,20"/>
+            
+            <Label Text="Type de priorité" Grid.Row="4"/>
+                <Grid BackgroundColor="#D1E8E2"
+                                      MinimumHeightRequest="100"
+                                      MaximumWidthRequest="300"
+                                      Padding="20"
+                                      Grid.Row="5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Label Text="Recettes économiques" Grid.Row="0" Padding="5,0,0,0"/>
+                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="1" />
+                    <Label Text="Recettes rapides" Grid.Row="2"/>
+                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="3" />
+                    <Label Text="Recettes simples" Grid.Row="4"/>
+                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="5" />
+                    <Label Text="Recettes légères" Grid.Row="6"/>
+                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="7" />
+                    <Label Text="Recettes gourmandes" Grid.Row="8"/>
+                </Grid>
+            <Label Text="Saisir les étapes de la recette " Grid.Row="6" Margin="0,15"/>
+            <Entry Placeholder="Etape de la recette" Grid.Row="7" Margin="12,0"/>
+            <HorizontalStackLayout Grid.Row="8" Margin="20">
+                <Button WidthRequest="100" Text="Précédent" TextColor="Black" Margin="20,0,20,0"/>
+                <Button WidthRequest="100" Text="Ajouter" TextColor="Black" Margin="20,0"/>
+            </HorizontalStackLayout>
+            <Label Text="Saisir les ingrédients de la recette" Grid.Row="6" Grid.Column="1" Margin="50,15"/>
+            <HorizontalStackLayout Grid.Row="7" Grid.Column="1">
+                <Entry Placeholder="Nom de l'ingrédient"  Margin="12,0,50,0" WidthRequest="500"/>
+                <Picker Title="Unité" >
+                    
+                </Picker>
+            </HorizontalStackLayout>
+            <HorizontalStackLayout Grid.Row="8" Grid.Column="1" Margin="20">
+                <Button WidthRequest="100" Text="Précédent" TextColor="Black" Margin="20,0,20,0"/>
+                <Button WidthRequest="100" Text="Ajouter" TextColor="Black" Margin="20,0"/>
+            </HorizontalStackLayout>
+
+
+
+        </Grid>
+        
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/MCTG/Views/AddRecipe.xaml.cs b/MCTG/Views/AddRecipe.xaml.cs
new file mode 100644
index 0000000..aaeba8d
--- /dev/null
+++ b/MCTG/Views/AddRecipe.xaml.cs
@@ -0,0 +1,18 @@
+using CommunityToolkit.Maui.Behaviors;
+using DataPersistence;
+using Model;
+using System.Diagnostics;
+
+namespace Views
+{
+    public partial class AddRecipe : ContentPage
+    {
+        public DataManager DataMgr => (App.Current as App).DataMgr;
+        public Ingredient ingredient;
+
+        public AddRecipe()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file

From 34de5e0b851dc98357a5b8d05004e167862af1e1 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Wed, 24 May 2023 15:47:58 +0200
Subject: [PATCH 08/23] done first ver. of MasterManager

---
 MCTG/ConsoleApp/Menu/MainMenu.cs     | 46 ++++++++++++++--------------
 MCTG/Model/Managers/MasterManager.cs | 45 +++++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/MCTG/ConsoleApp/Menu/MainMenu.cs b/MCTG/ConsoleApp/Menu/MainMenu.cs
index 9bdc7ad..5f32956 100644
--- a/MCTG/ConsoleApp/Menu/MainMenu.cs
+++ b/MCTG/ConsoleApp/Menu/MainMenu.cs
@@ -1,25 +1,25 @@
-using Model;
-using DataPersistence;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Model;
+using DataPersistence;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using ConsoleApp.Menu.Core;
 
-namespace ConsoleApp.Menu
-{
-    /// <summary>
-    /// Main menu of the console. Contain the first interaction menus.
-    /// </summary>
-    internal class MainMenu : Menu<IMenu>
-    {
-        public MainMenu(DataManager dataMgr)
-            : base("Main menu",
-                  new Selector<IMenu>(
-                      new SearcherRecipe(new RecipeCollection("search", dataMgr.Data[nameof(Recipe)].Cast<Recipe>().ToArray())), "Recipe search"),
-                  new Selector<IMenu>(
-                      new ConnectionMenu(), "Connection"))
-        { }
-    }
-}
+namespace ConsoleApp.Menu
+{
+    /// <summary>
+    /// Main menu of the console. Contain the first interaction menus.
+    /// </summary>
+    internal class MainMenu : Menu<IMenu>
+    {
+        public MainMenu(DataManager dataMgr)
+            : base("Main menu",
+                  new Selector<IMenu>(
+                      new SearcherRecipe(new RecipeCollection("search", dataMgr.Data[nameof(Recipe)].Cast<Recipe>().ToArray())), "Recipe search"),
+                  new Selector<IMenu>(
+                      new ConnectionMenu(), "Connection"))
+        { }
+    }
+}
diff --git a/MCTG/Model/Managers/MasterManager.cs b/MCTG/Model/Managers/MasterManager.cs
index a093e71..9f39d9f 100644
--- a/MCTG/Model/Managers/MasterManager.cs
+++ b/MCTG/Model/Managers/MasterManager.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -23,14 +24,52 @@ namespace Model.Managers
             CurrentConnectedUser = null;
         }
 
-        public bool LogIn(string mail, string password)
+        public bool Login(string mail, string password)
         {
-            if (Users is null)
-                throw new ArgumentNullException();
+            if (Users is null || Users.Count == 0)
+                throw new ArgumentNullException("There is no users registred.");
 
             User user = (User)(from u in Users
                                where u.Mail == mail
                                select u);
+
+            if (user is null || !user.psswMgr.VerifyPassword(user.Password, password))
+                return false;
+
+            CurrentConnectedUser = user;
+            return true;
+        }
+
+        public bool Logout()
+        {
+            if (CurrentConnectedUser is null)
+                return false;
+
+            CurrentConnectedUser = null;
+            return true;
+        }
+
+        public bool Register(User newuser)
+        {
+            try
+            {
+                User user = newuser;
+                DataMgr.Data[nameof(User)].Add(user);
+                Users = DataMgr.GetUsers();
+            }
+            catch (ArgumentException e)
+            {
+                Debug.WriteLine(e.Message);
+                return false;
+            }
+
+            return true;
+        }
+
+        public void AddRecipe(Recipe recipe)
+        {
+            DataMgr.Data[nameof(Recipe)].Add(recipe);
+            Recipes = DataMgr.GetRecipes();
         }
     }
 }

From 04192a2ef2691c5296f230a0cbc9757faf87ec14 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Wed, 24 May 2023 16:34:59 +0200
Subject: [PATCH 09/23] new main menu working

---
 MCTG/ConsoleApp/Menu/MainMenu.cs     | 28 +++++++++++++++-----
 MCTG/ConsoleApp/MenuManager.cs       | 13 +++++-----
 MCTG/ConsoleApp/Program.cs           | 39 +++++++---------------------
 MCTG/Model/Managers/MasterManager.cs |  3 +--
 4 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/MCTG/ConsoleApp/Menu/MainMenu.cs b/MCTG/ConsoleApp/Menu/MainMenu.cs
index 5f32956..bdd75db 100644
--- a/MCTG/ConsoleApp/Menu/MainMenu.cs
+++ b/MCTG/ConsoleApp/Menu/MainMenu.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using ConsoleApp.Menu.Core;
+using Model.Managers;
 
 namespace ConsoleApp.Menu
 {
@@ -14,12 +15,25 @@ namespace ConsoleApp.Menu
     /// </summary>
     internal class MainMenu : Menu<IMenu>
     {
-        public MainMenu(DataManager dataMgr)
-            : base("Main menu",
-                  new Selector<IMenu>(
-                      new SearcherRecipe(new RecipeCollection("search", dataMgr.Data[nameof(Recipe)].Cast<Recipe>().ToArray())), "Recipe search"),
-                  new Selector<IMenu>(
-                      new ConnectionMenu(), "Connection"))
-        { }
+        public MainMenu(MasterManager masterManager)
+            : base("Main menu")
+        {
+            _allSelectors.Add(new Selector<IMenu>(
+                      new SearcherRecipe(masterManager.DataMgr.GetRecipes("search")), "Recipe search"));
+
+            _allSelectors.Add(MasterManager.CurrentConnectedUser is null ?
+                  new Selector<IMenu>(new ConnectionMenu(), "Connection")
+                : new Selector<IMenu>(new PlainText("User profile"), "User profile"));
+        }
+
+        protected override List<Selector<IMenu>> SearchInSelection()
+        {
+            List<Selector<IMenu>> selectors = base.SearchInSelection();
+
+            if (MasterManager.CurrentConnectedUser == null)
+                return selectors.Except(selectors.Where(s => s.Line == "User profile")).ToList();
+            else
+                return selectors.Except(selectors.Where(s => s.Line == "Connection")).ToList();
+        }
     }
 }
diff --git a/MCTG/ConsoleApp/MenuManager.cs b/MCTG/ConsoleApp/MenuManager.cs
index 7fb9a70..4d34b2e 100644
--- a/MCTG/ConsoleApp/MenuManager.cs
+++ b/MCTG/ConsoleApp/MenuManager.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using ConsoleApp.Menu.Core;
+using Model.Managers;
 
 namespace ConsoleApp
 {
@@ -19,7 +20,7 @@ namespace ConsoleApp
         /// <summary>
         /// The manager that contains usefull data taken from the model.
         /// </summary>
-        public DataManager DataManager { get; private set; }
+        public MasterManager MasterMgr { get; private set; }
 
         /// <summary>
         /// Each menu called are push in this stack. Then, to return back, we pop this stack to retrive the previous menu.
@@ -31,11 +32,11 @@ namespace ConsoleApp
         /// <summary>
         /// Constructor of the MenuManager class. This constructor allows you to give the first menu of the call stack, wich is usefull for testing.
         /// </summary>
-        /// <param name="dataManager">The data manager needed by the menus inside.</param>
+        /// <param name="masterManager">The data manager needed by the menus inside.</param>
         /// <param name="firstMenu">The starting menu, the first that will be push on the call stack.</param>
-        public MenuManager(DataManager dataManager, IMenu firstMenu)
+        public MenuManager(MasterManager masterManager, IMenu firstMenu)
         {
-            DataManager = dataManager;
+            MasterMgr = masterManager;
 
             MenuCallStack = new Stack<IMenu>();
             MenuCallStack.Push(firstMenu);
@@ -44,8 +45,8 @@ namespace ConsoleApp
         /// <summary>
         /// Constructor of the MenuManager class.
         /// </summary>
-        /// <param name="dataManager">The data manager needed by the menus inside.</param>
-        public MenuManager(DataManager dataManager) : this(dataManager, new MainMenu(dataManager))
+        /// <param name="masterManager">The data manager needed by the menus inside.</param>
+        public MenuManager(MasterManager masterManager) : this(masterManager, new MainMenu(masterManager))
         { }
         #endregion
 
diff --git a/MCTG/ConsoleApp/Program.cs b/MCTG/ConsoleApp/Program.cs
index 5094043..1a4e3b9 100644
--- a/MCTG/ConsoleApp/Program.cs
+++ b/MCTG/ConsoleApp/Program.cs
@@ -4,43 +4,22 @@ using ConsoleApp.Menu;
 using DataPersistence;
 using System.Linq;
 using System.Text;
-
-
+using Model.Managers;
 
 Console.WriteLine("Hello, World!\n\n");
 
-DataManager dataMgr = new DataManager(new Stubs());
-//DataManager dataMgr = new DataManager(new DataContractXML());
-//DataManager dataMgr = new DataManager(new DataContractJSON());
-
-dataMgr.Serializer = new DataContractXML();
-//dataMgr.Serializer = new DataContractJSON();
-
-// /!\ here is an absolute path I put for testing purpose. It will only work on my computer so don't forget to change it whene you test.
-//dataMgr.Export(rc[2], "C:\\Users\\alex6\\Downloads\\recipe2.json");
-//dataMgr.Import<Recipe>("C:\\Users\\alex6\\Downloads\\recipe2.json");
+MasterManager masterMgr = new MasterManager(new Stubs());
+//MasterMgr masterMgr = new MasterMgr(new DataContractXML());
+//MasterMgr masterMgr = new MasterMgr(new DataContractJSON());
 
-PasswordManager passwordManager = new PasswordManager();
-//RecipeCollection rc = new RecipeCollection("All recipes", dataMgr.Data[nameof(Recipe)].Cast<Recipe>().ToArray());
-RecipeCollection rc = dataMgr.GetRecipes("All recipes");
-//RecipeCollection rc = new RecipeCollection("All recipes", dataMgr.GetFromData<Recipe>().ToArray());
+masterMgr.DataMgr.Serializer = new DataContractXML();
+//masterMgr.Serializer = new DataContractJSON();
 
-User user = dataMgr.GetUsers().Last();
-
-//rc[0].AddReview(new Review(user, 1, "bonne recette !1"));
-//rc[0].AddReview(new Review(user, 1, "bonne recette !2"));
-//rc[0].AddReview(new Review(user, 4, "bonne recette !3"));
-//rc[0].AddReview(new Review(user, 5, "bonne recette !4"));
-//rc[0].AddReview(new Review(user, 3, "bonne recette !5"));
-//rc[0].AddReview(new Review(user, 2, "bonne recette !6"));
-//rc[0].AddReview(new Review(user, 2, "peut etre pas ducoup !"));
-//rc[1].AddReview(new Review(user, 2, "Mais celle-ci oui !"));
-
-dataMgr.Save();
-
-MenuManager menuMgr = new MenuManager(dataMgr);
+masterMgr.DataMgr.Save();
 
+MenuManager menuMgr = new MenuManager(masterMgr);
 menuMgr.Loop();
 
+
 Console.ReadKey();
 
diff --git a/MCTG/Model/Managers/MasterManager.cs b/MCTG/Model/Managers/MasterManager.cs
index 9f39d9f..edb4090 100644
--- a/MCTG/Model/Managers/MasterManager.cs
+++ b/MCTG/Model/Managers/MasterManager.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -19,8 +20,6 @@ namespace Model.Managers
         public MasterManager(IDataManager dataManager)
         {
             DataMgr = new DataManager(dataManager);
-            Recipes = DataMgr.GetRecipes("all recipes");
-            Users = DataMgr.GetUsers();
             CurrentConnectedUser = null;
         }
 

From 611657858581656bf6cfab0641e337055cfa84c5 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Wed, 24 May 2023 17:10:35 +0200
Subject: [PATCH 10/23] connection 1st ver. + view profile 1st ver. - error on
 login

---
 MCTG/ConsoleApp/Menu/ConnectionMenu.cs       |  71 ++++--
 MCTG/ConsoleApp/Menu/Core/Entry.EntryStep.cs |   8 +-
 MCTG/ConsoleApp/Menu/Core/Entry.cs           | 240 ++++++++++---------
 MCTG/ConsoleApp/Menu/MainMenu.cs             |   4 +-
 MCTG/ConsoleApp/Menu/ProfileMenu.cs          |  24 ++
 MCTG/ConsoleApp/Program.cs                   |   4 +-
 6 files changed, 205 insertions(+), 146 deletions(-)
 create mode 100644 MCTG/ConsoleApp/Menu/ProfileMenu.cs

diff --git a/MCTG/ConsoleApp/Menu/ConnectionMenu.cs b/MCTG/ConsoleApp/Menu/ConnectionMenu.cs
index ef410d2..30759be 100644
--- a/MCTG/ConsoleApp/Menu/ConnectionMenu.cs
+++ b/MCTG/ConsoleApp/Menu/ConnectionMenu.cs
@@ -1,25 +1,50 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using ConsoleApp.Menu.Core;
+using Model.Managers;
 
-namespace ConsoleApp.Menu
-{
-    internal class ConnectionMenu : Entry
-    {
-        public ConnectionMenu()
-            : base("Connection",
-                new Entry.EntryStep("Username: ", typeof(string)),
-                new Entry.EntryStep("Password: ", typeof(string)))
-        { }
-
-        public override IMenu? Return()
-        {
-            string username = _selectList[0].Item.Input;
-            string password = _selectList[1].Item.Input;
-            return new PlainText($"User: {username} connected with password: {password}");
-        }
-    }
-}
+namespace ConsoleApp.Menu
+{
+    internal class ConnectionMenu : Entry
+    {
+        private MasterManager _masterMgr;
+        private bool _wrongInput = false;
+
+        public ConnectionMenu(MasterManager masterManager)
+            : base("Connection",
+                new Entry.EntryStep("Mail: ", typeof(string)),
+                new Entry.EntryStep("Password: ", typeof(string), true))
+        {
+            _masterMgr = masterManager;
+        }
+
+        public override void Display()
+        {
+            base.Display();
+
+            if (_wrongInput)
+            {
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine("Wrong input...");
+                Console.ResetColor();
+            }
+        }
+
+        public override IMenu? Return()
+        {
+            string mail = _selectList[0].Item.Input;
+            string password = _selectList[1].Item.Input;
+
+            if (!_masterMgr.Login(mail, password))
+            {
+                _wrongInput = true;
+                return this;
+            }
+            else
+                return null;
+        }
+    }
+}
diff --git a/MCTG/ConsoleApp/Menu/Core/Entry.EntryStep.cs b/MCTG/ConsoleApp/Menu/Core/Entry.EntryStep.cs
index 4193cb3..c4a57fb 100644
--- a/MCTG/ConsoleApp/Menu/Core/Entry.EntryStep.cs
+++ b/MCTG/ConsoleApp/Menu/Core/Entry.EntryStep.cs
@@ -25,6 +25,11 @@ namespace ConsoleApp.Menu.Core
             /// Contain the input gave by the menu.
             /// </summary>
             public string Input { get; internal set; }
+
+            /// <summary>
+            /// Define whether the input need to be hidden. Useful for password.
+            /// </summary>
+            public bool Hidden { get; private set; }
             #endregion
 
             #region Constructors
@@ -33,11 +38,12 @@ namespace ConsoleApp.Menu.Core
             /// </summary>
             /// <param name="description">The text generally placed before the input in the menu.</param>
             /// <param name="type">The type of the returned input.</param>
-            public EntryStep(string description, Type type)
+            public EntryStep(string description, Type type, bool hidden = false)
             {
                 Description = description;
                 Input = "";
                 _entryType = type;
+                Hidden = hidden;
             }
             #endregion
 
diff --git a/MCTG/ConsoleApp/Menu/Core/Entry.cs b/MCTG/ConsoleApp/Menu/Core/Entry.cs
index c1702d3..b2f816a 100644
--- a/MCTG/ConsoleApp/Menu/Core/Entry.cs
+++ b/MCTG/ConsoleApp/Menu/Core/Entry.cs
@@ -1,120 +1,124 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using ConsoleApp.Menu.Core;
 
-namespace ConsoleApp.Menu.Core
-{
-    /// <summary>
-    /// Define an Entry menu.
-    /// <br/>It allows you to navigate through the entries and completes them with a console input.
-    /// </summary>
-    internal abstract partial class Entry : Menu<Entry.EntryStep>
-    {
-        #region Attributes & Properties
-        private List<EntryStep> _steps;
-        #endregion
-
-        #region Constructors
-        /// <summary>
-        /// Constructor of the entry menu, based on the Menu constructor.
-        /// </summary>
-        /// <param name="title">The title of this menu.</param>
-        /// <param name="entrySteps">All the entries of this menu.</param>
-        protected Entry(string title, params EntryStep[] entrySteps) : base(title)
-        {
-            _steps = entrySteps.ToList();
-            _allSelectors = ConvertEntryStepsInSelector();
-            _selectList = _allSelectors;
-        }
-        #endregion
-
-        #region Methods
-        private List<Selector<EntryStep>> ConvertEntryStepsInSelector()
-        {
-            List<Selector<EntryStep>> newSelectors = new List<Selector<EntryStep>>();
-            foreach (EntryStep step in _steps)
-            {
-                newSelectors.Add(new Selector<EntryStep>(step, step.Description));
-            }
-            return newSelectors;
-        }
-        #endregion
-
-        #region IMenu implementation
-        public override void WriteMenuMode(ConsoleKeyInfo cki)
-        {
-            if (!WriteMode && cki.Key == ConsoleKey.R)
-            {
-                EnableWriteMode();
-                return;
-            }
-
-            if (WriteMode)
-            {
-                if (cki.Key == ConsoleKey.Escape)
-                {
-                    if (CurrentSelected is null)
-                        throw new ArgumentNullException("CurrentSelected");
-
-                    CurrentSelected.Input = InputStr.ToString();
-                    DisableWriteMode();
-                    InputStr.Clear();
-                    return;
-                }
-
-                if (cki.Key == ConsoleKey.Backspace && InputStr.Length > 0)
-                {
-                    InputStr.Remove(InputStr.Length - 1, 1);
-                    return;
-                }
-
-                InputStr.Append(cki.KeyChar);
-            }
-        }
-
-        public override void Update()
-        {
-            if (_selectList.Count == 0)
-            {
-                CurrentSelected = default;
-                return;
-            }
-            CurrentSelected = _selectList[CurrentLine].Item;
-        }
-
-        public override void Display()
-        {
-            _screenDisplay.Clear();
-            Console.Clear();
-
-            _screenDisplay.AppendLine($"[ {Title} ]");
-            _screenDisplay.AppendLine("-------------------------------------------");
-
-            for (int i = 0; i < _selectList.Count; i++)
-            {
-                if (CurrentLine == i)
-                    _screenDisplay.Append($">  ");
-                else
-                    _screenDisplay.Append($"   ");
-
-                _screenDisplay.Append($"{_selectList[i].Line} {_selectList[i].Item.Input}");
-
-                if (CurrentLine == i && WriteMode)
-                    _screenDisplay.Append(InputStr);
-
-                _screenDisplay.AppendLine();
-            }
-
-            if (_selectList.Count == 0)
-                _screenDisplay.AppendLine("Empty...");
-
-            _screenDisplay.AppendLine(
-                "\n\nHint:\n^:previous, v:next, <:ret, -enter-:return, r:write, -escape-:exit search mode");
-            Console.WriteLine(_screenDisplay);
-        }
-        #endregion
-    }
-}
+namespace ConsoleApp.Menu.Core
+{
+    /// <summary>
+    /// Define an Entry menu.
+    /// <br/>It allows you to navigate through the entries and completes them with a console input.
+    /// </summary>
+    internal abstract partial class Entry : Menu<Entry.EntryStep>
+    {
+        #region Attributes & Properties
+        private List<EntryStep> _steps;
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Constructor of the entry menu, based on the Menu constructor.
+        /// </summary>
+        /// <param name="title">The title of this menu.</param>
+        /// <param name="entrySteps">All the entries of this menu.</param>
+        protected Entry(string title, params EntryStep[] entrySteps)
+            : base(title)
+        {
+            _steps = entrySteps.ToList();
+            _allSelectors = ConvertEntryStepsInSelector();
+            _selectList = _allSelectors;
+        }
+        #endregion
+
+        #region Methods
+        private List<Selector<EntryStep>> ConvertEntryStepsInSelector()
+        {
+            List<Selector<EntryStep>> newSelectors = new List<Selector<EntryStep>>();
+            foreach (EntryStep step in _steps)
+            {
+                newSelectors.Add(new Selector<EntryStep>(step, step.Description));
+            }
+            return newSelectors;
+        }
+        #endregion
+
+        #region IMenu implementation
+        public override void WriteMenuMode(ConsoleKeyInfo cki)
+        {
+            if (!WriteMode && cki.Key == ConsoleKey.R)
+            {
+                EnableWriteMode();
+                return;
+            }
+
+            if (WriteMode)
+            {
+                if (cki.Key == ConsoleKey.Escape)
+                {
+                    if (CurrentSelected is null)
+                        throw new ArgumentNullException("CurrentSelected");
+
+                    CurrentSelected.Input = InputStr.ToString();
+                    DisableWriteMode();
+                    InputStr.Clear();
+                    return;
+                }
+
+                if (cki.Key == ConsoleKey.Backspace && InputStr.Length > 0)
+                {
+                    InputStr.Remove(InputStr.Length - 1, 1);
+                    return;
+                }
+
+                if (CurrentSelected is not null && CurrentSelected.Hidden)
+                    InputStr.Append('*');
+                else
+                    InputStr.Append(cki.KeyChar);
+            }
+        }
+
+        public override void Update()
+        {
+            if (_selectList.Count == 0)
+            {
+                CurrentSelected = default;
+                return;
+            }
+            CurrentSelected = _selectList[CurrentLine].Item;
+        }
+
+        public override void Display()
+        {
+            _screenDisplay.Clear();
+            Console.Clear();
+
+            _screenDisplay.AppendLine($"[ {Title} ]");
+            _screenDisplay.AppendLine("-------------------------------------------");
+
+            for (int i = 0; i < _selectList.Count; i++)
+            {
+                if (CurrentLine == i)
+                    _screenDisplay.Append($">  ");
+                else
+                    _screenDisplay.Append($"   ");
+
+                _screenDisplay.Append($"{_selectList[i].Line} {_selectList[i].Item.Input}");
+
+                if (CurrentLine == i && WriteMode)
+                    _screenDisplay.Append(InputStr);
+
+                _screenDisplay.AppendLine();
+            }
+
+            if (_selectList.Count == 0)
+                _screenDisplay.AppendLine("Empty...");
+
+            _screenDisplay.AppendLine(
+                "\n\nHint:\n^:previous, v:next, <:ret, -enter-:return, r:write, -escape-:exit search mode");
+            Console.WriteLine(_screenDisplay);
+        }
+        #endregion
+    }
+}
diff --git a/MCTG/ConsoleApp/Menu/MainMenu.cs b/MCTG/ConsoleApp/Menu/MainMenu.cs
index bdd75db..1800670 100644
--- a/MCTG/ConsoleApp/Menu/MainMenu.cs
+++ b/MCTG/ConsoleApp/Menu/MainMenu.cs
@@ -22,8 +22,8 @@ namespace ConsoleApp.Menu
                       new SearcherRecipe(masterManager.DataMgr.GetRecipes("search")), "Recipe search"));
 
             _allSelectors.Add(MasterManager.CurrentConnectedUser is null ?
-                  new Selector<IMenu>(new ConnectionMenu(), "Connection")
-                : new Selector<IMenu>(new PlainText("User profile"), "User profile"));
+                  new Selector<IMenu>(new ConnectionMenu(masterManager), "Connection")
+                : new Selector<IMenu>(new ProfileMenu(masterManager), "User profile"));
         }
 
         protected override List<Selector<IMenu>> SearchInSelection()
diff --git a/MCTG/ConsoleApp/Menu/ProfileMenu.cs b/MCTG/ConsoleApp/Menu/ProfileMenu.cs
new file mode 100644
index 0000000..5e0d8fa
--- /dev/null
+++ b/MCTG/ConsoleApp/Menu/ProfileMenu.cs
@@ -0,0 +1,24 @@
+using ConsoleApp.Menu.Core;
+using Model.Managers;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleApp.Menu
+{
+    internal class ProfileMenu : Menu<IMenu>
+    {
+        public ProfileMenu(MasterManager masterManager)
+            : base("Profile")
+        {
+            _allSelectors.Add(new Selector<IMenu>(
+                new SearcherRecipe(new RecipeCollection("My recipes",
+                    masterManager.DataMgr.GetRecipes().Where(r => r.Author == MasterManager.CurrentConnectedUser).ToArray())),
+                "My recipes"));
+
+        }
+    }
+}
diff --git a/MCTG/ConsoleApp/Program.cs b/MCTG/ConsoleApp/Program.cs
index 1a4e3b9..c7937ca 100644
--- a/MCTG/ConsoleApp/Program.cs
+++ b/MCTG/ConsoleApp/Program.cs
@@ -9,8 +9,8 @@ using Model.Managers;
 Console.WriteLine("Hello, World!\n\n");
 
 MasterManager masterMgr = new MasterManager(new Stubs());
-//MasterMgr masterMgr = new MasterMgr(new DataContractXML());
-//MasterMgr masterMgr = new MasterMgr(new DataContractJSON());
+//_masterMgr masterMgr = new _masterMgr(new DataContractXML());
+//_masterMgr masterMgr = new _masterMgr(new DataContractJSON());
 
 masterMgr.DataMgr.Serializer = new DataContractXML();
 //masterMgr.Serializer = new DataContractJSON();

From 7602d9f789c3d64ba1f67adfe21dec09fab239ff Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Wed, 24 May 2023 17:55:18 +0200
Subject: [PATCH 11/23] fix some bugs, main-connection-searcher is working

---
 MCTG/ConsoleApp/Menu/Core/Entry.cs   | 10 ++++----
 MCTG/ConsoleApp/Menu/MainMenu.cs     |  7 +++---
 MCTG/ConsoleApp/Menu/ProfileMenu.cs  |  9 +++++++-
 MCTG/DataPersistence/Stubs.cs        |  7 ++++++
 MCTG/Model/Managers/MasterManager.cs |  5 ++--
 MCTG/Model/Recipes/Recipe.cs         | 34 +++++++++++++++++++++++-----
 MCTG/Model/Recipes/Review.cs         | 23 +++++++++++--------
 7 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/MCTG/ConsoleApp/Menu/Core/Entry.cs b/MCTG/ConsoleApp/Menu/Core/Entry.cs
index b2f816a..4326133 100644
--- a/MCTG/ConsoleApp/Menu/Core/Entry.cs
+++ b/MCTG/ConsoleApp/Menu/Core/Entry.cs
@@ -72,10 +72,7 @@ namespace ConsoleApp.Menu.Core
                     return;
                 }
 
-                if (CurrentSelected is not null && CurrentSelected.Hidden)
-                    InputStr.Append('*');
-                else
-                    InputStr.Append(cki.KeyChar);
+                InputStr.Append(cki.KeyChar);
             }
         }
 
@@ -100,7 +97,10 @@ namespace ConsoleApp.Menu.Core
             for (int i = 0; i < _selectList.Count; i++)
             {
                 if (CurrentLine == i)
-                    _screenDisplay.Append($">  ");
+                    if (WriteMode)
+                        _screenDisplay.Append($"W  ");
+                    else
+                        _screenDisplay.Append($">  ");
                 else
                     _screenDisplay.Append($"   ");
 
diff --git a/MCTG/ConsoleApp/Menu/MainMenu.cs b/MCTG/ConsoleApp/Menu/MainMenu.cs
index 1800670..6492e44 100644
--- a/MCTG/ConsoleApp/Menu/MainMenu.cs
+++ b/MCTG/ConsoleApp/Menu/MainMenu.cs
@@ -21,9 +21,10 @@ namespace ConsoleApp.Menu
             _allSelectors.Add(new Selector<IMenu>(
                       new SearcherRecipe(masterManager.DataMgr.GetRecipes("search")), "Recipe search"));
 
-            _allSelectors.Add(MasterManager.CurrentConnectedUser is null ?
-                  new Selector<IMenu>(new ConnectionMenu(masterManager), "Connection")
-                : new Selector<IMenu>(new ProfileMenu(masterManager), "User profile"));
+            _allSelectors.Add(
+                      new Selector<IMenu>(new ConnectionMenu(masterManager), "Connection"));
+            _allSelectors.Add(
+                      new Selector<IMenu>(new ProfileMenu(masterManager), "User profile"));
         }
 
         protected override List<Selector<IMenu>> SearchInSelection()
diff --git a/MCTG/ConsoleApp/Menu/ProfileMenu.cs b/MCTG/ConsoleApp/Menu/ProfileMenu.cs
index 5e0d8fa..e576c7e 100644
--- a/MCTG/ConsoleApp/Menu/ProfileMenu.cs
+++ b/MCTG/ConsoleApp/Menu/ProfileMenu.cs
@@ -14,9 +14,16 @@ namespace ConsoleApp.Menu
         public ProfileMenu(MasterManager masterManager)
             : base("Profile")
         {
+            _allSelectors.Add(new Selector<IMenu>(
+                new PlainText($"\nUser: {MasterManager.CurrentConnectedUser}\n\n"
+                            + $"\tMail: {MasterManager.CurrentConnectedUser?.Mail}\n"
+                            + $"\tMail: {MasterManager.CurrentConnectedUser?.Name}\n"
+                            + $"\tMail: {MasterManager.CurrentConnectedUser?.Surname}\n"),
+                "My informations"));
+
             _allSelectors.Add(new Selector<IMenu>(
                 new SearcherRecipe(new RecipeCollection("My recipes",
-                    masterManager.DataMgr.GetRecipes().Where(r => r.Author == MasterManager.CurrentConnectedUser).ToArray())),
+                    masterManager.DataMgr.GetRecipes().Where(r => r.AuthorMail == MasterManager.CurrentConnectedUser?.Mail).ToArray())),
                 "My recipes"));
 
         }
diff --git a/MCTG/DataPersistence/Stubs.cs b/MCTG/DataPersistence/Stubs.cs
index da7378a..4234eb1 100644
--- a/MCTG/DataPersistence/Stubs.cs
+++ b/MCTG/DataPersistence/Stubs.cs
@@ -23,6 +23,7 @@ namespace DataPersistence
                     {
                         new Recipe(
                             title: "Cookies classiques", id: null,
+                            authorMail: "admin@mctg.fr",
                             ingredients: new List<Ingredient>(new[]
                             {
                                 new Ingredient("Patates", new Quantity(23, Unit.unit)),
@@ -34,6 +35,7 @@ namespace DataPersistence
                                 new PreparationStep(2, "Manger.")
                             }),
                         new Recipe(
+                            authorMail: "admin@mctg.fr",
                             title: "Cookies au chocolat", id: null,
                             preparationSteps: new[]
                             {
@@ -43,6 +45,7 @@ namespace DataPersistence
                             }),
                         new Recipe(
                             title: "Gateau nature", id: null,
+                            authorMail: "admin@mctg.fr",
                             preparationSteps: new[]
                             {
                                 new PreparationStep(1, "Achetez les ingrédients."),
@@ -51,6 +54,7 @@ namespace DataPersistence
                             }),
                         new Recipe(
                             title: "Gateau au pommes", id: null,
+                            authorMail: "admin@mctg.fr",
                             preparationSteps: new[]
                             {
                                 new PreparationStep(1, "Achetez les légumes."),
@@ -60,6 +64,7 @@ namespace DataPersistence
                             }),
                         new Recipe(
                             title: "Gateau au chocolat", id: null,
+                            authorMail: "pedrosamigos@hotmail.com",
                             preparationSteps: new[]
                             {
                                 new PreparationStep(1, "Ajouter les oeufs."),
@@ -70,6 +75,7 @@ namespace DataPersistence
                             }),
                         new Recipe(
                             title: "Dinde au jambon", id: null,
+                            authorMail: "pedrosamigos@hotmail.com",
                             preparationSteps: new[]
                             {
                                 new PreparationStep(1, "Faire une cuisson bien sec de la dinde à la poêle"),
@@ -80,6 +86,7 @@ namespace DataPersistence
                             }),
                         new Recipe(
                             title: "Poulet au curry", id: null,
+                            authorMail: "pedrosamigos@hotmail.com",
                             preparationSteps: new[]
                             {
                                 new PreparationStep(1, "Trouvez des épices de curry."),
diff --git a/MCTG/Model/Managers/MasterManager.cs b/MCTG/Model/Managers/MasterManager.cs
index edb4090..e126145 100644
--- a/MCTG/Model/Managers/MasterManager.cs
+++ b/MCTG/Model/Managers/MasterManager.cs
@@ -21,6 +21,7 @@ namespace Model.Managers
         {
             DataMgr = new DataManager(dataManager);
             CurrentConnectedUser = null;
+            Users = DataMgr.GetUsers();
         }
 
         public bool Login(string mail, string password)
@@ -28,9 +29,7 @@ namespace Model.Managers
             if (Users is null || Users.Count == 0)
                 throw new ArgumentNullException("There is no users registred.");
 
-            User user = (User)(from u in Users
-                               where u.Mail == mail
-                               select u);
+            User? user = Users.Find(u => u.Mail == mail);
 
             if (user is null || !user.psswMgr.VerifyPassword(user.Password, password))
                 return false;
diff --git a/MCTG/Model/Recipes/Recipe.cs b/MCTG/Model/Recipes/Recipe.cs
index 472f438..2f1906f 100644
--- a/MCTG/Model/Recipes/Recipe.cs
+++ b/MCTG/Model/Recipes/Recipe.cs
@@ -32,10 +32,10 @@ namespace Model
         public List<Review> Reviews { get; private set; }
 
         /// <summary>
-        /// Author of the recipe.
+        /// AuthorMail's mail of the recipe.
         /// </summary>
-        [DataMember(Name = "author")]
-        public User? Author { get; private set; }
+        [DataMember(Name = "authorMail")]
+        public string? AuthorMail { get; private set; }
 
         /// <summary>
         /// The Title of the recipe. <br/>
@@ -75,7 +75,7 @@ namespace Model
         /// <param _name="reviews">Thr list of reviews.</param>
         /// <param _name="ingredients">Thr list of ingredients.</param>
         /// <param _name="preparationSteps">The steps of the preparation of the meal</param>
-        public Recipe(string title, int? id, User? author,
+        public Recipe(string title, int? id, string? authorMail,
                       List<Review> reviews, List<Ingredient> ingredients,
                       params PreparationStep[] preparationSteps)
         {
@@ -83,7 +83,7 @@ namespace Model
             PreparationSteps = new List<PreparationStep>(preparationSteps);
             Ingredients = ingredients;
             Reviews = reviews;
-            Author = author;
+            AuthorMail = authorMail;
 
             if (id == null)
             {
@@ -137,6 +137,28 @@ namespace Model
             : this(title, id, null, new List<Review>(), ingredients, preparationSteps)
         {
         }
+
+        /// <summary>
+        /// <inheritdoc cref="Recipe.Recipe(string, int?, List{Review}, PreparationStep[])"/>
+        /// </summary>
+        /// <param _name="title">The title of the recipe.</param>
+        /// <param _name="id">The id of the recipe. If not given, get a new id.</param>
+        /// <param _name="preparationSteps">The steps of the preparation of the meal.</param>
+        public Recipe(string title, int? id, string? authorMail, List<Ingredient> ingredients, params PreparationStep[] preparationSteps)
+            : this(title, id, authorMail, new List<Review>(), ingredients, preparationSteps)
+        {
+        }
+
+        /// <summary>
+        /// <inheritdoc cref="Recipe.Recipe(string, int?, List{Review}, PreparationStep[])"/>
+        /// </summary>
+        /// <param _name="title">The title of the recipe.</param>
+        /// <param _name="id">The id of the recipe. If not given, get a new id.</param>
+        /// <param _name="preparationSteps">The steps of the preparation of the meal.</param>
+        public Recipe(string title, int? id, string? authorMail, params PreparationStep[] preparationSteps)
+            : this(title, id, authorMail, new List<Review>(), new List<Ingredient>(), preparationSteps)
+        {
+        }
         #endregion
 
         #region Methods
@@ -211,7 +233,7 @@ namespace Model
                 sb.AppendLine(review.ToString());
             }
             sb.AppendLine();
-            sb.AppendLine($"Posted by: {Author?.ToString()}");
+            sb.AppendLine($"Posted by: {AuthorMail?.ToString()}");
             return sb.ToString();
         }
         #endregion
diff --git a/MCTG/Model/Recipes/Review.cs b/MCTG/Model/Recipes/Review.cs
index d560d23..961a80f 100644
--- a/MCTG/Model/Recipes/Review.cs
+++ b/MCTG/Model/Recipes/Review.cs
@@ -1,4 +1,5 @@
-using System;
+using Model.Managers;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
@@ -21,8 +22,8 @@ namespace Model
         [DataMember(Name = "id")]
         public int Id { get; init; }
 
-        [DataMember(Name = "user")]
-        public User Author { get; private set; }
+        [DataMember(Name = "authorMail")]
+        public string AuthorMail { get; private set; }
 
         public int Stars
         {
@@ -44,7 +45,7 @@ namespace Model
             }
         }
 
-        public Review(User author, int? id, int stars, string content)
+        public Review(string authorMail, int? id, int stars, string content)
         {
             if (id == null)
             {
@@ -55,24 +56,28 @@ namespace Model
             }
             else Id = (int)id;
 
-            Author = author;
+            AuthorMail = authorMail;
             Stars = stars;
             Content = content;
         }
 
-        public Review(User author, int stars, string content)
-            : this(author, null, stars, content)
+        public Review(string authorMail, int stars, string content)
+            : this(authorMail, null, stars, content)
         {
         }
 
         public Review(int stars, string content)
-            : this(new User(), null, stars, content)
+            : this("admin@mctg.fr", null, stars, content)
         {
         }
 
         public override string ToString()
         {
-            return $"{Author.Name} {Author.Surname}: [ {Stars} stars ]\n{Content}";
+            User? user = MasterManager.Users?.Find(u => u.Mail == AuthorMail);
+            if (user is null)
+                return $"{AuthorMail}: [ {Stars} stars ]\n{Content}";
+
+            return $"{user.Name} {user.Surname}: [ {Stars} stars ]\n{Content}";
         }
 
         public bool Equals(Review? other)

From 924d66dbe2d0892e6a255580161f064c27b31768 Mon Sep 17 00:00:00 2001
From: Roxane ROSSETTO <rorossetto>
Date: Thu, 25 May 2023 10:15:15 +0200
Subject: [PATCH 12/23] modification de la recette(ajout image), copie du home
 xaml et cs, binding profil

---
 MCTG/ConsoleApp/Program.cs    |   2 +-
 MCTG/DataPersistence/Stubs.cs |  58 +++++++-----
 MCTG/Model/Recipes/Recipe.cs  |  31 ++++--
 MCTG/Views/AddRecipe.xaml     |  70 +++++++-------
 MCTG/Views/AddRecipe.xaml.cs  |   1 -
 MCTG/Views/App.xaml           |   2 +-
 MCTG/Views/App.xaml.cs        |  43 +++++----
 MCTG/Views/Home.xaml          | 173 +++++++++++++++++++++-------------
 MCTG/Views/Home.xaml.cs       |  17 +++-
 MCTG/Views/MyProfil.xaml      |  12 +--
 MCTG/Views/MyProfil.xaml.cs   |  14 +--
 11 files changed, 247 insertions(+), 176 deletions(-)

diff --git a/MCTG/ConsoleApp/Program.cs b/MCTG/ConsoleApp/Program.cs
index ead495b..7d068d6 100644
--- a/MCTG/ConsoleApp/Program.cs
+++ b/MCTG/ConsoleApp/Program.cs
@@ -25,7 +25,7 @@ dataMgr.Serializer = new DataContractXML();
 //dataMgr.Import<Recipe>("C:\\Users\\alex6\\Downloads\\recipe2.json");
 
 PasswordManager passwordManager = new PasswordManager();
-RecipeCollection rc = new RecipeCollection("All recipes", dataMgr.Data[nameof(Recipe)].Cast<Recipe>().ToArray());
+//RecipeCollection rc = new RecipeCollection("All recipes", dataMgr.Data[nameof(Recipe)].Cast<Recipe>().ToArray());
 
 User user = dataMgr.Data[nameof(User)].Cast<User>().Last();
 
diff --git a/MCTG/DataPersistence/Stubs.cs b/MCTG/DataPersistence/Stubs.cs
index 2b32fec..177672d 100644
--- a/MCTG/DataPersistence/Stubs.cs
+++ b/MCTG/DataPersistence/Stubs.cs
@@ -23,14 +23,18 @@ namespace DataPersistence
                     new List<object>(new[]
                     {
                         new Recipe(
-                            title: "Cookies classiques", id: null,
+                            title: "Cookies classiques",
+                            picture : "room_service_icon.png",
+                            id: null,
                             preparationSteps: new[]
                             {
                                 new PreparationStep(1, "Faire cuire."),
                                 new PreparationStep(2, "Manger.")
                             }),
                         new Recipe(
-                            title: "Cookies au chocolat", id: null,
+                            title: "Cookies au chocolat",
+                            picture : "",
+                            id: null,
                             preparationSteps: new[]
                             {
                                 new PreparationStep(1, "Moulinez la pâte."),
@@ -38,34 +42,39 @@ namespace DataPersistence
                                 new PreparationStep(3, "Sortir du four et mettre dans un plat.")
                             }),
                         new Recipe(
-                            title: "Gateau nature", id: null,
+                            title: "Gateau nature",
+                            picture : "dotnet_bot.svg",
+                            id: null,
                             preparationSteps: new[]
                             {
                                 new PreparationStep(1, "Achetez les ingrédients."),
                                 new PreparationStep(2, "Préparez le matériel. Ustensiles et tout."),
                                 new PreparationStep(3, "Pleurez.")
                             }),
-                        new Recipe(
-                            title: "Gateau au pommes", id: null,
+                         new Recipe(
+                            title: "Gateau nature",
+                            picture : "dotnet_bot.svg",
+                            id: null,
                             preparationSteps: new[]
                             {
-                                new PreparationStep(1, "Achetez les légumes."),
-                                new PreparationStep(2, "Préparez le plat. Ustensiles et préchauffez le four."),
-                                new PreparationStep(3, "Coupez les pommes en morceaux et disposez-les sur le plat."),
-                                new PreparationStep(4, "Mettez enfin le plat au four, puis une fois cuit, dégustez !")
+                                new PreparationStep(1, "Achetez les ingrédients."),
+                                new PreparationStep(2, "Préparez le matériel. Ustensiles et tout."),
+                                new PreparationStep(3, "Pleurez.")
                             }),
-                        new Recipe(
-                            title: "Gateau au chocolat", id: null,
+                         new Recipe(
+                            title: "Gateau nature",
+                            picture : "dotnet_bot.svg",
+                            id: null,
                             preparationSteps: new[]
                             {
-                                new PreparationStep(1, "Ajouter les oeufs."),
-                                new PreparationStep(2, "Ajouter la farine."),
-                                new PreparationStep(3, "Ajouter 100g de chocolat fondu."),
-                                new PreparationStep(4, "Mélanger le tout."),
-                                new PreparationStep(5, "Faire cuire 45h au four traditionnel.")
+                                new PreparationStep(1, "Achetez les ingrédients."),
+                                new PreparationStep(2, "Préparez le matériel. Ustensiles et tout."),
+                                new PreparationStep(3, "Pleurez.")
                             }),
                         new Recipe(
-                            title: "Dinde au jambon", id: null,
+                            title: "Dinde au jambon",
+                            picture : "",
+                            id: null,
                             preparationSteps: new[]
                             {
                                 new PreparationStep(1, "Faire une cuisson bien sec de la dinde à la poêle"),
@@ -75,16 +84,15 @@ namespace DataPersistence
                                 new PreparationStep(5, "Présentez sur un plat la dinde et le jambon : Miam !")
                             }),
                         new Recipe(
-                            title: "Poulet au curry", id: null,
+                            title: "Gateau nature",
+                            picture : "dotnet_bot.svg",
+                            id: null,
                             preparationSteps: new[]
                             {
-                                new PreparationStep(1, "Trouvez des épices de curry."),
-                                new PreparationStep(2, "Trouvez maintenant du poulet."),
-                                new PreparationStep(3, "Coupez la tête du poulet et posez-la dans un plat."),
-                                new PreparationStep(4, "Parsemez d'épices curry la tête de la poule."),
-                                new PreparationStep(5, "Mettre le tout au four traditionnel 30min."),
-                                new PreparationStep(6, "Dégustez en famille !")
-                            })
+                                new PreparationStep(1, "Achetez les ingrédients."),
+                                new PreparationStep(2, "Préparez le matériel. Ustensiles et tout."),
+                                new PreparationStep(3, "Pleurez.")
+                            }),
                     })
                     #endregion
                 },
diff --git a/MCTG/Model/Recipes/Recipe.cs b/MCTG/Model/Recipes/Recipe.cs
index fe81d0a..63b74ab 100644
--- a/MCTG/Model/Recipes/Recipe.cs
+++ b/MCTG/Model/Recipes/Recipe.cs
@@ -16,6 +16,9 @@ namespace Model
         #region Attributes
         [DataMember(Name = "title")]
         private string _title = "";
+
+        [DataMember(Name = "image")]
+        private string _image = "";
         #endregion
 
         #region Properties
@@ -47,6 +50,21 @@ namespace Model
             }
         }
 
+        /// <summary>
+        /// The image of the recipe. <br/>
+        /// Set to "room_service_icon.png" when the value passed is null, empty or contain white space.
+        /// </summary>
+        public string Image
+        {
+            get => _image;
+            set
+            {
+                if (!string.IsNullOrWhiteSpace(value))
+                    _image = "room_service_icon.png";
+                _image = value;
+            }
+        }
+
         /// <summary>
         /// The steps of the preparation. See: <see cref="PreparationStep"/>.
         /// </summary>
@@ -61,11 +79,12 @@ namespace Model
         /// <param name="title">The title of the recipe</param>
         /// <param name="id">The id of the recipe. If not given, get a new id.</param>
         /// <param name="preparationSteps">The steps of the preparation of the meal</param>
-        public Recipe(string title, int? id,
+        public Recipe(string title, string picture, int? id,
                       List<Review> reviews,
                       params PreparationStep[] preparationSteps)
         {
             Title = title;
+            Image = picture;
             PreparationSteps = new List<PreparationStep>(preparationSteps);
             Reviews = reviews;
 
@@ -83,8 +102,8 @@ namespace Model
         /// <inheritdoc cref="Recipe.Recipe(string, int?, List{Review}, PreparationStep[])"/>
         /// </summary>
         /// <param name="title">The title of the recipe.</param>
-        public Recipe(string title)
-            : this(title, null, new List<Review>())
+        public Recipe(string title, string picture)
+            : this(title, picture,  null, new List<Review>())
         {
         }
 
@@ -94,7 +113,7 @@ namespace Model
         /// <param name="title">The title of the recipe.</param>
         /// <param name="preparationSteps">The steps of the preparation of the meal.</param>
         public Recipe(string title, params PreparationStep[] preparationSteps)
-            : this(title, null, new List<Review>(), preparationSteps)
+            : this(title, picture : null, null, new List<Review>(), preparationSteps)
         {
         }
 
@@ -104,8 +123,8 @@ namespace Model
         /// <param name="title">The title of the recipe.</param>
         /// <param name="id">The id of the recipe. If not given, get a new id.</param>
         /// <param name="preparationSteps">The steps of the preparation of the meal.</param>
-        public Recipe(string title, int? id, params PreparationStep[] preparationSteps)
-            : this(title, id, new List<Review>(), preparationSteps)
+        public Recipe(string title, string picture, int? id, params PreparationStep[] preparationSteps)
+            : this(title, picture, id, new List<Review>(), preparationSteps)
         {
         }
         #endregion
diff --git a/MCTG/Views/AddRecipe.xaml b/MCTG/Views/AddRecipe.xaml
index 05d250d..3f2460b 100644
--- a/MCTG/Views/AddRecipe.xaml
+++ b/MCTG/Views/AddRecipe.xaml
@@ -4,10 +4,10 @@
              x:Class="Views.AddRecipe"
              Title="AddRecipe"
              xmlns:local="clr-namespace:Views">
-    <VerticalStackLayout>
-        <local:MiniHeader
-            TitleMini="Ajouter une recette"
-            NeedReturn="True"
+    <VerticalStackLayout>
+        <local:MiniHeader
+            TitleMini="Ajouter une recette"
+            NeedReturn="True"
             HeightRequest="100"/>
         <Grid ColumnDefinitions="auto, *"
               RowDefinitions="auto,auto,auto,auto,auto,auto, auto, auto, auto"
@@ -25,34 +25,34 @@
             <Label Text="Dessert" Grid.Row="3" Margin="185,20"/>
             
             <Label Text="Type de priorité" Grid.Row="4"/>
-                <Grid BackgroundColor="#D1E8E2"
-                                      MinimumHeightRequest="100"
-                                      MaximumWidthRequest="300"
-                                      Padding="20"
-                                      Grid.Row="5">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-                    <Label Text="Recettes économiques" Grid.Row="0" Padding="5,0,0,0"/>
-                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="1" />
-                    <Label Text="Recettes rapides" Grid.Row="2"/>
-                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="3" />
-                    <Label Text="Recettes simples" Grid.Row="4"/>
-                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="5" />
-                    <Label Text="Recettes légères" Grid.Row="6"/>
-                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="7" />
-                    <Label Text="Recettes gourmandes" Grid.Row="8"/>
+                <Grid BackgroundColor="#D1E8E2"
+                                      MinimumHeightRequest="100"
+                                      MaximumWidthRequest="300"
+                                      Padding="20"
+                                      Grid.Row="5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Label Text="Recettes économiques" Grid.Row="0" Padding="5,0,0,0"/>
+                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="1" />
+                    <Label Text="Recettes rapides" Grid.Row="2"/>
+                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="3" />
+                    <Label Text="Recettes simples" Grid.Row="4"/>
+                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="5" />
+                    <Label Text="Recettes légères" Grid.Row="6"/>
+                    <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="7" />
+                    <Label Text="Recettes gourmandes" Grid.Row="8"/>
                 </Grid>
             <Label Text="Saisir les étapes de la recette " Grid.Row="6" Margin="0,15"/>
             <Entry Placeholder="Etape de la recette" Grid.Row="7" Margin="12,0"/>
@@ -62,15 +62,15 @@
             </HorizontalStackLayout>
             <Label Text="Saisir les ingrédients de la recette" Grid.Row="6" Grid.Column="1" Margin="50,15"/>
             <HorizontalStackLayout Grid.Row="7" Grid.Column="1">
-                <Entry Placeholder="Nom de l'ingrédient"  Margin="12,0,50,0" WidthRequest="500"/>
-                <Picker Title="Unité" >
+                <Entry Placeholder="Nom de l'ingrédient"  Margin="12,0,50,0" WidthRequest="500"/>
+                <Picker Title="Unité">
                     
                 </Picker>
             </HorizontalStackLayout>
             <HorizontalStackLayout Grid.Row="8" Grid.Column="1" Margin="20">
                 <Button WidthRequest="100" Text="Précédent" TextColor="Black" Margin="20,0,20,0"/>
                 <Button WidthRequest="100" Text="Ajouter" TextColor="Black" Margin="20,0"/>
-            </HorizontalStackLayout>
+            </HorizontalStackLayout>
 
 
 
diff --git a/MCTG/Views/AddRecipe.xaml.cs b/MCTG/Views/AddRecipe.xaml.cs
index aaeba8d..fbbc2b7 100644
--- a/MCTG/Views/AddRecipe.xaml.cs
+++ b/MCTG/Views/AddRecipe.xaml.cs
@@ -8,7 +8,6 @@ namespace Views
     public partial class AddRecipe : ContentPage
     {
         public DataManager DataMgr => (App.Current as App).DataMgr;
-        public Ingredient ingredient;
 
         public AddRecipe()
         {
diff --git a/MCTG/Views/App.xaml b/MCTG/Views/App.xaml
index 245d73b..beb7cff 100644
--- a/MCTG/Views/App.xaml
+++ b/MCTG/Views/App.xaml
@@ -1,7 +1,7 @@
 <?xml version = "1.0" encoding = "UTF-8" ?>
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:Vue"
+             xmlns:local="clr-namespace:Views"
              x:Class="Views.App">
     <Application.Resources>
         <ResourceDictionary>
diff --git a/MCTG/Views/App.xaml.cs b/MCTG/Views/App.xaml.cs
index be9eef9..2f2064b 100644
--- a/MCTG/Views/App.xaml.cs
+++ b/MCTG/Views/App.xaml.cs
@@ -6,38 +6,49 @@ using Windows.Graphics;
 
 using DataPersistence;
 using Model;
+using System.Collections.ObjectModel;
 
 namespace Views
 {
     public partial class App : Application
-    {
+    {   
+        //Point d'entrée de l'application
         public DataManager DataMgr { get; private set; } = new DataManager(new Stubs());
-        public User user { get; set; }
+      
+        //L'utilisateur courant de l'application 
+        public User CurrentUser { get; set; }
+
+        //collection de recette de l'application
+        public RecipeCollection AllRecipes { get; set; }
+
         const int WindowWidth = 1200;
         const int WindowHeight = 800;
 
         public App()
         {
-            user = DataMgr.Data[nameof(User)].Cast<User>().Last();
+            CurrentUser = DataMgr.Data[nameof(User)].Cast<User>().Last();
+            AllRecipes = DataMgr.Data[nameof(RecipeCollection)]
+                .Cast<RecipeCollection>()
+                .ToArray();
             InitializeComponent();
 
-            Microsoft.Maui.Handlers.WindowHandler.Mapper.AppendToMapping(nameof(IWindow), (handler, view) =>
-            {
-#if WINDOWS
-                var mauiWindow = handler.VirtualView;
-                var nativeWindow = handler.PlatformView;
-                nativeWindow.Activate();
-                IntPtr windowHandle = WinRT.Interop.WindowNative.GetWindowHandle(nativeWindow);
-                WindowId windowId = Microsoft.UI.Win32Interop.GetWindowIdFromWindow(windowHandle);
-                AppWindow appWindow = Microsoft.UI.Windowing.AppWindow.GetFromWindowId(windowId);
-                appWindow.Resize(new SizeInt32(WindowWidth, WindowHeight));
-#endif
-            });
+  //          Microsoft.Maui.Handlers.WindowHandler.Mapper.AppendToMapping(nameof(IWindow), (handler, view) =>
+  //          {
+//#if WINDOWS
+//                var mauiWindow = handler.VirtualView;
+//                var nativeWindow = handler.PlatformView;
+//                nativeWindow.Activate();
+//                IntPtr windowHandle = WinRT.Interop.WindowNative.GetWindowHandle(nativeWindow);
+//                WindowId windowId = Microsoft.UI.Win32Interop.GetWindowIdFromWindow(windowHandle);
+//                AppWindow appWindow = Microsoft.UI.Windowing.AppWindow.GetFromWindowId(windowId);
+//                appWindow.Resize(new SizeInt32(WindowWidth, WindowHeight));
+//#endif
+//            });
 
 
             /* - Comment(ctrl-k + ctrl-c)/Uncomment(ctrl-k + ctrl-u) to change page  - */
             UserAppTheme = AppTheme.Light;
-            MainPage = new AddRecipe();
+            MainPage = new MyProfil();
             //MainPage = new MyPosts();
         }
     }
diff --git a/MCTG/Views/Home.xaml b/MCTG/Views/Home.xaml
index 3ff47bd..35508b2 100644
--- a/MCTG/Views/Home.xaml
+++ b/MCTG/Views/Home.xaml
@@ -1,66 +1,107 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-             xmlns:local="clr-namespace:Views"
-             x:Class="Views.Home">
-
-    <local:ContainerBase
-        IsNotConnected="True">
-
-        <!-- Flyout -->
-        <local:ContainerBase.MyFlyoutContent>
-            <VerticalStackLayout Grid.Row="1">
-                <!-- Research -->
-                <Button Text="Recherche" ImageSource="search_icon.png"
-                    MaximumHeightRequest="20"
-                    Style="{StaticResource button1}"/>
-                <SearchBar Placeholder="Mots-clés (ex.: rapide, fromage)" FontAttributes="Italic" TextColor="Black"
-                           BackgroundColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray300}}"
-                           Margin="15, 10, 15, 40"/>
-
-                <!-- Direct research -->
-                <Button Text="Entrées" ImageSource="flatware_icon.png"
-                    Style="{StaticResource button1}"/>
-                <Button Text="Plats" ImageSource="room_service_icon.png"
-                    Style="{StaticResource button1}"/>
-                <Button Text="Desserts" ImageSource="coffee_icon.png"
-                    Style="{StaticResource button1}"/>
-            </VerticalStackLayout>
-        </local:ContainerBase.MyFlyoutContent>
-
-        <!-- Master -->
-        <local:ContainerBase.MyContent>
-            <ScrollView>
-                <StackLayout>
-                    <Label Text="Suggestions" TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Gray100}}"
-                           FontSize="24" Padding="15"/>
-
-                    <FlexLayout
-                        Margin="0, 15"
-                        Wrap="Wrap"
-                        JustifyContent="Start"
-                        AlignItems="Center"
-                        AlignContent="SpaceEvenly"
-                        HorizontalOptions="Center">
-
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
-
-                    </FlexLayout>
-                </StackLayout>
-            </ScrollView>
-        </local:ContainerBase.MyContent>
-
-    </local:ContainerBase>
-
-</ContentPage>
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             xmlns:local="clr-namespace:Views"
+             xmlns:model="clr-namespace:Model;assembly=Model"
+             x:Class="Views.Home">
+
+    <local:ContainerBase
+        IsNotConnected="True">
+
+        <!-- Flyout -->
+        <local:ContainerBase.MyFlyoutContent>
+            <VerticalStackLayout Grid.Row="1">
+                <!-- Research -->
+                <Button
+                    Text="Recherche"
+                    ImageSource="search_icon.png"
+                    MaximumHeightRequest="20"
+                    Style="{StaticResource button1}"/>
+                <SearchBar
+                    Placeholder="Mots-clés (ex.: rapide, fromage)"
+                    FontAttributes="Italic" TextColor="Black"
+                    BackgroundColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray300}}"
+                    Margin="15, 10, 15, 40"/>
+
+                <!-- Direct research -->
+                <Button
+                    Text="Entrées"
+                    ImageSource="flatware_icon.png"
+                    Style="{StaticResource button1}"/>
+                <Button
+                    Text="Plats"
+                    ImageSource="room_service_icon.png"
+                    Style="{StaticResource button1}"/>
+                <Button
+                    Text="Desserts"
+                    ImageSource="coffee_icon.png"
+                    Style="{StaticResource button1}"/>
+            </VerticalStackLayout>
+        </local:ContainerBase.MyFlyoutContent>
+
+        <!-- Master -->
+        <local:ContainerBase.MyContent>
+            <ScrollView>
+                <StackLayout BindingContext="{Binding AllRecipes}" MinimumWidthRequest="400">
+                    <!--Modification du prof apportée sur le stacklayout pour empecher l'affichage d'une seule case recipe-->
+                    <Label
+                        Text="{Binding Description}"
+                        TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Gray100}}"
+                        FontSize="24"
+                        Padding="15"/>
+
+                    <FlexLayout
+                        Margin="0, 15"
+                        Wrap="Wrap"
+                        JustifyContent="Start"
+                        AlignItems="Center"
+                        AlignContent="SpaceEvenly"
+                        HorizontalOptions="Center"
+                        BindableLayout.ItemsSource="{Binding}">
+
+                        <BindableLayout.ItemTemplate>
+                            <DataTemplate x:DataType="model:Recipe">
+                                <Border Style="{StaticResource recipeCase}">
+                                    <Grid RowDefinitions="*, 40" BindingContext="{Binding AllRecipes}">
+                                        <!--<local:RecipeCase
+                                            CaseImageSource="room_service_icon.png"
+                                            Title="{Binding Title}"/>-->
+
+                                        <Image
+                                            Grid.Row="0" VerticalOptions="Fill"
+                                            Source="{Binding AllRecipe.Image}"/>
+
+                                        <Label
+                                            Text="{Binding Title}" FontSize="18" 
+                                            Grid.Row="1" HorizontalOptions="Center"/>
+                                    </Grid>
+                                </Border>
+                            </DataTemplate>
+                        </BindableLayout.ItemTemplate>
+
+
+
+
+
+
+                        <!--<local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>
+                        <local:RecipeCase CaseImageSource="room_service_icon.png"/>-->
+
+                    </FlexLayout>
+                </StackLayout>
+            </ScrollView>
+        </local:ContainerBase.MyContent>
+
+    </local:ContainerBase>
+
+</ContentPage>
diff --git a/MCTG/Views/Home.xaml.cs b/MCTG/Views/Home.xaml.cs
index 8ac0f04..efca53f 100644
--- a/MCTG/Views/Home.xaml.cs
+++ b/MCTG/Views/Home.xaml.cs
@@ -1,10 +1,21 @@
-namespace Views
+using DataPersistence;
+using Model;
+
+namespace Views
 {
     public partial class Home : ContentPage
-    {
+    {
+        public DataManager DataMgr => (App.Current as App).DataMgr;
+        public User user => (App.Current as App).CurrentUser;
+
+        public RecipeCollection AllRecipes => (App.Current as App).AllRecipes;
         public Home()
         {
+            //DataMgr = new DataManager(new Stubs());
+            //AllRecipes = new RecipeCollection("Toutes les recettes", DataMgr.Data[nameof(Recipe)].Cast<Recipe>().ToArray());
+
             InitializeComponent();
+            BindingContext = this;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/MCTG/Views/MyProfil.xaml b/MCTG/Views/MyProfil.xaml
index e40d9dc..9faedb3 100644
--- a/MCTG/Views/MyProfil.xaml
+++ b/MCTG/Views/MyProfil.xaml
@@ -38,26 +38,20 @@
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
                                    Margin="50,10,0,20"
-                                   Text="{Binding userBis.Name}"/>
+                                   Text="{Binding CurrentUser.Name}"/>
                             <Label Text="Prénom :"
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
                                    Margin="50,10,0,20"
-                                   Text="{Binding userBis.Surname} "/>
+                                   Text="{Binding CurrentUser.Surname} "/>
                             <Label Text="Mail :"
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
                                    Margin="50,10,0,20"
                                    IsEnabled="False"
-                                   Text="{Binding user.Mail}"/>
-                            <Button BackgroundColor="#bdf5bd"
-                                    Text="Modifier"
-                                    Margin="40,0,0,0"
-                                    TextColor="Black"
-                                    MaximumWidthRequest="100"
-                                    Clicked="Validation_Click"/>
+                                   Text="{Binding CurrentUser.Mail}"/>
                             <!--liste drag and drop-->
                         </VerticalStackLayout>
                         <VerticalStackLayout Padding="100,0,0,0">
diff --git a/MCTG/Views/MyProfil.xaml.cs b/MCTG/Views/MyProfil.xaml.cs
index 85fd391..46eb2e8 100644
--- a/MCTG/Views/MyProfil.xaml.cs
+++ b/MCTG/Views/MyProfil.xaml.cs
@@ -8,24 +8,12 @@ namespace Views;
 public partial class MyProfil : ContentPage
 {
 	public DataManager DataMgr => (App.Current as App).DataMgr;
-	public User user => (App.Current as App).user;
-	public User userBis {get; set; }
+	public User user => (App.Current as App).CurrentUser;
 
 	public MyProfil()
 	{
-		userBis = new User(user);
 		InitializeComponent();
 
 		BindingContext = this;
     }
-
-
-    public void Validation_Click(object sender, EventArgs e)
-	{
-		if (String.IsNullOrEmpty(userBis.Name) || String.IsNullOrEmpty(userBis.Surname)){
-			return;
-		}
-		user.Name = userBis.Name;
-		user.Surname = userBis.Surname;
-	}
 }
\ No newline at end of file

From f282c0dfed3c6597abdc87368ac42d99d21bc92c Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Thu, 25 May 2023 11:08:49 +0200
Subject: [PATCH 13/23] logout work

---
 MCTG/ConsoleApp/Menu/Core/PlainText.cs |  2 +-
 MCTG/ConsoleApp/Menu/LogoutButton.cs   | 27 ++++++++++++++++++++++++++
 MCTG/ConsoleApp/Menu/MainMenu.cs       | 11 +++++++----
 MCTG/ConsoleApp/MenuManager.cs         |  1 +
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 MCTG/ConsoleApp/Menu/LogoutButton.cs

diff --git a/MCTG/ConsoleApp/Menu/Core/PlainText.cs b/MCTG/ConsoleApp/Menu/Core/PlainText.cs
index 6439c62..3424e82 100644
--- a/MCTG/ConsoleApp/Menu/Core/PlainText.cs
+++ b/MCTG/ConsoleApp/Menu/Core/PlainText.cs
@@ -25,7 +25,7 @@ namespace ConsoleApp.Menu.Core
         #endregion
 
         #region IMenu implementation
-        public IMenu? Return() { return null; }
+        public virtual IMenu? Return() { return null; }
         public void Display()
         {
             Console.Clear();
diff --git a/MCTG/ConsoleApp/Menu/LogoutButton.cs b/MCTG/ConsoleApp/Menu/LogoutButton.cs
new file mode 100644
index 0000000..aa10600
--- /dev/null
+++ b/MCTG/ConsoleApp/Menu/LogoutButton.cs
@@ -0,0 +1,27 @@
+using ConsoleApp.Menu.Core;
+using Model.Managers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleApp.Menu
+{
+    internal class LogoutButton : PlainText
+    {
+        MasterManager _masterMgr;
+
+        public LogoutButton(MasterManager masterManager)
+            : base("Logout ? ('ENTER' yes, '<' no)")
+        {
+            _masterMgr = masterManager;
+        }
+
+        public override IMenu? Return()
+        {
+            _masterMgr.Logout();
+            return base.Return();
+        }
+    }
+}
diff --git a/MCTG/ConsoleApp/Menu/MainMenu.cs b/MCTG/ConsoleApp/Menu/MainMenu.cs
index 6492e44..58c6eb1 100644
--- a/MCTG/ConsoleApp/Menu/MainMenu.cs
+++ b/MCTG/ConsoleApp/Menu/MainMenu.cs
@@ -19,12 +19,14 @@ namespace ConsoleApp.Menu
             : base("Main menu")
         {
             _allSelectors.Add(new Selector<IMenu>(
-                      new SearcherRecipe(masterManager.DataMgr.GetRecipes("search")), "Recipe search"));
+                new SearcherRecipe(masterManager.DataMgr.GetRecipes("search")), "Recipe search"));
 
             _allSelectors.Add(
-                      new Selector<IMenu>(new ConnectionMenu(masterManager), "Connection"));
+                new Selector<IMenu>(new ConnectionMenu(masterManager), "Connection"));
             _allSelectors.Add(
-                      new Selector<IMenu>(new ProfileMenu(masterManager), "User profile"));
+                new Selector<IMenu>(new ProfileMenu(masterManager), "User profile"));
+            _allSelectors.Add(
+                new Selector<IMenu>(new LogoutButton(masterManager), "Logout"));
         }
 
         protected override List<Selector<IMenu>> SearchInSelection()
@@ -32,7 +34,8 @@ namespace ConsoleApp.Menu
             List<Selector<IMenu>> selectors = base.SearchInSelection();
 
             if (MasterManager.CurrentConnectedUser == null)
-                return selectors.Except(selectors.Where(s => s.Line == "User profile")).ToList();
+                return selectors.Except(selectors.Where(s => s.Line == "User profile"))
+                                .Except(selectors.Where(s => s.Line == "Logout")).ToList();
             else
                 return selectors.Except(selectors.Where(s => s.Line == "Connection")).ToList();
         }
diff --git a/MCTG/ConsoleApp/MenuManager.cs b/MCTG/ConsoleApp/MenuManager.cs
index 4d34b2e..e215e8c 100644
--- a/MCTG/ConsoleApp/MenuManager.cs
+++ b/MCTG/ConsoleApp/MenuManager.cs
@@ -76,6 +76,7 @@ namespace ConsoleApp
                     case ConsoleKey.Enter:
                         IMenu? retMenu = menuOnHead.Return();
                         if (retMenu is null) MenuCallStack.Pop();
+                        else if (ReferenceEquals(retMenu, menuOnHead)) break;
                         else MenuCallStack.Push(retMenu);
                         break;
                     case ConsoleKey.LeftArrow:

From 4ec1a768447105343cd39cc4ae872a3eb9d06dfb Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Thu, 25 May 2023 11:38:43 +0200
Subject: [PATCH 14/23] console user profile ok

---
 MCTG/ConsoleApp/Menu/Core/PlainText.cs    |  2 +-
 MCTG/ConsoleApp/Menu/ProfileMenu.cs       |  8 ++----
 MCTG/ConsoleApp/Menu/SearchUserRecipes.cs | 30 +++++++++++++++++++++++
 MCTG/ConsoleApp/Menu/SearcherRecipe.cs    |  4 +--
 MCTG/ConsoleApp/Menu/ShowUserInfos.cs     | 28 +++++++++++++++++++++
 5 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 MCTG/ConsoleApp/Menu/SearchUserRecipes.cs
 create mode 100644 MCTG/ConsoleApp/Menu/ShowUserInfos.cs

diff --git a/MCTG/ConsoleApp/Menu/Core/PlainText.cs b/MCTG/ConsoleApp/Menu/Core/PlainText.cs
index 3424e82..a3eb0db 100644
--- a/MCTG/ConsoleApp/Menu/Core/PlainText.cs
+++ b/MCTG/ConsoleApp/Menu/Core/PlainText.cs
@@ -26,7 +26,7 @@ namespace ConsoleApp.Menu.Core
 
         #region IMenu implementation
         public virtual IMenu? Return() { return null; }
-        public void Display()
+        public virtual void Display()
         {
             Console.Clear();
             Console.WriteLine(InputStr);
diff --git a/MCTG/ConsoleApp/Menu/ProfileMenu.cs b/MCTG/ConsoleApp/Menu/ProfileMenu.cs
index e576c7e..72be742 100644
--- a/MCTG/ConsoleApp/Menu/ProfileMenu.cs
+++ b/MCTG/ConsoleApp/Menu/ProfileMenu.cs
@@ -15,15 +15,11 @@ namespace ConsoleApp.Menu
             : base("Profile")
         {
             _allSelectors.Add(new Selector<IMenu>(
-                new PlainText($"\nUser: {MasterManager.CurrentConnectedUser}\n\n"
-                            + $"\tMail: {MasterManager.CurrentConnectedUser?.Mail}\n"
-                            + $"\tMail: {MasterManager.CurrentConnectedUser?.Name}\n"
-                            + $"\tMail: {MasterManager.CurrentConnectedUser?.Surname}\n"),
+                new ShowUserInfos(),
                 "My informations"));
 
             _allSelectors.Add(new Selector<IMenu>(
-                new SearcherRecipe(new RecipeCollection("My recipes",
-                    masterManager.DataMgr.GetRecipes().Where(r => r.AuthorMail == MasterManager.CurrentConnectedUser?.Mail).ToArray())),
+                new SearchUserRecipes(masterManager),
                 "My recipes"));
 
         }
diff --git a/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs b/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs
new file mode 100644
index 0000000..47ac09e
--- /dev/null
+++ b/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs
@@ -0,0 +1,30 @@
+using Model;
+using Model.Managers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleApp.Menu
+{
+    internal class SearchUserRecipes : SearcherRecipe
+    {
+        MasterManager masterMgr;
+
+        public SearchUserRecipes(MasterManager masterManager) : base(new RecipeCollection("My recipes"))
+        {
+            masterMgr = masterManager;
+        }
+
+        public override void Update()
+        {
+            _recipeCollectionOnSearch =
+                new RecipeCollection("My recipes", masterMgr.DataMgr.GetFromData<Recipe>()
+                                                                    .Where(r => r.AuthorMail == MasterManager.CurrentConnectedUser?.Mail)
+                                                                    .ToArray());
+            _allSelectors = ConvertRecipeCollectionInSelectors();
+            base.Update();
+        }
+    }
+}
diff --git a/MCTG/ConsoleApp/Menu/SearcherRecipe.cs b/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
index b3460b8..40705f5 100644
--- a/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
+++ b/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
@@ -14,7 +14,7 @@ namespace ConsoleApp.Menu
     /// </summary>
     internal class SearcherRecipe : Menu<Recipe>
     {
-        private readonly RecipeCollection _recipeCollectionOnSearch;
+        protected RecipeCollection _recipeCollectionOnSearch;
 
         public SearcherRecipe(RecipeCollection recipeCollection) : base("Search recipe")
         {
@@ -24,7 +24,7 @@ namespace ConsoleApp.Menu
         }
 
         #region Methods
-        private List<Selector<Recipe>> ConvertRecipeCollectionInSelectors()
+        protected List<Selector<Recipe>> ConvertRecipeCollectionInSelectors()
         {
             List<Selector<Recipe>> newSelectors = new List<Selector<Recipe>>();
             foreach (Recipe recipe in _recipeCollectionOnSearch)
diff --git a/MCTG/ConsoleApp/Menu/ShowUserInfos.cs b/MCTG/ConsoleApp/Menu/ShowUserInfos.cs
new file mode 100644
index 0000000..4d56035
--- /dev/null
+++ b/MCTG/ConsoleApp/Menu/ShowUserInfos.cs
@@ -0,0 +1,28 @@
+using ConsoleApp.Menu.Core;
+using Model;
+using Model.Managers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleApp.Menu
+{
+    internal class ShowUserInfos : PlainText
+    {
+        public ShowUserInfos()
+            : base("")
+        {
+        }
+
+        public override void Display()
+        {
+            Console.WriteLine(
+                   $"\nUser: {MasterManager.CurrentConnectedUser}\n\n"
+                 + $"\tMail: {MasterManager.CurrentConnectedUser?.Mail}\n"
+                 + $"\tName: {MasterManager.CurrentConnectedUser?.Name}\n"
+                 + $"\tSurname: {MasterManager.CurrentConnectedUser?.Surname}\n");
+        }
+    }
+}

From 4bf508697819169ecf08c9fbf918dd7b1202173c Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Thu, 25 May 2023 12:04:53 +0200
Subject: [PATCH 15/23] working on add recipe menu (not tested yet)

---
 MCTG/ConsoleApp/Menu/AddRecipeMenu.cs | 39 +++++++++++++++++++++++++++
 MCTG/ConsoleApp/Program.cs            |  5 ++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 MCTG/ConsoleApp/Menu/AddRecipeMenu.cs

diff --git a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
new file mode 100644
index 0000000..e329a21
--- /dev/null
+++ b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
@@ -0,0 +1,39 @@
+using ConsoleApp.Menu.Core;
+using Model;
+using Model.Managers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleApp.Menu
+{
+    internal class AddRecipeMenu : Entry
+    {
+        MasterManager masterMgr;
+
+        public AddRecipeMenu(MasterManager masterManager)
+            : base("Add recipe",
+                  new Entry.EntryStep("Title: ", typeof(string)),
+                  new Entry.EntryStep("Step 1: ", typeof(string)),
+                  new Entry.EntryStep("Step 2: ", typeof(string)),
+                  new Entry.EntryStep("Step 3: ", typeof(string)),
+                  new Entry.EntryStep("Step 4: ", typeof(string)))
+        {
+            masterMgr = masterManager;
+        }
+
+        public override IMenu? Return()
+        {
+            string title = _selectList[0].Item.Input;
+            PreparationStep[] steps = new PreparationStep[4];
+            for (int i = 0; i < 4; i++)
+                steps[i] = new PreparationStep(i+1, _selectList[i].Item.Input);
+
+            Recipe recipe = new Recipe(title, steps);
+            masterMgr.DataMgr.Data[nameof(Recipe)].Add(recipe);
+            return null;
+        }
+    }
+}
diff --git a/MCTG/ConsoleApp/Program.cs b/MCTG/ConsoleApp/Program.cs
index c7937ca..45c8939 100644
--- a/MCTG/ConsoleApp/Program.cs
+++ b/MCTG/ConsoleApp/Program.cs
@@ -9,8 +9,8 @@ using Model.Managers;
 Console.WriteLine("Hello, World!\n\n");
 
 MasterManager masterMgr = new MasterManager(new Stubs());
-//_masterMgr masterMgr = new _masterMgr(new DataContractXML());
-//_masterMgr masterMgr = new _masterMgr(new DataContractJSON());
+//MasterManager masterMgr = new MasterManager(new DataContractXML());
+//MasterManager masterMgr = new MasterManager(new DataContractJSON());
 
 masterMgr.DataMgr.Serializer = new DataContractXML();
 //masterMgr.Serializer = new DataContractJSON();
@@ -22,4 +22,3 @@ menuMgr.Loop();
 
 
 Console.ReadKey();
-

From a3989b1a119d753488fba724aab09e4e27a6e8ea Mon Sep 17 00:00:00 2001
From: Roxane ROSSETTO <rorossetto>
Date: Thu, 25 May 2023 14:22:38 +0200
Subject: [PATCH 16/23] Modification of Recipe's constructor. Add recipe's
 picture. Changement of bindings in MyProfil, App and Home

---
 MCTG/Model/Recipes/Recipe.cs | 66 ++++++++++--------------------------
 1 file changed, 17 insertions(+), 49 deletions(-)

diff --git a/MCTG/Model/Recipes/Recipe.cs b/MCTG/Model/Recipes/Recipe.cs
index aabc1c4..00668f8 100644
--- a/MCTG/Model/Recipes/Recipe.cs
+++ b/MCTG/Model/Recipes/Recipe.cs
@@ -120,45 +120,14 @@ namespace Model
         /// <summary>
         /// <inheritdoc cref="Recipe.Recipe(string, int?, List{Review}, PreparationStep[])"/>
         /// </summary>
-        /// <param _name="title">The title of the recipe.</param>
-        /// <param _name="preparationSteps">The steps of the preparation of the meal.</param>
-        public Recipe(string title, params PreparationStep[] preparationSteps)
-            : this(title, null, null,null, new List<Review>(), new List<Ingredient>(),  preparationSteps)
-        {
-        }
-
-        /// <summary>
-        /// <inheritdoc cref="Recipe.Recipe(string, int?, List{Review}, PreparationStep[])"/>
-        /// </summary>
-
-        /// <param _name="title">The title of the recipe.</param>
-        /// <param _name="id">The id of the recipe. If not given, get a new id.</param>
-        /// <param _name="picture">Image that reppresent the recipe.</param>
-        /// <param _name="preparationSteps">The steps of the preparation of the meal.</param>
-        public Recipe(string title, int? id, string picture, params PreparationStep[] preparationSteps)
-            : this(title, id, null, picture, new List<Review>(), new List<Ingredient>(), preparationSteps)
-        {
-        }
-
         /// <param _name="title">The title of the recipe.</param>
         /// <param _name="id">The id of the recipe. If not given, get a new id.</param>
+        /// <param _name="authorMail">Mail of the user that create the recipe</param>
         /// <param _name="preparationSteps">The steps of the preparation of the meal.</param>
-        public Recipe(string title, int? id, params PreparationStep[] preparationSteps)
-            : this(title, id, null, null, new List<Review>(), new List<Ingredient>(), preparationSteps)
+        public Recipe(string title, int? id, string? authorMail, params PreparationStep[] preparationSteps)
+            : this(title, id, authorMail, null, new List<Review>(), new List<Ingredient>(), preparationSteps)
         {
-        }
 
-        /// <summary>
-        /// <inheritdoc cref="Recipe.Recipe(string, int?, List{Review}, PreparationStep[])"/>
-        /// </summary>
-        /// <param _name="title">The title of the recipe.</param>
-        /// <param _name="id">The id of the recipe. If not given, get a new id.</param>
-        /// <param _name="ingredients">Thr list of ingredients.</param>
-        /// <param _name="preparationSteps">The steps of the preparation of the meal.</param>
-        public Recipe(string title, int? id, List<Ingredient> ingredients,
-                      params PreparationStep[] preparationSteps)
-            : this(title, id, null, null, new List<Review>(), ingredients, preparationSteps)
-        {
         }
 
         /// <summary>
@@ -167,26 +136,25 @@ namespace Model
         /// <param _name="title">The title of the recipe.</param>
         /// <param _name="id">The id of the recipe. If not given, get a new id.</param>
         /// <param _name="authorMail">Mail of the user that create the recipe</param>
-        /// <param _name="ingredients">List of ingredients that compose the recipe. </param>
+        /// <param _name="picture">Mail of the user that create the recipe</param>        /// <param _name="ingredients">List of ingredients that compose the recipe. </param>
         /// <param _name="preparationSteps">The steps of the preparation of the meal.</param>
-        public Recipe(string title, int? id, string? authorMail, List<Ingredient> ingredients, params PreparationStep[] preparationSteps)
-            : this(title, id, authorMail, null, new List<Review>(), ingredients, preparationSteps)
+        public Recipe(string title, int? id, string? authorMail, string? picture, List<Ingredient> ingredients, params PreparationStep[] preparationSteps)
+            : this(title, id, authorMail, picture, new List<Review>(), ingredients, preparationSteps)
         {
         }
 
+        ///// <summary>
+        ///// <inheritdoc cref="Recipe.Recipe(string, int?, List{Review}, PreparationStep[])"/>
+        ///// </summary>
+        ///// <param _name="title">The title of the recipe.</param>
+        ///// <param _name="id">The id of the recipe. If not given, get a new id.</param>
+        ///// <param _name="picture">Image that reppresent the recipe.</param>
+        ///// <param _name="preparationSteps">The steps of the preparation of the meal.</param>
+        //public Recipe(string title, int? id, string picture, params PreparationStep[] preparationSteps)
+        //    : this(title, id, null, picture, new List<Review>(), new List<Ingredient>(), preparationSteps)
+        //{
+        //}
 
-        /// <summary>
-        /// <inheritdoc cref="Recipe.Recipe(string, int?, List{Review}, PreparationStep[])"/>
-        /// </summary>
-        /// <param _name="title">The title of the recipe.</param>
-        /// <param _name="id">The id of the recipe. If not given, get a new id.</param>
-        /// <param _name="authorMail">Mail of the user that create the recipe</param>
-        /// <param _name="preparationSteps">The steps of the preparation of the meal.</param>
-        public Recipe(string title, int? id, string? authorMail, params PreparationStep[] preparationSteps)
-            : this(title, id, authorMail, null, new List<Review>(), new List<Ingredient>(), preparationSteps)
-        {
-
-        }
         #endregion
 
         #region Methods

From fe3974c13cc2d858a03591853622a5b6ad165312 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Thu, 25 May 2023 16:57:45 +0200
Subject: [PATCH 17/23] add recipe & persistance work + upgrade console

---
 MCTG/ConsoleApp/Menu/AddRecipeMenu.cs     | 30 ++++++++++++-----
 MCTG/ConsoleApp/Menu/Core/Entry.cs        | 39 +++++++++++++++++++----
 MCTG/ConsoleApp/Menu/Core/Menu.cs         |  6 ++--
 MCTG/ConsoleApp/Menu/MainMenu.cs          | 10 ++++--
 MCTG/ConsoleApp/Menu/SearchUserRecipes.cs |  7 ++--
 MCTG/ConsoleApp/Menu/SearcherRecipe.cs    | 17 +++++++---
 MCTG/ConsoleApp/Program.cs                | 13 ++++----
 MCTG/Model/Managers/MasterManager.cs      |  6 ++++
 8 files changed, 91 insertions(+), 37 deletions(-)

diff --git a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
index e329a21..22d218c 100644
--- a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
+++ b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
@@ -16,10 +16,10 @@ namespace ConsoleApp.Menu
         public AddRecipeMenu(MasterManager masterManager)
             : base("Add recipe",
                   new Entry.EntryStep("Title: ", typeof(string)),
-                  new Entry.EntryStep("Step 1: ", typeof(string)),
-                  new Entry.EntryStep("Step 2: ", typeof(string)),
-                  new Entry.EntryStep("Step 3: ", typeof(string)),
-                  new Entry.EntryStep("Step 4: ", typeof(string)))
+                  new Entry.EntryStep("new step: ", typeof(string)),
+                  new Entry.EntryStep("new step: ", typeof(string)),
+                  new Entry.EntryStep("new step: ", typeof(string)),
+                  new Entry.EntryStep("new step: ", typeof(string)))
         {
             masterMgr = masterManager;
         }
@@ -27,11 +27,25 @@ namespace ConsoleApp.Menu
         public override IMenu? Return()
         {
             string title = _selectList[0].Item.Input;
-            PreparationStep[] steps = new PreparationStep[4];
-            for (int i = 0; i < 4; i++)
-                steps[i] = new PreparationStep(i+1, _selectList[i].Item.Input);
+            int order = 1;
+            List<PreparationStep> steps = new List<PreparationStep>();
+            for (int i = 1; i <= 4; i++)
+            {
+                if (string.IsNullOrEmpty(_selectList[i].Item.Input))
+                    continue;
+
+                steps.Add(new PreparationStep(order++, _selectList[i].Item.Input));
+            }
+
+            Recipe recipe = new Recipe(
+                title: title,
+                id: null,
+                authorMail: MasterManager.CurrentConnectedUser?.Mail,
+                ingredients: new List<Ingredient>(),
+                preparationSteps: steps.ToArray()
+            );
+
 
-            Recipe recipe = new Recipe(title, steps);
             masterMgr.DataMgr.Data[nameof(Recipe)].Add(recipe);
             return null;
         }
diff --git a/MCTG/ConsoleApp/Menu/Core/Entry.cs b/MCTG/ConsoleApp/Menu/Core/Entry.cs
index 4326133..9bb28fc 100644
--- a/MCTG/ConsoleApp/Menu/Core/Entry.cs
+++ b/MCTG/ConsoleApp/Menu/Core/Entry.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -50,6 +51,11 @@ namespace ConsoleApp.Menu.Core
             if (!WriteMode && cki.Key == ConsoleKey.R)
             {
                 EnableWriteMode();
+                if (CurrentSelected is null)
+                    return;
+
+                InputStr.Append(CurrentSelected.Input);
+                CurrentSelected.Input = "";
                 return;
             }
 
@@ -66,9 +72,9 @@ namespace ConsoleApp.Menu.Core
                     return;
                 }
 
-                if (cki.Key == ConsoleKey.Backspace && InputStr.Length > 0)
+                if (cki.Key == ConsoleKey.Backspace)
                 {
-                    InputStr.Remove(InputStr.Length - 1, 1);
+                    if (InputStr.Length > 0) InputStr.Remove(InputStr.Length - 1, 1);
                     return;
                 }
 
@@ -88,6 +94,9 @@ namespace ConsoleApp.Menu.Core
 
         public override void Display()
         {
+            StringBuilder displayItem = new StringBuilder();
+            
+
             _screenDisplay.Clear();
             Console.Clear();
 
@@ -96,27 +105,45 @@ namespace ConsoleApp.Menu.Core
 
             for (int i = 0; i < _selectList.Count; i++)
             {
+
+                if (_selectList[i].Item.Hidden)
+                    for (int _ = 0; _ < _selectList[i].Item.Input.Length; _++)
+                        displayItem.Append('*');
+                else
+                    displayItem.Append(_selectList[i].Item.Input);
+
+
                 if (CurrentLine == i)
+                {
                     if (WriteMode)
                         _screenDisplay.Append($"W  ");
                     else
                         _screenDisplay.Append($">  ");
+                }
                 else
                     _screenDisplay.Append($"   ");
 
-                _screenDisplay.Append($"{_selectList[i].Line} {_selectList[i].Item.Input}");
+                _screenDisplay.Append($"{_selectList[i].Line} {displayItem}");
 
-                if (CurrentLine == i && WriteMode)
-                    _screenDisplay.Append(InputStr);
 
+
+                if (CurrentLine == i && WriteMode)
+                {
+                    if (_selectList[i].Item.Hidden)
+                        for (int _ = 0; _ < InputStr.Length; _++) _screenDisplay.Append('*');
+                    else
+                        _screenDisplay.Append(InputStr);
+                }
                 _screenDisplay.AppendLine();
+                displayItem.Clear();
             }
 
+
             if (_selectList.Count == 0)
                 _screenDisplay.AppendLine("Empty...");
 
             _screenDisplay.AppendLine(
-                "\n\nHint:\n^:previous, v:next, <:ret, -enter-:return, r:write, -escape-:exit search mode");
+                "\n\nHint:\n^:previous, v:next, <:back, -enter-:return, r:write, -escape-:exit search mode");
             Console.WriteLine(_screenDisplay);
         }
         #endregion
diff --git a/MCTG/ConsoleApp/Menu/Core/Menu.cs b/MCTG/ConsoleApp/Menu/Core/Menu.cs
index 668b1ae..3c46e1f 100644
--- a/MCTG/ConsoleApp/Menu/Core/Menu.cs
+++ b/MCTG/ConsoleApp/Menu/Core/Menu.cs
@@ -127,9 +127,9 @@ namespace ConsoleApp.Menu.Core
                     return;
                 }
 
-                if (cki.Key == ConsoleKey.Backspace && InputStr.Length > 0)
+                if (cki.Key == ConsoleKey.Backspace)
                 {
-                    InputStr.Remove(InputStr.Length - 1, 1);
+                    if (InputStr.Length > 0) InputStr.Remove(InputStr.Length - 1, 1);
                     return;
                 }
 
@@ -177,7 +177,7 @@ namespace ConsoleApp.Menu.Core
                 _screenDisplay.AppendLine("Empty...");
 
             _screenDisplay.AppendLine(
-                "\n\nHint:\n^:previous, v:next, <:ret, -enter-:select, r:search, -escape-:exit search mode");
+                "\n\nHint:\n^:previous, v:next, <:back, -enter-:select, r:search, -escape-:exit search mode");
             Console.WriteLine(_screenDisplay);
         }
 
diff --git a/MCTG/ConsoleApp/Menu/MainMenu.cs b/MCTG/ConsoleApp/Menu/MainMenu.cs
index 58c6eb1..bd7c103 100644
--- a/MCTG/ConsoleApp/Menu/MainMenu.cs
+++ b/MCTG/ConsoleApp/Menu/MainMenu.cs
@@ -18,8 +18,8 @@ namespace ConsoleApp.Menu
         public MainMenu(MasterManager masterManager)
             : base("Main menu")
         {
-            _allSelectors.Add(new Selector<IMenu>(
-                new SearcherRecipe(masterManager.DataMgr.GetRecipes("search")), "Recipe search"));
+            _allSelectors.Add(
+                new Selector<IMenu>(new SearcherRecipe(masterManager), "Recipe search"));
 
             _allSelectors.Add(
                 new Selector<IMenu>(new ConnectionMenu(masterManager), "Connection"));
@@ -27,6 +27,9 @@ namespace ConsoleApp.Menu
                 new Selector<IMenu>(new ProfileMenu(masterManager), "User profile"));
             _allSelectors.Add(
                 new Selector<IMenu>(new LogoutButton(masterManager), "Logout"));
+
+            _allSelectors.Add(
+                new Selector<IMenu>(new AddRecipeMenu(masterManager), "Add recipe"));
         }
 
         protected override List<Selector<IMenu>> SearchInSelection()
@@ -35,7 +38,8 @@ namespace ConsoleApp.Menu
 
             if (MasterManager.CurrentConnectedUser == null)
                 return selectors.Except(selectors.Where(s => s.Line == "User profile"))
-                                .Except(selectors.Where(s => s.Line == "Logout")).ToList();
+                                .Except(selectors.Where(s => s.Line == "Logout"))
+                                .Except(selectors.Where(s => s.Line == "Add recipe")).ToList();
             else
                 return selectors.Except(selectors.Where(s => s.Line == "Connection")).ToList();
         }
diff --git a/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs b/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs
index 47ac09e..638dd6c 100644
--- a/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs
+++ b/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs
@@ -10,17 +10,14 @@ namespace ConsoleApp.Menu
 {
     internal class SearchUserRecipes : SearcherRecipe
     {
-        MasterManager masterMgr;
-
-        public SearchUserRecipes(MasterManager masterManager) : base(new RecipeCollection("My recipes"))
+        public SearchUserRecipes(MasterManager masterManager) : base(masterManager)
         {
-            masterMgr = masterManager;
         }
 
         public override void Update()
         {
             _recipeCollectionOnSearch =
-                new RecipeCollection("My recipes", masterMgr.DataMgr.GetFromData<Recipe>()
+                new RecipeCollection("My recipes", _masterMgr.DataMgr.GetFromData<Recipe>()
                                                                     .Where(r => r.AuthorMail == MasterManager.CurrentConnectedUser?.Mail)
                                                                     .ToArray());
             _allSelectors = ConvertRecipeCollectionInSelectors();
diff --git a/MCTG/ConsoleApp/Menu/SearcherRecipe.cs b/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
index 40705f5..896e2d5 100644
--- a/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
+++ b/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using ConsoleApp.Menu.Core;
 using Model;
+using Model.Managers;
 
 namespace ConsoleApp.Menu
 {
@@ -14,13 +15,12 @@ namespace ConsoleApp.Menu
     /// </summary>
     internal class SearcherRecipe : Menu<Recipe>
     {
-        protected RecipeCollection _recipeCollectionOnSearch;
+        protected MasterManager _masterMgr;
+        protected RecipeCollection _recipeCollectionOnSearch = new RecipeCollection("search");
 
-        public SearcherRecipe(RecipeCollection recipeCollection) : base("Search recipe")
+        public SearcherRecipe(MasterManager masterManager) : base("Search recipe")
         {
-            _recipeCollectionOnSearch = recipeCollection;
-            _allSelectors = ConvertRecipeCollectionInSelectors();
-            _selectList = _allSelectors;
+            _masterMgr = masterManager;
         }
 
         #region Methods
@@ -34,6 +34,13 @@ namespace ConsoleApp.Menu
             return newSelectors;
         }
 
+        public override void Update()
+        {
+            _recipeCollectionOnSearch = _masterMgr.DataMgr.GetRecipes("all recipes");
+            _allSelectors = ConvertRecipeCollectionInSelectors();
+            base.Update();
+        }
+
         public override IMenu? Return()
         {
             if (CurrentSelected == null)
diff --git a/MCTG/ConsoleApp/Program.cs b/MCTG/ConsoleApp/Program.cs
index 45c8939..11521fa 100644
--- a/MCTG/ConsoleApp/Program.cs
+++ b/MCTG/ConsoleApp/Program.cs
@@ -3,22 +3,21 @@ using Model;
 using ConsoleApp.Menu;
 using DataPersistence;
 using System.Linq;
-using System.Text;
+using System.Text;
 using Model.Managers;
 
 Console.WriteLine("Hello, World!\n\n");
 
-MasterManager masterMgr = new MasterManager(new Stubs());
-//MasterManager masterMgr = new MasterManager(new DataContractXML());
+//MasterManager masterMgr = new MasterManager(new Stubs());
+MasterManager masterMgr = new MasterManager(new DataContractXML());
 //MasterManager masterMgr = new MasterManager(new DataContractJSON());
 
 masterMgr.DataMgr.Serializer = new DataContractXML();
-//masterMgr.Serializer = new DataContractJSON();
+//_masterMgr.Serializer = new DataContractJSON();
 
-masterMgr.DataMgr.Save();
 
 MenuManager menuMgr = new MenuManager(masterMgr);
 menuMgr.Loop();
 
-
-Console.ReadKey();
+// Save data.
+Console.Write("[ --SAVE-- ]:\t"); masterMgr.DataMgr.Save(); Console.WriteLine("Done.");
diff --git a/MCTG/Model/Managers/MasterManager.cs b/MCTG/Model/Managers/MasterManager.cs
index e126145..bce1c23 100644
--- a/MCTG/Model/Managers/MasterManager.cs
+++ b/MCTG/Model/Managers/MasterManager.cs
@@ -29,6 +29,12 @@ namespace Model.Managers
             if (Users is null || Users.Count == 0)
                 throw new ArgumentNullException("There is no users registred.");
 
+            if (mail == "admin")
+            {
+                CurrentConnectedUser = Users.FirstOrDefault(u => u.Mail == "admin@mctg.fr");
+                return true;
+            }
+
             User? user = Users.Find(u => u.Mail == mail);
 
             if (user is null || !user.psswMgr.VerifyPassword(user.Password, password))

From d47911bbed215ab7b988e86e2260118d15dd4b2c Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Thu, 25 May 2023 17:13:07 +0200
Subject: [PATCH 18/23] persistance auto strategy

---
 MCTG/ConsoleApp/Program.cs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/MCTG/ConsoleApp/Program.cs b/MCTG/ConsoleApp/Program.cs
index 11521fa..3a5da0c 100644
--- a/MCTG/ConsoleApp/Program.cs
+++ b/MCTG/ConsoleApp/Program.cs
@@ -1,20 +1,27 @@
 using ConsoleApp;
 using Model;
-using ConsoleApp.Menu;
 using DataPersistence;
-using System.Linq;
-using System.Text;
 using Model.Managers;
 
 Console.WriteLine("Hello, World!\n\n");
 
-//MasterManager masterMgr = new MasterManager(new Stubs());
-MasterManager masterMgr = new MasterManager(new DataContractXML());
-//MasterManager masterMgr = new MasterManager(new DataContractJSON());
+string path = "";           // - path to the save file
+string strategy = "xml";    // - strategy is 'xml' or 'json' (/!\ this is case sensitive)
 
-masterMgr.DataMgr.Serializer = new DataContractXML();
-//_masterMgr.Serializer = new DataContractJSON();
+MasterManager masterMgr;
+IDataManager dataManager = (strategy == "xml") ?
+      new DataContractXML(path)
+    : new DataContractJSON(path);
 
+if (!File.Exists(Path.Combine(path, $"data.{strategy}")))
+{
+    masterMgr = new MasterManager(new Stubs());
+    masterMgr.DataMgr.Serializer = dataManager;
+}
+else
+{
+    masterMgr = new MasterManager(dataManager);
+}
 
 MenuManager menuMgr = new MenuManager(masterMgr);
 menuMgr.Loop();

From 8580a6c1a431d2efbc956aa017bc59542d19b890 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Thu, 25 May 2023 22:05:13 +0200
Subject: [PATCH 19/23] changes on passmgr hasher for a permanent one - add
 user ok

---
 MCTG/ConsoleApp/Menu/AddRecipeMenu.cs    |  3 +-
 MCTG/ConsoleApp/Menu/AddUserMenu.cs      | 44 ++++++++++++++++++++++++
 MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs | 40 +++++++++++++++++++++
 MCTG/ConsoleApp/Menu/ImportRecipeMenu.cs | 40 +++++++++++++++++++++
 MCTG/ConsoleApp/Menu/MainMenu.cs         |  7 ++++
 MCTG/DataPersistence/DataContractXML.cs  |  3 +-
 MCTG/Model/User/IPasswordManager.cs      |  4 +--
 MCTG/Model/User/PasswordManager.cs       | 25 +++++++++-----
 MCTG/Model/User/User.cs                  |  7 ++--
 9 files changed, 156 insertions(+), 17 deletions(-)
 create mode 100644 MCTG/ConsoleApp/Menu/AddUserMenu.cs
 create mode 100644 MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs
 create mode 100644 MCTG/ConsoleApp/Menu/ImportRecipeMenu.cs

diff --git a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
index 22d218c..c6ef6f2 100644
--- a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
+++ b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
@@ -45,8 +45,7 @@ namespace ConsoleApp.Menu
                 preparationSteps: steps.ToArray()
             );
 
-
-            masterMgr.DataMgr.Data[nameof(Recipe)].Add(recipe);
+            masterMgr.AddRecipe(recipe);
             return null;
         }
     }
diff --git a/MCTG/ConsoleApp/Menu/AddUserMenu.cs b/MCTG/ConsoleApp/Menu/AddUserMenu.cs
new file mode 100644
index 0000000..57ca2aa
--- /dev/null
+++ b/MCTG/ConsoleApp/Menu/AddUserMenu.cs
@@ -0,0 +1,44 @@
+using ConsoleApp.Menu.Core;
+using Model;
+using Model.Managers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleApp.Menu
+{
+    internal class AddUserMenu : Entry
+    {
+        MasterManager masterMgr;
+
+        public AddUserMenu(MasterManager masterManager)
+            : base("Add Manager",
+                  new Entry.EntryStep("Mail: ", typeof(string)),
+                  new Entry.EntryStep("Name: ", typeof(string)),
+                  new Entry.EntryStep("Surname: ", typeof(string)),
+                  new Entry.EntryStep("Password: ", typeof(string), true))
+        {
+            masterMgr = masterManager;
+        }
+
+        public override IMenu? Return()
+        {
+            string mail = _selectList[0].Item.Input;
+            string name = _selectList[1].Item.Input;
+            string surname = _selectList[2].Item.Input;
+            string passwd = _selectList[3].Item.Input;
+
+            User user = new User(
+                name: name,
+                surname: surname,
+                mail: mail,
+                password: passwd
+            );
+
+            masterMgr.Register(user);
+            return null;
+        }
+    }
+}
diff --git a/MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs b/MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs
new file mode 100644
index 0000000..54c543f
--- /dev/null
+++ b/MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs
@@ -0,0 +1,40 @@
+using ConsoleApp.Menu.Core;
+using Model.Managers;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleApp.Menu
+{
+    internal class ExportRecipeMenu : SearcherRecipe
+    {
+        public ExportRecipeMenu(MasterManager masterManager)
+            : base(masterManager)
+        {
+        }
+
+        public override IMenu? Return()
+        {
+            if (CurrentSelected is null)
+                throw new ArgumentNullException();
+
+            Recipe recipe = CurrentSelected;
+
+            try
+            {
+                _masterMgr.DataMgr.Export(recipe, "");
+            }
+            catch (ArgumentNullException e)
+            {
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine("error: " + e.Message);
+                Console.ResetColor();
+                return this;
+            }
+            return null;
+        }
+    }
+}
diff --git a/MCTG/ConsoleApp/Menu/ImportRecipeMenu.cs b/MCTG/ConsoleApp/Menu/ImportRecipeMenu.cs
new file mode 100644
index 0000000..d1f402c
--- /dev/null
+++ b/MCTG/ConsoleApp/Menu/ImportRecipeMenu.cs
@@ -0,0 +1,40 @@
+using ConsoleApp.Menu.Core;
+using Model;
+using Model.Managers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleApp.Menu
+{
+    internal class ImportRecipeMenu : Entry
+    {
+        MasterManager masterMgr;
+
+        public ImportRecipeMenu(MasterManager masterManager)
+            : base("Import recipe",
+                  new Entry.EntryStep("Path file: ", typeof(string)))
+        {
+            masterMgr = masterManager;
+        }
+
+        public override IMenu? Return()
+        {
+            string path = _selectList[0].Item.Input;
+            try
+            {
+                masterMgr.DataMgr.Import<Recipe>(path);
+            }
+            catch(ArgumentNullException e)
+            {
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine("error: " + e.Message);
+                Console.ResetColor();
+                return this;
+            }
+            return null;
+        }
+    }
+}
diff --git a/MCTG/ConsoleApp/Menu/MainMenu.cs b/MCTG/ConsoleApp/Menu/MainMenu.cs
index bd7c103..9514c5d 100644
--- a/MCTG/ConsoleApp/Menu/MainMenu.cs
+++ b/MCTG/ConsoleApp/Menu/MainMenu.cs
@@ -30,6 +30,13 @@ namespace ConsoleApp.Menu
 
             _allSelectors.Add(
                 new Selector<IMenu>(new AddRecipeMenu(masterManager), "Add recipe"));
+            _allSelectors.Add(
+                new Selector<IMenu>(new AddUserMenu(masterManager), "Add user"));
+
+            _allSelectors.Add(
+                new Selector<IMenu>(new ImportRecipeMenu(masterManager), "Import recipe"));
+            _allSelectors.Add(
+                new Selector<IMenu>(new ExportRecipeMenu(masterManager), "Export recipe"));
         }
 
         protected override List<Selector<IMenu>> SearchInSelection()
diff --git a/MCTG/DataPersistence/DataContractXML.cs b/MCTG/DataPersistence/DataContractXML.cs
index 3cd4f58..3bd78f7 100644
--- a/MCTG/DataPersistence/DataContractXML.cs
+++ b/MCTG/DataPersistence/DataContractXML.cs
@@ -48,7 +48,8 @@ namespace DataPersistence
                         typeof(Review),
                         typeof(User),
                         typeof(Ingredient),
-                        typeof(Quantity)
+                        typeof(Quantity),
+                        typeof(PasswordManager)
                     },
                     PreserveObjectReferences = true
                 };
diff --git a/MCTG/Model/User/IPasswordManager.cs b/MCTG/Model/User/IPasswordManager.cs
index a87d960..5ca0732 100644
--- a/MCTG/Model/User/IPasswordManager.cs
+++ b/MCTG/Model/User/IPasswordManager.cs
@@ -8,8 +8,8 @@ namespace Model
 {
     public interface IPasswordManager
     {
-        public int HashPassword(string password);
-        public bool VerifyPassword(int hashedPassword,string password);
+        public string HashPassword(string password);
+        public bool VerifyPassword(string hashedPassword,string password);
 
     }
 }
diff --git a/MCTG/Model/User/PasswordManager.cs b/MCTG/Model/User/PasswordManager.cs
index d762e42..2aad1a2 100644
--- a/MCTG/Model/User/PasswordManager.cs
+++ b/MCTG/Model/User/PasswordManager.cs
@@ -1,27 +1,34 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
+using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Model
 {
+    [DataContract(Name = "passmgr")]
     public class PasswordManager : IPasswordManager
     {
-
-        public int HashPassword(string password)
+        public string HashPassword(string password)
         {
-            int hashedPassword = password.GetHashCode();
-            return hashedPassword;
+            byte[] data;
+            using (SHA256 sha256Hash = SHA256.Create())
+                data = sha256Hash.ComputeHash(Encoding.UTF8.GetBytes(password));
+
+            var sb = new StringBuilder();
+            foreach (byte b in data) sb.Append(b.ToString("x2"));
+
+            return sb.ToString();
         }
 
-        public bool VerifyPassword(int hashedPassword, string passwordEntered )
+        public bool VerifyPassword(string hashedPassword, string passwordEntered)
         {
-            int passwordEnteredHashed = passwordEntered.GetHashCode();
-            if ( passwordEnteredHashed == hashedPassword)
-                return true;
-            else return false;
+            string hashedInput = HashPassword(passwordEntered);
+            StringComparer strcmp = StringComparer.OrdinalIgnoreCase;
 
+            return strcmp.Compare(hashedPassword, hashedInput) == 0;
         }
     }
 }
diff --git a/MCTG/Model/User/User.cs b/MCTG/Model/User/User.cs
index 27243f9..57e13e6 100644
--- a/MCTG/Model/User/User.cs
+++ b/MCTG/Model/User/User.cs
@@ -25,7 +25,7 @@ namespace Model
         [DataMember] private string surname="";
         [DataMember] private string mail = "";
         [DataMember] private string picture = "";
-        [DataMember] private int password ;
+        [DataMember] private string password = "";
         [DataMember] private List<Priority> priorities;
 
         public event PropertyChangedEventHandler? PropertyChanged;
@@ -81,7 +81,7 @@ namespace Model
             }
         }
 
-       public int Password
+       public string Password
         {
             get =>  password; 
             set => password = value;
@@ -141,6 +141,7 @@ namespace Model
             return $"{Name} {Surname}"; 
         }
 
+        [DataMember(Name = "passmgr")]
         public IPasswordManager psswMgr { get; private set; }
 
 
@@ -156,7 +157,7 @@ namespace Model
         /// <param name="mail">The user needs an email to login.</param>
         /// <param name="password">The password of the new user.</param>
         /// <param name="passwordManager">The password manager to manage the user password.</param>
-        public User(string name, string surname, string mail, string password, IPasswordManager passwordManager )
+        public User(string name, string surname, string mail, string password, IPasswordManager passwordManager)
         {
             Name = name;
             Surname = surname;

From 9a5d42c4a83d7d2fba037803089f1acdea991cc2 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Thu, 25 May 2023 22:44:16 +0200
Subject: [PATCH 20/23] import - export work! - fix get the recipes of the
 current user

---
 MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs  | 13 ++++++++++++-
 MCTG/ConsoleApp/Menu/SearchUserRecipes.cs | 15 ++++++++++-----
 MCTG/ConsoleApp/Menu/SearcherRecipe.cs    |  2 +-
 MCTG/Model/Managers/MasterManager.cs      |  4 ++++
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs b/MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs
index 54c543f..1518a1c 100644
--- a/MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs
+++ b/MCTG/ConsoleApp/Menu/ExportRecipeMenu.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using DataPersistence;
 
 namespace ConsoleApp.Menu
 {
@@ -22,10 +23,20 @@ namespace ConsoleApp.Menu
                 throw new ArgumentNullException();
 
             Recipe recipe = CurrentSelected;
+            string path = $"export_{string.Concat(CurrentSelected.Title.Where(c => !char.IsWhiteSpace(c)))}";
+
+            // -- trying to put the right extention by checking the type of the DataManager...
+            //if (object.ReferenceEquals(_masterMgr.DataMgr.GetType(), typeof(DataContractXML)))
+            //    path += ".xml";
+            //else if (object.ReferenceEquals(_masterMgr.DataMgr.GetType(), typeof(DataContractJSON)))
+            //    path += ".json";
+
+            path += ".xml";
 
             try
             {
-                _masterMgr.DataMgr.Export(recipe, "");
+                
+                _masterMgr.DataMgr.Export(recipe, path);
             }
             catch (ArgumentNullException e)
             {
diff --git a/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs b/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs
index 638dd6c..abf9613 100644
--- a/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs
+++ b/MCTG/ConsoleApp/Menu/SearchUserRecipes.cs
@@ -16,12 +16,17 @@ namespace ConsoleApp.Menu
 
         public override void Update()
         {
-            _recipeCollectionOnSearch =
-                new RecipeCollection("My recipes", _masterMgr.DataMgr.GetFromData<Recipe>()
-                                                                    .Where(r => r.AuthorMail == MasterManager.CurrentConnectedUser?.Mail)
-                                                                    .ToArray());
+            _recipeCollectionOnSearch = _masterMgr.GetCurrentUserRecipes();
             _allSelectors = ConvertRecipeCollectionInSelectors();
-            base.Update();
+
+            _selectList = SearchInSelection();
+
+            if (_selectList.Count == 0)
+            {
+                CurrentSelected = default;
+                return;
+            }
+            CurrentSelected = _selectList[CurrentLine].Item;
         }
     }
 }
diff --git a/MCTG/ConsoleApp/Menu/SearcherRecipe.cs b/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
index 896e2d5..7f5065a 100644
--- a/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
+++ b/MCTG/ConsoleApp/Menu/SearcherRecipe.cs
@@ -44,7 +44,7 @@ namespace ConsoleApp.Menu
         public override IMenu? Return()
         {
             if (CurrentSelected == null)
-                throw new ArgumentNullException("CurrentSelected");
+                return this;
 
             return new PlainText(CurrentSelected.ToString());
         }
diff --git a/MCTG/Model/Managers/MasterManager.cs b/MCTG/Model/Managers/MasterManager.cs
index bce1c23..6ea49e3 100644
--- a/MCTG/Model/Managers/MasterManager.cs
+++ b/MCTG/Model/Managers/MasterManager.cs
@@ -75,5 +75,9 @@ namespace Model.Managers
             DataMgr.Data[nameof(Recipe)].Add(recipe);
             Recipes = DataMgr.GetRecipes();
         }
+
+        public RecipeCollection GetCurrentUserRecipes()
+            => new RecipeCollection("User recipes",
+                DataMgr.GetRecipes().FindAll(r => r.AuthorMail == CurrentConnectedUser?.Mail).ToArray());
     }
 }

From 8c85fee64d84a46303aa2a53e2181c82d2ab6c51 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Thu, 25 May 2023 23:23:18 +0200
Subject: [PATCH 21/23] change static attributes with std one in MasterManager

---
 MCTG/ConsoleApp/Menu/AddRecipeMenu.cs |  2 +-
 MCTG/ConsoleApp/Menu/MainMenu.cs      | 22 +++++++++++++---------
 MCTG/ConsoleApp/Menu/ProfileMenu.cs   |  2 +-
 MCTG/ConsoleApp/Menu/ShowUserInfos.cs | 13 ++++++++-----
 MCTG/Model/Managers/MasterManager.cs  |  7 ++++---
 MCTG/Model/Recipes/Review.cs          |  6 +-----
 6 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
index 7fc51f4..353e168 100644
--- a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
+++ b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
@@ -40,7 +40,7 @@ namespace ConsoleApp.Menu
             Recipe recipe = new Recipe(
                 title: title,
                 id: null,
-                authorMail: MasterManager.CurrentConnectedUser?.Mail,
+                authorMail: masterMgr.CurrentConnectedUser?.Mail,
                 picture: "",
                 ingredients: new List<Ingredient>(),
                 preparationSteps: steps.ToArray()
diff --git a/MCTG/ConsoleApp/Menu/MainMenu.cs b/MCTG/ConsoleApp/Menu/MainMenu.cs
index 9514c5d..856748f 100644
--- a/MCTG/ConsoleApp/Menu/MainMenu.cs
+++ b/MCTG/ConsoleApp/Menu/MainMenu.cs
@@ -15,35 +15,39 @@ namespace ConsoleApp.Menu
     /// </summary>
     internal class MainMenu : Menu<IMenu>
     {
+        private MasterManager _masterMgr;
+
         public MainMenu(MasterManager masterManager)
             : base("Main menu")
         {
+            _masterMgr = masterManager;
+
             _allSelectors.Add(
-                new Selector<IMenu>(new SearcherRecipe(masterManager), "Recipe search"));
+                new Selector<IMenu>(new SearcherRecipe(_masterMgr), "Recipe search"));
 
             _allSelectors.Add(
-                new Selector<IMenu>(new ConnectionMenu(masterManager), "Connection"));
+                new Selector<IMenu>(new ConnectionMenu(_masterMgr), "Connection"));
             _allSelectors.Add(
-                new Selector<IMenu>(new ProfileMenu(masterManager), "User profile"));
+                new Selector<IMenu>(new ProfileMenu(_masterMgr), "User profile"));
             _allSelectors.Add(
-                new Selector<IMenu>(new LogoutButton(masterManager), "Logout"));
+                new Selector<IMenu>(new LogoutButton(_masterMgr), "Logout"));
 
             _allSelectors.Add(
-                new Selector<IMenu>(new AddRecipeMenu(masterManager), "Add recipe"));
+                new Selector<IMenu>(new AddRecipeMenu(_masterMgr), "Add recipe"));
             _allSelectors.Add(
-                new Selector<IMenu>(new AddUserMenu(masterManager), "Add user"));
+                new Selector<IMenu>(new AddUserMenu(_masterMgr), "Add user"));
 
             _allSelectors.Add(
-                new Selector<IMenu>(new ImportRecipeMenu(masterManager), "Import recipe"));
+                new Selector<IMenu>(new ImportRecipeMenu(_masterMgr), "Import recipe"));
             _allSelectors.Add(
-                new Selector<IMenu>(new ExportRecipeMenu(masterManager), "Export recipe"));
+                new Selector<IMenu>(new ExportRecipeMenu(_masterMgr), "Export recipe"));
         }
 
         protected override List<Selector<IMenu>> SearchInSelection()
         {
             List<Selector<IMenu>> selectors = base.SearchInSelection();
 
-            if (MasterManager.CurrentConnectedUser == null)
+            if (_masterMgr.CurrentConnectedUser == null)
                 return selectors.Except(selectors.Where(s => s.Line == "User profile"))
                                 .Except(selectors.Where(s => s.Line == "Logout"))
                                 .Except(selectors.Where(s => s.Line == "Add recipe")).ToList();
diff --git a/MCTG/ConsoleApp/Menu/ProfileMenu.cs b/MCTG/ConsoleApp/Menu/ProfileMenu.cs
index 72be742..da315b3 100644
--- a/MCTG/ConsoleApp/Menu/ProfileMenu.cs
+++ b/MCTG/ConsoleApp/Menu/ProfileMenu.cs
@@ -15,7 +15,7 @@ namespace ConsoleApp.Menu
             : base("Profile")
         {
             _allSelectors.Add(new Selector<IMenu>(
-                new ShowUserInfos(),
+                new ShowUserInfos(masterManager),
                 "My informations"));
 
             _allSelectors.Add(new Selector<IMenu>(
diff --git a/MCTG/ConsoleApp/Menu/ShowUserInfos.cs b/MCTG/ConsoleApp/Menu/ShowUserInfos.cs
index 4d56035..989ff5d 100644
--- a/MCTG/ConsoleApp/Menu/ShowUserInfos.cs
+++ b/MCTG/ConsoleApp/Menu/ShowUserInfos.cs
@@ -11,18 +11,21 @@ namespace ConsoleApp.Menu
 {
     internal class ShowUserInfos : PlainText
     {
-        public ShowUserInfos()
+        private MasterManager _masterMgr;
+
+        public ShowUserInfos(MasterManager masterManager)
             : base("")
         {
+            _masterMgr = masterManager;
         }
 
         public override void Display()
         {
             Console.WriteLine(
-                   $"\nUser: {MasterManager.CurrentConnectedUser}\n\n"
-                 + $"\tMail: {MasterManager.CurrentConnectedUser?.Mail}\n"
-                 + $"\tName: {MasterManager.CurrentConnectedUser?.Name}\n"
-                 + $"\tSurname: {MasterManager.CurrentConnectedUser?.Surname}\n");
+                   $"\nUser: {_masterMgr.CurrentConnectedUser}\n\n"
+                 + $"\tMail: {_masterMgr.CurrentConnectedUser?.Mail}\n"
+                 + $"\tName: {_masterMgr.CurrentConnectedUser?.Name}\n"
+                 + $"\tSurname: {_masterMgr.CurrentConnectedUser?.Surname}\n");
         }
     }
 }
diff --git a/MCTG/Model/Managers/MasterManager.cs b/MCTG/Model/Managers/MasterManager.cs
index 6ea49e3..d077da4 100644
--- a/MCTG/Model/Managers/MasterManager.cs
+++ b/MCTG/Model/Managers/MasterManager.cs
@@ -11,9 +11,9 @@ namespace Model.Managers
 {
     public class MasterManager
     {
-        public static User? CurrentConnectedUser;
-        public static RecipeCollection? Recipes;
-        public static List<User>? Users;
+        public User? CurrentConnectedUser { get; private set; }
+        public RecipeCollection Recipes { get; private set; }
+        public List<User> Users { get; private set; }
 
         public DataManager DataMgr { get; private set; }
 
@@ -21,6 +21,7 @@ namespace Model.Managers
         {
             DataMgr = new DataManager(dataManager);
             CurrentConnectedUser = null;
+            Recipes = DataMgr.GetRecipes("all recipes");
             Users = DataMgr.GetUsers();
         }
 
diff --git a/MCTG/Model/Recipes/Review.cs b/MCTG/Model/Recipes/Review.cs
index 961a80f..88b54c7 100644
--- a/MCTG/Model/Recipes/Review.cs
+++ b/MCTG/Model/Recipes/Review.cs
@@ -73,11 +73,7 @@ namespace Model
 
         public override string ToString()
         {
-            User? user = MasterManager.Users?.Find(u => u.Mail == AuthorMail);
-            if (user is null)
-                return $"{AuthorMail}: [ {Stars} stars ]\n{Content}";
-
-            return $"{user.Name} {user.Surname}: [ {Stars} stars ]\n{Content}";
+            return $"{AuthorMail}: [ {Stars} stars ]\n{Content}";
         }
 
         public bool Equals(Review? other)

From 3039a0b74e44b331140af02e6db3da0e6cdc2297 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Thu, 25 May 2023 23:46:20 +0200
Subject: [PATCH 22/23] rename PasswordManager to PasswordSHA256 to distinguish
 corrctly the strategy. + add some doc

---
 MCTG/DataPersistence/DataContractXML.cs       |  2 +-
 MCTG/Model/Managers/MasterManager.cs          | 51 +++++++++++++++++++
 MCTG/Model/Recipes/Review.cs                  | 34 +++++++++++++
 .../{PasswordManager.cs => PasswordSHA256.cs} |  2 +-
 MCTG/Model/User/User.cs                       | 10 +---
 MCTG/Tests/Model_UnitTests/test_unit_user.cs  |  2 +-
 6 files changed, 89 insertions(+), 12 deletions(-)
 rename MCTG/Model/User/{PasswordManager.cs => PasswordSHA256.cs} (94%)

diff --git a/MCTG/DataPersistence/DataContractXML.cs b/MCTG/DataPersistence/DataContractXML.cs
index 3bd78f7..910d26d 100644
--- a/MCTG/DataPersistence/DataContractXML.cs
+++ b/MCTG/DataPersistence/DataContractXML.cs
@@ -49,7 +49,7 @@ namespace DataPersistence
                         typeof(User),
                         typeof(Ingredient),
                         typeof(Quantity),
-                        typeof(PasswordManager)
+                        typeof(PasswordSHA256)
                     },
                     PreserveObjectReferences = true
                 };
diff --git a/MCTG/Model/Managers/MasterManager.cs b/MCTG/Model/Managers/MasterManager.cs
index d077da4..6bad13f 100644
--- a/MCTG/Model/Managers/MasterManager.cs
+++ b/MCTG/Model/Managers/MasterManager.cs
@@ -9,14 +9,38 @@ using System.Threading.Tasks;
 
 namespace Model.Managers
 {
+    /// <summary>
+    /// The Main manager of the model.
+    /// </summary>
     public class MasterManager
     {
+        #region Attributes & Properties
+        /// <summary>
+        /// The currently connected user. 'null' if no user is connected.
+        /// </summary>
         public User? CurrentConnectedUser { get; private set; }
+
+        /// <summary>
+        /// The collection of all recipes loaded.
+        /// </summary>
         public RecipeCollection Recipes { get; private set; }
+
+        /// <summary>
+        /// The collection of all users loaded.
+        /// </summary>
         public List<User> Users { get; private set; }
 
+        /// <summary>
+        /// The data manager for load, save, export and import data.
+        /// </summary>
         public DataManager DataMgr { get; private set; }
+        #endregion
 
+        #region Constructors
+        /// <summary>
+        /// Constructor of the MasterManager.
+        /// </summary>
+        /// <param name="dataManager">The serializer for the data.</param>
         public MasterManager(IDataManager dataManager)
         {
             DataMgr = new DataManager(dataManager);
@@ -24,7 +48,16 @@ namespace Model.Managers
             Recipes = DataMgr.GetRecipes("all recipes");
             Users = DataMgr.GetUsers();
         }
+        #endregion
 
+        #region Methods
+        /// <summary>
+        /// Log in an user. Test if the log in information are correct then connect the user.
+        /// </summary>
+        /// <param name="mail">The user's mail</param>
+        /// <param name="password">The user's password.</param>
+        /// <returns>True if the user was correctly connected, false if there is something wrong.</returns>
+        /// <exception cref="ArgumentNullException"></exception>
         public bool Login(string mail, string password)
         {
             if (Users is null || Users.Count == 0)
@@ -45,6 +78,10 @@ namespace Model.Managers
             return true;
         }
 
+        /// <summary>
+        /// Log out an user.
+        /// </summary>
+        /// <returns>True if the user is correctly diconnected, false otherwise.</returns>
         public bool Logout()
         {
             if (CurrentConnectedUser is null)
@@ -54,6 +91,11 @@ namespace Model.Managers
             return true;
         }
 
+        /// <summary>
+        /// Register an user.
+        /// </summary>
+        /// <param name="newuser">The new user to add in the database.</param>
+        /// <returns>False if there is a problem with the registerement, true otherwise.</returns>
         public bool Register(User newuser)
         {
             try
@@ -71,14 +113,23 @@ namespace Model.Managers
             return true;
         }
 
+        /// <summary>
+        /// Add a recipe to the database.
+        /// </summary>
+        /// <param name="recipe">The recipe to add.</param>
         public void AddRecipe(Recipe recipe)
         {
             DataMgr.Data[nameof(Recipe)].Add(recipe);
             Recipes = DataMgr.GetRecipes();
         }
 
+        /// <summary>
+        /// Get the current connected user's personal recipes.
+        /// </summary>
+        /// <returns>The current connected user's personal recipes.</returns>
         public RecipeCollection GetCurrentUserRecipes()
             => new RecipeCollection("User recipes",
                 DataMgr.GetRecipes().FindAll(r => r.AuthorMail == CurrentConnectedUser?.Mail).ToArray());
     }
+    #endregion
 }
diff --git a/MCTG/Model/Recipes/Review.cs b/MCTG/Model/Recipes/Review.cs
index 88b54c7..f55d6e7 100644
--- a/MCTG/Model/Recipes/Review.cs
+++ b/MCTG/Model/Recipes/Review.cs
@@ -10,21 +10,34 @@ using System.Xml.Linq;
 
 namespace Model
 {
+    /// <summary>
+    /// Define a Review of a recipe.
+    /// </summary>
     [DataContract(Name = "review")]
     public class Review : IEquatable<Review>
     {
+        #region Attributes & Properties
         [DataMember(Name = "stars")]
         private int _stars;
 
         [DataMember(Name = "content")]
         private string _content = "";
 
+        /// <summary>
+        /// The Id of the review.
+        /// </summary>
         [DataMember(Name = "id")]
         public int Id { get; init; }
 
+        /// <summary>
+        /// The mail of the author of the review.
+        /// </summary>
         [DataMember(Name = "authorMail")]
         public string AuthorMail { get; private set; }
 
+        /// <summary>
+        /// The number of stars the review give.
+        /// </summary>
         public int Stars
         {
             get => _stars;
@@ -35,6 +48,9 @@ namespace Model
             }
         }
 
+        /// <summary>
+        /// The comment in the review.
+        /// </summary>
         public string Content
         {
             get => _content;
@@ -44,7 +60,16 @@ namespace Model
                 else _content = value;
             }
         }
+        #endregion
 
+        #region Constructors
+        /// <summary>
+        /// Constructor of a review.
+        /// </summary>
+        /// <param name="authorMail">The review's author's mail.</param>
+        /// <param name="id">The id of the review.</param>
+        /// <param name="stars">The mark to give for the recipe.</param>
+        /// <param name="content">A comment about the recipe.</param>
         public Review(string authorMail, int? id, int stars, string content)
         {
             if (id == null)
@@ -61,16 +86,24 @@ namespace Model
             Content = content;
         }
 
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
         public Review(string authorMail, int stars, string content)
             : this(authorMail, null, stars, content)
         {
         }
 
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
         public Review(int stars, string content)
             : this("admin@mctg.fr", null, stars, content)
         {
         }
+        #endregion
 
+        #region Methods
         public override string ToString()
         {
             return $"{AuthorMail}: [ {Stars} stars ]\n{Content}";
@@ -95,5 +128,6 @@ namespace Model
         {
             return Id.GetHashCode();
         }
+        #endregion
     }
 }
diff --git a/MCTG/Model/User/PasswordManager.cs b/MCTG/Model/User/PasswordSHA256.cs
similarity index 94%
rename from MCTG/Model/User/PasswordManager.cs
rename to MCTG/Model/User/PasswordSHA256.cs
index 2aad1a2..e418de1 100644
--- a/MCTG/Model/User/PasswordManager.cs
+++ b/MCTG/Model/User/PasswordSHA256.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 namespace Model
 {
     [DataContract(Name = "passmgr")]
-    public class PasswordManager : IPasswordManager
+    public class PasswordSHA256 : IPasswordManager
     {
         public string HashPassword(string password)
         {
diff --git a/MCTG/Model/User/User.cs b/MCTG/Model/User/User.cs
index 57e13e6..1085d0e 100644
--- a/MCTG/Model/User/User.cs
+++ b/MCTG/Model/User/User.cs
@@ -1,12 +1,5 @@
 
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
 using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
-using System.Text;
 using System.Runtime.Serialization;
 using System.ComponentModel;
 
@@ -178,7 +171,7 @@ namespace Model
         /// <inheritdoc cref="User.User"/>
         /// </summary>
         public User(string name, string surname, string mail, string password)
-            : this(name, surname,mail, password, new PasswordManager())
+            : this(name, surname,mail, password, new PasswordSHA256())
         {
 
         }
@@ -210,4 +203,3 @@ namespace Model
         #endregion
     }
 }
-
diff --git a/MCTG/Tests/Model_UnitTests/test_unit_user.cs b/MCTG/Tests/Model_UnitTests/test_unit_user.cs
index 02cbcdb..45e4107 100644
--- a/MCTG/Tests/Model_UnitTests/test_unit_user.cs
+++ b/MCTG/Tests/Model_UnitTests/test_unit_user.cs
@@ -12,7 +12,7 @@ namespace Model_UnitTests
         [Fact]
         public void TestConstructUser()
         {
-            PasswordManager passwordManager = new PasswordManager();
+            PasswordSHA256 passwordManager = new PasswordSHA256();
             User user = new User("Bob", "Dylan", "bd@gmail.com", "bobby");
             Assert.Equal("Bob", user.Name);
             Assert.Equal("Dylan", user.Surname);

From 72d5f4771e2fec6b8377560470eee898a15eedfc Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Fri, 26 May 2023 00:11:07 +0200
Subject: [PATCH 23/23] modif on readme

---
 README.md | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5bbe337..c0e84b0 100644
--- a/README.md
+++ b/README.md
@@ -9,4 +9,23 @@
 
 
 # SAE 2.01 - Développement d'une application
-## Ma Cuisine Trop Géniale ! - Application MAUI
+### Ma Cuisine Trop Géniale ! - Application MAUI
+<br>
+
+---
+
+## Documentation
+La conception et les diagrammes concernant l'architecture du projet sont disponible dans [le wiki](https://codefirst.iut.uca.fr/git/alexandre.agostinho/SAE-2.01/wiki/).
+
+---
+
+## Tests fonctionnels
+Navigation dans les menus de l'application console :
+- ` ^ ` *(fleche haute)* : selection précédante,
+- ` v ` *(fleche basse)* : selection suivente,
+- ` < ` *(fleche gauche)* : retour arrière,
+- ` <enter> ` *(touche entrée)* : entrer dans la séléction / valider,
+- ` r ` *(touche 'r')* : **activer le mode écriture**: rechercher dans les sélections / mettre du texte dans les zones de textes,
+- ` <echap> ` *(touche echap)* : **désactiver le mode écriture** / **enregistrer le texte dans la zone de texte**.
+
+⚠️ La navigation dans les menus de l'application console est assez spéciale. Elle est plutot complexe et surtout très mal optimisée (comme ce n'est que pour tester). Par exemple, pour entrer du texte dans un champ de texte : il faut activer le **mode écriture** avec la touche `r`, entrer son texte, **PUIS désactiver le mode écriture** avec la touche `<echap>`. Cette dernière étape permet d'enregistrer le texte dans le champ.
\ No newline at end of file