merge Alexandre's branch

MCTG/ConsoleApp/Menu/AddRecipeMenu.cs

@@ -39,12 +39,13 @@ namespace ConsoleApp.Menu
 
             Recipe recipe = new Recipe(
                 title: title,
+                type: RecipeType.Unspecified,
                 id: null,
                 authorMail: masterMgr.CurrentConnectedUser?.Mail,
-                picture: "",
-                ingredients: new List<Ingredient>(),
-                preparationSteps: steps.ToArray()
-            );
+                picture: null)
+            {
+                PreparationSteps = steps
+            };
 
             masterMgr.AddRecipe(recipe);
             return null;

MCTG/DataPersistence/DataContractJSON.cs

@@ -1,118 +1,119 @@
-using Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Json;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace DataPersistence
-{
-    /// <summary>
-    /// Define a serializer to manage JSON files.
-    /// </summary>
-    public class DataContractJSON : IDataManager
-    {
-        #region Attributes
-        private string _jsonFolderPath;
-        private DataContractJsonSerializerSettings _dataContractJsonSerializerSettings;
-        #endregion
-
-        #region Constructors
-        /// <summary>
-        /// Constructor of the DataContractJSON serializer.
-        /// </summary>
-        /// <param name="jsonFolderPath">Give the default path where to load and save the data (by default is the current execution dir).</param>
-        /// <param name="dataContractJsonSerializerSettings">Give another set of DataContractJson serializer setting to write file</param>
-        public DataContractJSON(string jsonFolderPath = "",
-                                DataContractJsonSerializerSettings? dataContractJsonSerializerSettings = null)
-        {
-            _jsonFolderPath = jsonFolderPath;
-            if (dataContractJsonSerializerSettings is null)
-                _dataContractJsonSerializerSettings = new DataContractJsonSerializerSettings()
-                {
-                    KnownTypes = new[]
-                    {
-                        typeof(Recipe),
-                        typeof(Review),
-                        typeof(User),
-                        typeof(Ingredient),
-                        typeof(Quantity)
-                    }
-                };
-            else
-                _dataContractJsonSerializerSettings = dataContractJsonSerializerSettings;
-        }
-        #endregion
-
-        #region IDataManager implementation
-        public void Export<T>(T obj, string pathToExport)
-            where T : class
-        {
-            var jsonSerializer = new DataContractJsonSerializer(typeof(T), _dataContractJsonSerializerSettings);
-            using (FileStream stream = File.Create(Path.Combine(_jsonFolderPath, pathToExport)))
-            {
-                using (var jsonWriter = JsonReaderWriterFactory.CreateJsonWriter(
-                    stream: stream,
-                    encoding: System.Text.Encoding.UTF8,
-                    ownsStream: false,
-                    indent: true))
-                {
-                    jsonSerializer.WriteObject(jsonWriter, obj);
-                }
-            }
-        }
-
-        public KeyValuePair<string, T> Import<T>(string pathToImport)
-            where T : class
-        {
-            T? obj;
-            var jsonSerializer = new DataContractJsonSerializer(typeof(T), _dataContractJsonSerializerSettings);
-            using (FileStream stream = File.OpenRead(Path.Combine(_jsonFolderPath, pathToImport)))
-            {
-                obj = jsonSerializer.ReadObject(stream) as T;
-            }
-
-            if (obj is null)
-                throw new ArgumentNullException("obj");
-
-            string typeName = typeof(T).Name;
-            return new KeyValuePair<string, T>(typeName, obj);
-        }
-
-        public Dictionary<string, List<object>> Load()
-        {
-            Dictionary<string, List<object>>? elements = new Dictionary<string, List<object>>();
-            var jsonSerializer = new DataContractJsonSerializer(typeof(Dictionary<string, List<object>>), _dataContractJsonSerializerSettings);
-            using (FileStream stream = File.OpenRead(Path.Combine(_jsonFolderPath, "data.json")))
-            {
-                elements = jsonSerializer.ReadObject(stream) as Dictionary<string, List<object>>;
-            }
-
-            if (elements is null)
-                throw new ArgumentNullException("elements");
-
-            return elements;
-        }
-
-        public void Save(Dictionary<string, List<object>> elements)
-        {
-            var jsonSerializer = new DataContractJsonSerializer(typeof(Dictionary<string, List<object>>), _dataContractJsonSerializerSettings);
-            using (FileStream stream = File.Create(Path.Combine(_jsonFolderPath, "data.json")))
-            {
-                using (var jsonWriter = JsonReaderWriterFactory.CreateJsonWriter(
-                    stream: stream,
-                    encoding: System.Text.Encoding.UTF8,
-                    ownsStream: false,
-                    indent: true))
-                {
-                    jsonSerializer.WriteObject(jsonWriter, elements);
-                }
-            }
-        }
-        #endregion
-    }
-}
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Json;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace DataPersistence
+{
+    /// <summary>
+    /// Define a serializer to manage JSON files.
+    /// </summary>
+    public class DataContractJSON : IDataManager
+    {
+        #region Attributes
+        private string _jsonFolderPath;
+        private DataContractJsonSerializerSettings _dataContractJsonSerializerSettings;
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Constructor of the DataContractJSON serializer.
+        /// </summary>
+        /// <param name="jsonFolderPath">Give the default path where to load and save the data (by default is the current execution dir).</param>
+        /// <param name="dataContractJsonSerializerSettings">Give another set of DataContractJson serializer setting to write file</param>
+        public DataContractJSON(string jsonFolderPath = "",
+                                DataContractJsonSerializerSettings? dataContractJsonSerializerSettings = null)
+        {
+            _jsonFolderPath = jsonFolderPath;
+            if (dataContractJsonSerializerSettings is null)
+                _dataContractJsonSerializerSettings = new DataContractJsonSerializerSettings()
+                {
+                    KnownTypes = new[]
+                    {
+                        typeof(Recipe),
+                        typeof(RecipeType),
+                        typeof(Review),
+                        typeof(User),
+                        typeof(Ingredient),
+                        typeof(Quantity)
+                    }
+                };
+            else
+                _dataContractJsonSerializerSettings = dataContractJsonSerializerSettings;
+        }
+        #endregion
+
+        #region IDataManager implementation
+        public void Export<T>(T obj, string pathToExport)
+            where T : class
+        {
+            var jsonSerializer = new DataContractJsonSerializer(typeof(T), _dataContractJsonSerializerSettings);
+            using (FileStream stream = File.Create(Path.Combine(_jsonFolderPath, pathToExport)))
+            {
+                using (var jsonWriter = JsonReaderWriterFactory.CreateJsonWriter(
+                    stream: stream,
+                    encoding: System.Text.Encoding.UTF8,
+                    ownsStream: false,
+                    indent: true))
+                {
+                    jsonSerializer.WriteObject(jsonWriter, obj);
+                }
+            }
+        }
+
+        public KeyValuePair<string, T> Import<T>(string pathToImport)
+            where T : class
+        {
+            T? obj;
+            var jsonSerializer = new DataContractJsonSerializer(typeof(T), _dataContractJsonSerializerSettings);
+            using (FileStream stream = File.OpenRead(Path.Combine(_jsonFolderPath, pathToImport)))
+            {
+                obj = jsonSerializer.ReadObject(stream) as T;
+            }
+
+            if (obj is null)
+                throw new ArgumentNullException("obj");
+
+            string typeName = typeof(T).Name;
+            return new KeyValuePair<string, T>(typeName, obj);
+        }
+
+        public Dictionary<string, List<object>> Load()
+        {
+            Dictionary<string, List<object>>? elements = new Dictionary<string, List<object>>();
+            var jsonSerializer = new DataContractJsonSerializer(typeof(Dictionary<string, List<object>>), _dataContractJsonSerializerSettings);
+            using (FileStream stream = File.OpenRead(Path.Combine(_jsonFolderPath, "data.json")))
+            {
+                elements = jsonSerializer.ReadObject(stream) as Dictionary<string, List<object>>;
+            }
+
+            if (elements is null)
+                throw new ArgumentNullException("elements");
+
+            return elements;
+        }
+
+        public void Save(Dictionary<string, List<object>> elements)
+        {
+            var jsonSerializer = new DataContractJsonSerializer(typeof(Dictionary<string, List<object>>), _dataContractJsonSerializerSettings);
+            using (FileStream stream = File.Create(Path.Combine(_jsonFolderPath, "data.json")))
+            {
+                using (var jsonWriter = JsonReaderWriterFactory.CreateJsonWriter(
+                    stream: stream,
+                    encoding: System.Text.Encoding.UTF8,
+                    ownsStream: false,
+                    indent: true))
+                {
+                    jsonSerializer.WriteObject(jsonWriter, elements);
+                }
+            }
+        }
+        #endregion
+    }
+}

MCTG/DataPersistence/DataContractXML.cs

@@ -1,123 +1,124 @@
-using Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace DataPersistence
-{
-    /// <summary>
-    /// Define a serializer to manage XML files.
-    /// </summary>
-    public class DataContractXML : IDataManager
-    {
-        #region Attributes
-        private string _xmlFolderPath;
-        private XmlWriterSettings _xmlWriterSettings;
-        private DataContractSerializerSettings _dataContractSerializerSettings;
-        #endregion
-
-        #region Constructors
-        /// <summary>
-        /// Constructor of a DataContractXML serializer.
-        /// </summary>
-        /// <param name="xmlFolderPath">Give the default path where to load and save the data (by default is the current execution dir).</param>
-        /// <param name="xmlWriterSettings">Give another set of XML setting to write file.</param>
-        /// <param name="dataContractSerializerSettings">Give another set of DataContract serializer setting to write file</param>
-        public DataContractXML(string xmlFolderPath = "",
-                               XmlWriterSettings? xmlWriterSettings = null,
-                               DataContractSerializerSettings? dataContractSerializerSettings = null)
-        {
-            _xmlFolderPath = xmlFolderPath;
-
-            if (xmlWriterSettings is null)
-                _xmlWriterSettings = new XmlWriterSettings() { Indent = true };
-            else
-                _xmlWriterSettings = xmlWriterSettings;
-
-            if (dataContractSerializerSettings is null)
-                _dataContractSerializerSettings = new DataContractSerializerSettings()
-                {
-                    KnownTypes = new Type[]
-                    {
-                        typeof(Recipe),
-                        typeof(Review),
-                        typeof(User),
-                        typeof(Ingredient),
-                        typeof(Quantity),
-                        typeof(PasswordSHA256)
-                    },
-                    PreserveObjectReferences = true
-                };
-            else
-                _dataContractSerializerSettings = dataContractSerializerSettings;
-        }
-        #endregion
-
-        #region IDataManager implementation
-        public void Export<T>(T obj, string pathToExport)
-            where T : class
-        {
-            bool restore = _dataContractSerializerSettings.PreserveObjectReferences;
-            _dataContractSerializerSettings.PreserveObjectReferences = false;
-            var serializer = new DataContractSerializer(typeof(T), _dataContractSerializerSettings);
-            using (TextWriter textWriter = File.CreateText(Path.Combine(_xmlFolderPath, pathToExport)))
-            {
-                using (XmlWriter xmlWriter = XmlWriter.Create(textWriter, _xmlWriterSettings))
-                {
-                    serializer.WriteObject(xmlWriter, obj);
-                }
-            }
-            _dataContractSerializerSettings.PreserveObjectReferences = restore;
-        }
-
-        public KeyValuePair<string, T> Import<T>(string pathToImport)
-            where T : class
-        {
-            T? obj;
-            var serializer = new DataContractSerializer(typeof(T), _dataContractSerializerSettings);
-            using (Stream s = File.OpenRead(Path.Combine(_xmlFolderPath, pathToImport)))
-            {
-                obj = serializer.ReadObject(s) as T;
-            }
-
-            if (obj is null)
-                throw new ArgumentNullException("obj");
-
-            string typeName = typeof(T).Name;
-            return new KeyValuePair<string, T>(typeName, obj);
-        }
-
-        public Dictionary<string, List<object>> Load()
-        {
-            Dictionary<string, List<object>>? elements;
-            var serializer = new DataContractSerializer(typeof(Dictionary<string, List<object>>), _dataContractSerializerSettings);
-            using (Stream s = File.OpenRead(Path.Combine(_xmlFolderPath, "data.xml")))
-            {
-                elements = serializer.ReadObject(s) as Dictionary<string, List<object>>;
-            }
-
-            if (elements is null)
-                throw new ArgumentNullException("elements");
-
-            return elements;
-        }
-
-        public void Save(Dictionary<string, List<object>> elements)
-        {
-            var serializer = new DataContractSerializer(typeof(Dictionary<string, List<object>>), _dataContractSerializerSettings);
-            using (TextWriter textWriter = File.CreateText(Path.Combine(_xmlFolderPath, "data.xml")))
-            {
-                using (XmlWriter xmlWriter = XmlWriter.Create(textWriter, _xmlWriterSettings))
-                {
-                    serializer.WriteObject(xmlWriter, elements);
-                }
-            }
-        }
-        #endregion
-    }
-}
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace DataPersistence
+{
+    /// <summary>
+    /// Define a serializer to manage XML files.
+    /// </summary>
+    public class DataContractXML : IDataManager
+    {
+        #region Attributes
+        private string _xmlFolderPath;
+        private XmlWriterSettings _xmlWriterSettings;
+        private DataContractSerializerSettings _dataContractSerializerSettings;
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Constructor of a DataContractXML serializer.
+        /// </summary>
+        /// <param name="xmlFolderPath">Give the default path where to load and save the data (by default is the current execution dir).</param>
+        /// <param name="xmlWriterSettings">Give another set of XML setting to write file.</param>
+        /// <param name="dataContractSerializerSettings">Give another set of DataContract serializer setting to write file</param>
+        public DataContractXML(string xmlFolderPath = "",
+                               XmlWriterSettings? xmlWriterSettings = null,
+                               DataContractSerializerSettings? dataContractSerializerSettings = null)
+        {
+            _xmlFolderPath = xmlFolderPath;
+
+            if (xmlWriterSettings is null)
+                _xmlWriterSettings = new XmlWriterSettings() { Indent = true };
+            else
+                _xmlWriterSettings = xmlWriterSettings;
+
+            if (dataContractSerializerSettings is null)
+                _dataContractSerializerSettings = new DataContractSerializerSettings()
+                {
+                    KnownTypes = new Type[]
+                    {
+                        typeof(Recipe),
+                        typeof(RecipeType),
+                        typeof(Review),
+                        typeof(User),
+                        typeof(Ingredient),
+                        typeof(Quantity),
+                        typeof(PasswordSHA256)
+                    },
+                    PreserveObjectReferences = true
+                };
+            else
+                _dataContractSerializerSettings = dataContractSerializerSettings;
+        }
+        #endregion
+
+        #region IDataManager implementation
+        public void Export<T>(T obj, string pathToExport)
+            where T : class
+        {
+            bool restore = _dataContractSerializerSettings.PreserveObjectReferences;
+            _dataContractSerializerSettings.PreserveObjectReferences = false;
+            var serializer = new DataContractSerializer(typeof(T), _dataContractSerializerSettings);
+            using (TextWriter textWriter = File.CreateText(Path.Combine(_xmlFolderPath, pathToExport)))
+            {
+                using (XmlWriter xmlWriter = XmlWriter.Create(textWriter, _xmlWriterSettings))
+                {
+                    serializer.WriteObject(xmlWriter, obj);
+                }
+            }
+            _dataContractSerializerSettings.PreserveObjectReferences = restore;
+        }
+
+        public KeyValuePair<string, T> Import<T>(string pathToImport)
+            where T : class
+        {
+            T? obj;
+            var serializer = new DataContractSerializer(typeof(T), _dataContractSerializerSettings);
+            using (Stream s = File.OpenRead(Path.Combine(_xmlFolderPath, pathToImport)))
+            {
+                obj = serializer.ReadObject(s) as T;
+            }
+
+            if (obj is null)
+                throw new ArgumentNullException("obj");
+
+            string typeName = typeof(T).Name;
+            return new KeyValuePair<string, T>(typeName, obj);
+        }
+
+        public Dictionary<string, List<object>> Load()
+        {
+            Dictionary<string, List<object>>? elements;
+            var serializer = new DataContractSerializer(typeof(Dictionary<string, List<object>>), _dataContractSerializerSettings);
+            using (Stream s = File.OpenRead(Path.Combine(_xmlFolderPath, "data.xml")))
+            {
+                elements = serializer.ReadObject(s) as Dictionary<string, List<object>>;
+            }
+
+            if (elements is null)
+                throw new ArgumentNullException("elements");
+
+            return elements;
+        }
+
+        public void Save(Dictionary<string, List<object>> elements)
+        {
+            var serializer = new DataContractSerializer(typeof(Dictionary<string, List<object>>), _dataContractSerializerSettings);
+            using (TextWriter textWriter = File.CreateText(Path.Combine(_xmlFolderPath, "data.xml")))
+            {
+                using (XmlWriter xmlWriter = XmlWriter.Create(textWriter, _xmlWriterSettings))
+                {
+                    serializer.WriteObject(xmlWriter, elements);
+                }
+            }
+        }
+        #endregion
+    }
+}

MCTG/DataPersistence/Stubs.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace DataPersistence
@@ -21,77 +22,123 @@ namespace DataPersistence
                     nameof(Recipe),
                     new List<object>(new[]
                     {
-                        new Recipe(
-                            title: "Cookies classiques",
-                            id: 50,
-                            authorMail: "admin@mctg.fr",
-                            picture : "room_service_icon.png",
-                            ingredients: new List<Ingredient>(new[]
+                        new Recipe("Cookies classiques", RecipeType.Dessert, null, "admin@mctg.fr", "")
+                        {
+                            Ingredients = new List<Ingredient>
                             {
                                 new Ingredient("Patates", new Quantity(23, Unit.unit)),
                                 new Ingredient("Farine", new Quantity(23, Unit.G))
-                            }),
-                            preparationSteps: new[]
+                            },
+                            PreparationSteps = new List<PreparationStep>
                             {
                                 new PreparationStep(1, "Faire cuire."),
                                 new PreparationStep(2, "Manger.")
-                            }),
+                            },
+                            Reviews = new List<Review>
+                            {
+                                new Review(4, "Bonne recette, je recommande !"),
+                                new Review(3, "Bof bof, mais mangeable...")
+                            }
+                        },
                         new Recipe(
-                            authorMail: "admin@mctg.fr",
                             title: "Cookies au chocolat",
-                            id: null,
-                            preparationSteps: new[]
+                            type: RecipeType.Dessert)
+                        {
+                            Ingredients = new List<Ingredient>
+                            {
+                                new Ingredient("Farine", new Quantity(200, Unit.G))
+                            },
+                            PreparationSteps = new List<PreparationStep>()
                             {
                                 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,
-                            authorMail: "admin@mctg.fr",
-                            preparationSteps: new[]
+                            title: "Gateau nature",
+                            type: RecipeType.Dessert)
+                        {
+                            Ingredients = new List<Ingredient>
+                            {
+                                new Ingredient("Farine", new Quantity(200, Unit.G)),
+                                new Ingredient("Lait", new Quantity(2, Unit.L))
+                            },
+                            PreparationSteps = new List<PreparationStep>
                             {
                                 new PreparationStep(1, "Achetez les ingrédients."),
                                 new PreparationStep(2, "Préparez le matériel. Ustensiles et tout."),
                                 new PreparationStep(3, "Pleurez.")
-                            }),
+                            },
+                            Reviews = new List<Review>
+                            {
+                                new Review("pedrosamigos@hotmail.com", 5, "C'était vraiment IN-CROY-ABLE !!!")
+                            }
+                        },
                         new Recipe(
-                            title: "Gateau au pommes", id: null,
-                            authorMail: "admin@mctg.fr",
-                            preparationSteps: new[]
+                            title: "Gateau au pommes",
+                            type: RecipeType.Dessert)
+                        {
+                            PreparationSteps = new List<PreparationStep>
                             {
                                 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,
-                            authorMail: "pedrosamigos@hotmail.com",
-                            preparationSteps: new[]
+                            title: "Gateau au chocolat",
+                            type: RecipeType.Dessert,
+                            id: null, authorMail: "pedrosamigos@hotmail.com")
+                        {
+                            Ingredients = new List<Ingredient>
+                            {
+                                new Ingredient("Mais", new Quantity(2, Unit.kG)),
+                                new Ingredient("Sachet pépites de chocolat", new Quantity(1, Unit.unit)),
+                                new Ingredient("Dinde", new Quantity(2, Unit.G))
+                            },
+                            PreparationSteps = new List<PreparationStep>
                             {
                                 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,
-                            authorMail: "pedrosamigos@hotmail.com",
-                            preparationSteps: new[]
+                            type: RecipeType.Dish,
+                            id: null, authorMail: "pedrosamigos@hotmail.com")
+                        {
+                            Ingredients = new List<Ingredient>
+                            {
+                                new Ingredient("Morceaux de bois", new Quantity(2, Unit.unit)),
+                                new Ingredient("Sachet gélatine", new Quantity(1, Unit.unit)),
+                                new Ingredient("Jambon", new Quantity(2, Unit.kG))
+                            },
+                            PreparationSteps = new List<PreparationStep>
                             {
                                 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,
-                            authorMail: "pedrosamigos@hotmail.com",
-                            preparationSteps: new[]
+                            title: "Poulet au curry",
+                            type: RecipeType.Dish,
+                            id: null, authorMail: "pedrosamigos@hotmail.com")
+                        {
+                            Ingredients = new List<Ingredient>
+                            {
+                                new Ingredient("Pissenlis", new Quantity(200, Unit.unit)),
+                                new Ingredient("Boule de pétanque", new Quantity(10, Unit.unit)),
+                                new Ingredient("Poivre", new Quantity(4, Unit.mG))
+                            },
+                            PreparationSteps = new List<PreparationStep>
                             {
                                 new PreparationStep(1, "Trouvez des épices de curry."),
                                 new PreparationStep(2, "Trouvez maintenant du poulet."),
@@ -99,7 +146,12 @@ namespace DataPersistence
                                 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 !")
-                            })
+                            },
+                            Reviews = new List<Review>
+                            {
+                                new Review(5, "Meilleure recette que j'ai avalé de tout les temps !!!!!!!")
+                            }
+                        }
                     })
                     #endregion
                 },

MCTG/Model/Managers/MasterManager.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,14 +14,28 @@ namespace Model.Managers
     /// <summary>
     /// The Main manager of the model.
     /// </summary>
-    public class MasterManager
+    public class MasterManager : INotifyPropertyChanged
     {
         #region Attributes & Properties
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        private RecipeCollection _recipesInSearch = new RecipeCollection("");
+
         /// <summary>
         /// The currently connected user. 'null' if no user is connected.
         /// </summary>
         public User? CurrentConnectedUser { get; private set; }
 
+        public RecipeCollection RecipesInSearch
+        {
+            get => _recipesInSearch;
+            set
+            {
+                _recipesInSearch = value;
+                OnPropertyChange();
+            }
+        }
+
         /// <summary>
         /// The collection of all recipes loaded.
         /// </summary>
@@ -46,6 +62,7 @@ namespace Model.Managers
             DataMgr = new DataManager(dataManager);
             CurrentConnectedUser = null;
             Recipes = DataMgr.GetRecipes("all recipes");
+            RecipesInSearch = DataMgr.GetRecipes("search on");
             Users = DataMgr.GetUsers();
         }
         #endregion
@@ -63,11 +80,13 @@ namespace Model.Managers
             if (Users is null || Users.Count == 0)
                 throw new ArgumentNullException("There is no users registred.");
 
+#if DEBUG
             if (mail == "admin")
             {
                 CurrentConnectedUser = Users.FirstOrDefault(u => u.Mail == "admin@mctg.fr");
                 return true;
             }
+#endif
 
             User? user = Users.Find(u => u.Mail == mail);
 
@@ -129,7 +148,14 @@ namespace Model.Managers
         /// <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());
+                DataMgr.GetRecipes().ToList().FindAll(r => r.AuthorMail == CurrentConnectedUser?.Mail).ToArray());
+
+        /// <summary>
+        /// Notify property change handler.
+        /// </summary>
+        /// <param name="propertyName">the name of the property that change.</param>
+        public void OnPropertyChange([CallerMemberName] string propertyName = "")
+            => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
     #endregion
 }

MCTG/Model/Recipes/Recipe.cs

@@ -19,6 +19,9 @@ namespace Model
 
         [DataMember(Name = "image")]
         private string _image = "";
+        
+        [DataMember(Name = "authorMail")]
+        private string _authorMail = "";
         #endregion
 
         #region Properties
@@ -32,15 +35,22 @@ namespace Model
         /// List of reviews of this recipe.
         /// </summary>
         [DataMember(Name = "reviews")]
-        public List<Review> Reviews { get; private set; }
+        public List<Review> Reviews { get; set; }
 
         /// <summary>
         /// AuthorMail's mail of the recipe.
         /// </summary>
-        [DataMember(Name = "authorMail")]
-        public string? AuthorMail { get; private set; }
-
-        public string Toto { get; set; } = "Coucou";
+        public string? AuthorMail
+        {
+            get => _authorMail;
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    _authorMail = "admin@mctg.fr";
+                else
+                    _authorMail = value;
+            }
+        }
 
         /// <summary>
         /// The Title of the recipe. <br/>
@@ -74,6 +84,7 @@ namespace Model
             }
         }
 
+        /// <summary>
         /// The list of ingredients.
         /// </summary>
         [DataMember(Name = "ingredient")]
@@ -85,30 +96,34 @@ namespace Model
         /// </summary>
         [DataMember(Name = "preparation-steps")]
         public List<PreparationStep> PreparationSteps { get; set; }
+
+        /// <summary>
+        /// The type of recipe.
+        /// </summary>
+        [DataMember(Name = "type")]
+        public RecipeType Type { get; private set; }
         #endregion
 
         #region Constructors
         /// <summary>
         /// Construct a new recipe.
         /// </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">The name of the user that create this recipe.</param>
-        /// <param _name="picture"> The image that represent the recipe</param>
-        /// <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, string? authorMail, string? picture, 
-                      List<Review> reviews, List<Ingredient> ingredients,
-                      params PreparationStep[] preparationSteps)
+        /// <param name="title">The title of the recipe</param>
+        /// <param name="type">The type of the recipe.</param>
+        /// <param name="id">The id of the recipe. If not given, get a new id.</param>
+        /// <param name="authorMail">The name of the user that create this recipe.</param>
+        /// <param name="picture"> The image that represent the recipe</param>
+        public Recipe(string title, RecipeType type, int? id, string? authorMail, string? picture)
         {
             Title = title;
+            Type = type;
             Image = picture;
-            PreparationSteps = new List<PreparationStep>(preparationSteps);
-            Ingredients = ingredients;
-            Reviews = reviews;
             AuthorMail = authorMail;
 
+            PreparationSteps = new List<PreparationStep>();
+            Ingredients = new List<Ingredient>();
+            Reviews = new List<Review>();
+
             if (id == null)
             {
                 var randomGenerator = RandomNumberGenerator.Create();
@@ -119,46 +134,20 @@ namespace Model
             else Id = (int)id;
         }
 
-
-        /// <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)
+        public Recipe(string title, RecipeType type, int? id, string? authorMail)
+            : this(title, type, id, authorMail, null)
         {
-
         }
 
-        /// <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="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, string? picture, List<Ingredient> ingredients, params PreparationStep[] preparationSteps)
-            : this(title, id, authorMail, picture, new List<Review>(), ingredients, preparationSteps)
+        public Recipe(string title, RecipeType type)
+            : this(title, type, null, null)
         {
         }
 
-        /// <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()
-            : this("", null, null, null, new List<Review>(), new List<Ingredient>(),new PreparationStep[0])
+        public Recipe(string title)
+            : this(title, RecipeType.Unspecified)
         {
         }
-
         #endregion
 
         #region Methods

MCTG/Model/Recipes/RecipeCollection.cs

@@ -1,106 +1,118 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// Define a collection of <see cref="Recipe"/>.
-    /// <br/>This class implement <see cref="IList"/> and <see cref="IEquatable{T}"/>.
-    /// </summary>
-    public class RecipeCollection : List<Recipe>, IEquatable<RecipeCollection>
-    {
-        #region Attributes
-        private string _description = "";
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// A short description of what this collection contain. <br/>
-        /// Set to "No description." when the value passed is null, empty or contain white spaces.
-        /// </summary>
-        public string Description
-        {
-            get => _description;
-            set
-            {
-                if (string.IsNullOrWhiteSpace(value))
-                    _description = "No description.";
-                else
-                    _description = value;
-            }
-        }
-        #endregion
-
-        #region Constructors
-        /// <summary>
-        /// Construct a new collection of _recipes.
-        /// </summary>
-        /// <param _name="description">A short description of what this list will contain</param>
-        /// <param _name="recipes">Recipes to add in this new collection</param>
-        public RecipeCollection(string description, params Recipe[] recipes)
-            : base(recipes)
-        {
-            Description = description;
-        }
-        #endregion
-
-        #region Methods
-        /// <summary>
-        /// Find a recipe in this list by giving the id.
-        /// </summary>
-        /// <param _name="id">The id of the list we are looking for</param>
-        /// <returns>The recipe of the id given</returns>
-        /// <exception cref="ArgumentException"/>
-        public Recipe? GetRecipeById(int id)
-        {
-            Recipe? recipe = this.Find(r => r.Id == id);
-            if (recipe == null) throw new ArgumentException("No _recipes match the given id.");
-            return recipe;
-        }
-
-        /// <summary>
-        /// Utility to find a recipe by his _name.
-        /// </summary>
-        /// <param _name="str">The string for the search</param>
-        /// <returns>A collection of Recipe where their Title contain the string.</returns>
-        public RecipeCollection ResearchByName(string str)
-        {
-            return new RecipeCollection(
-                description: $"Results of the research: {str}",
-                recipes: this.FindAll(x => x.Title.ToLower().Contains(str.ToLower())).ToArray());
-        }
-
-        public virtual bool Equals(RecipeCollection? other)
-        {
-            if (other == null) return false;
-            if (other == this) return true;
-            return this.Description.Equals(other.Description);
-        }
-
-        public override bool Equals(object? obj)
-        {
-            var item = obj as RecipeCollection;
-            if (item == null) return false;
-            return Equals(obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return Description.GetHashCode();
-        }
-
-        public override string ToString()
-        {
-            StringBuilder sb = new StringBuilder($"[RecipeCollection] - {Description}:\n");
-            foreach (Recipe r in this)
-            {
-                sb.AppendFormat("\t - {0}\n", r.ToString());
-            }
-            return sb.ToString();
-        }
-        #endregion
-    }
-}
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text;
+
+namespace Model
+{
+    /// <summary>
+    /// Define a collection of <see cref="Recipe"/>.
+    /// <br/>This class is derived from <see cref="ObservableCollection{Recipe}"/>
+    /// and implement <see cref="IEquatable{RecipeCollection}"/> and <see cref="ICloneable"/>.
+    /// </summary>
+    public class RecipeCollection : ObservableCollection<Recipe>, IEquatable<RecipeCollection>, ICloneable
+    {
+        #region Attributes
+        private string _description = "";
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// A short description of what this collection contain. <br/>
+        /// Set to "No description." when the value passed is null, empty or contain white spaces.
+        /// </summary>
+        public string Description
+        {
+            get => _description;
+            set
+            {
+                if (string.IsNullOrWhiteSpace(value))
+                    _description = "No description.";
+                else
+                    _description = value;
+            }
+        }
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Construct a new collection of _recipes.
+        /// </summary>
+        /// <param _name="description">A short description of what this list will contain</param>
+        /// <param _name="recipes">Recipes to add in this new collection</param>
+        public RecipeCollection(string description, params Recipe[] recipes)
+            : base(recipes)
+        {
+            Description = description;
+        }
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Find a recipe in this list by giving the id.
+        /// </summary>
+        /// <param _name="id">The id of the list we are looking for</param>
+        /// <returns>The recipe of the id given</returns>
+        /// <exception cref="ArgumentException"/>
+        public Recipe? GetRecipeById(int id)
+        {
+            Recipe? recipe = this.ToList().Find(r => r.Id == id);
+
+            if (recipe == null) throw new ArgumentException("No _recipes match the given id.");
+            return recipe;
+        }
+
+        /// <summary>
+        /// Utility to find a recipe by his _name.
+        /// </summary>
+        /// <param _name="str">The string for the search</param>
+        /// <returns>A collection of Recipe where their Title contain the string.</returns>
+        public RecipeCollection ResearchByName(string str)
+        {
+            if (string.IsNullOrEmpty(str))
+                return this;
+
+            return new RecipeCollection(
+                description: $"Results of the research: {str}",
+                recipes: this.ToList().FindAll(x => x.Title.ToLower().Contains(str.ToLower())).ToArray());
+        }
+
+        public virtual bool Equals(RecipeCollection? other)
+        {
+            if (other == null) return false;
+            if (other == this) return true;
+            return this.Description.Equals(other.Description);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            var item = obj as RecipeCollection;
+            if (item == null) return false;
+            return Equals(obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Description.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder($"[RecipeCollection] - {Description}:\n");
+            foreach (Recipe r in this)
+            {
+                sb.AppendFormat("\t - {0}\n", r.ToString());
+            }
+            return sb.ToString();
+        }
+
+        public object Clone()
+        {
+            return new RecipeCollection(
+                description: this.Description,
+                recipes: this.ToArray());
+        }
+        #endregion
+    }
+}

MCTG/Model/Recipes/RecipeType.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public enum RecipeType
+    {
+        Unspecified,
+        Starter,
+        Dish,
+        Dessert
+    }
+}

MCTG/Tests/Model_UnitTests/Recipe_UT.cs

@@ -8,9 +8,8 @@ namespace Model_UnitTests
         public void TestVoidConstructor()
         {
             Recipe r = new Recipe(
-                title: "test recipe",
-                id: null,
-                authorMail: "test@test.fr");
+                title: "test recipe", type: RecipeType.Unspecified);
+
             Assert.NotNull(r.Title);
         }
     }

MCTG/Views/App.xaml.cs

@@ -35,31 +35,14 @@ namespace Views
         //collection de recette de l'application
         public RecipeCollection AllRecipes { get; set; }
 
-        //const int WindowWidth = 1200;
-        //const int WindowHeight = 800;
 
         public App()
         {
-            CurrentUser = MasterMgr.DataMgr.GetUsers().Last();
+            CurrentUser = MasterMgr.CurrentConnectedUser;
             AllRecipes = MasterMgr.DataMgr.GetRecipes("All recipes");
             CurrentRecipe = MasterMgr.DataMgr.GetRecipes().First();
             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();

MCTG/Views/ContainerFlyout.xaml

@@ -16,18 +16,20 @@
                                 HorizontalOptions="Start" Padding="10, 10, 0, 0"/>
                 <!-- Header -->
                 <ImageButton Source="person_default.png" HorizontalOptions="Center"
-                         BackgroundColor="{StaticResource Secondary}"
-                         WidthRequest="100" HeightRequest="100"
-                         CornerRadius="50" Margin="0, 30, 0, 10"
-                         BorderWidth="5" BorderColor="Black"
-                         IsEnabled="{Binding IsNotConnected, Source={x:Reference fl}}"
-                         Grid.RowSpan="2"/>
+                             BackgroundColor="{StaticResource Secondary}"
+                             WidthRequest="100" HeightRequest="100"
+                             CornerRadius="50" Margin="0, 30, 0, 10"
+                             BorderWidth="5" BorderColor="Black"
+                             IsEnabled="{Binding IsNotConnected, Source={x:Reference fl}}"
+                             Grid.RowSpan="2"
+                             Clicked="ProfileButton_Clicked"/>
             </Grid>
             
             <Button Text="Connection" ImageSource="login_icon.png"
                     Style="{StaticResource button2}"
                     IsVisible="{Binding IsNotConnected, Source={x:Reference fl}}"
-                    IsEnabled="{Binding IsNotConnected, Source={x:Reference fl}}"/>
+                    IsEnabled="{Binding IsNotConnected, Source={x:Reference fl}}"
+                    Clicked="ConnectionButton_Clicked"/>
             <StackLayout BindingContext="{Binding user}">
                 <Label Text="{Binding Name}"
                    HorizontalOptions="Center" Margin="0,15"
@@ -40,7 +42,6 @@
                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
                    IsVisible="{Binding IsNotConnected, Converter={toolkit:InvertedBoolConverter} ,Source={x:Reference fl}}"/>
             </StackLayout>
-            
 
         </VerticalStackLayout>
 

MCTG/Views/ContainerFlyout.xaml.cs

@@ -17,6 +17,7 @@ public partial class ContainerFlyout : ContentView
 
     }
 
+    #region Bindable XAML Properties
     // Bind MyFlyoutContent
     public static readonly BindableProperty MyFlyoutContentProperty =
         BindableProperty.Create("MyFlyoutContent", typeof(View), typeof(ContainerFlyout), new Grid());
@@ -46,4 +47,15 @@ public partial class ContainerFlyout : ContentView
         get => (bool)GetValue(NeedReturnProperty);
         set => SetValue(NeedReturnProperty, value);
     }
+    #endregion
+
+    public async void ProfileButton_Clicked(object sender, EventArgs e)
+    {
+        await Navigation.PushModalAsync(new MyProfil());
+    }
+
+    public async void ConnectionButton_Clicked(object sender, EventArgs e)
+    {
+        await Navigation.PushModalAsync(new Login());
+    }
 }

MCTG/Views/Home.xaml

@@ -4,46 +4,55 @@
              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">
+             x:Class="Views.Home"
+             x:Name="homepage">
 
     <local:ContainerBase
-        IsNotConnected="True">
+        IsNotConnected="{Binding IsNotConnected, Source={x:Reference homepage}}"
+        NeedReturn="{Binding NeedReturn, Source={x:Reference homepage}}">
 
         <!-- Flyout -->
         <local:ContainerBase.MyFlyoutContent>
             <VerticalStackLayout Grid.Row="1">
                 <!-- Research -->
-                <Button
-                    Text="Recherche"
-                    ImageSource="search_icon.png"
-                    MaximumHeightRequest="20"
-                    Style="{StaticResource button1}"/>
+                <Label
+                    Text="Recherche de recettes :" FontSize="14"
+                    Margin="20, 10, 15, 0"/>
                 <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"/>
+                    Margin="15, 10, 15, 40"
+                    SearchButtonPressed="SearchBar_SearchButtonPressed"/>
 
                 <!-- Direct research -->
+                <Button
+                    Text="Toutes les recettes"
+                    ImageSource="home_icon.png"
+                    Style="{StaticResource button1}"
+                    Clicked="AllRecipes_Clicked"/>
                 <Button
                     Text="Entrées"
                     ImageSource="flatware_icon.png"
-                    Style="{StaticResource button1}"/>
+                    Style="{StaticResource button1}"
+                    Clicked="Entrees_Clicked"/>
                 <Button
                     Text="Plats"
                     ImageSource="room_service_icon.png"
-                    Style="{StaticResource button1}"/>
+                    Style="{StaticResource button1}"
+                    Clicked="Plats_Clicked"/>
                 <Button
                     Text="Desserts"
                     ImageSource="coffee_icon.png"
-                    Style="{StaticResource button1}"/>
+                    Style="{StaticResource button1}"
+                    Clicked="Desserts_Clicked"/>
             </VerticalStackLayout>
         </local:ContainerBase.MyFlyoutContent>
 
         <!-- Master -->
         <local:ContainerBase.MyContent>
             <ScrollView>
-                <StackLayout BindingContext="{Binding AllRecipes}" MinimumWidthRequest="400">
+                <StackLayout BindingContext="{Binding RecipesDisplayed}" MinimumWidthRequest="400">
                     <!--Modification du prof apportée sur le stacklayout pour empecher l'affichage d'une seule case recipe-->
                     <Label
                         Text="{Binding Description}"
@@ -62,42 +71,14 @@
 
                         <BindableLayout.ItemTemplate>
                             <DataTemplate x:DataType="model:Recipe">
-                                <Border Style="{StaticResource recipeCase}">
-                                    <Grid RowDefinitions="*, 40">
-                                        <!--<local:RecipeCase
-                                            CaseImageSource="room_service_icon.png"
-                                            Title="{Binding Title}"/>-->
 
-                                        <ImageButton
-                                            Grid.Row="0" VerticalOptions="Fill"
-                                            Source="{Binding Image}"
-                                            Clicked="OnImageClicked"/>
+                                <local:RecipeCase
+                                    CaseImageSource="{Binding Image}"
+                                    RecipeTitle="{Binding Title}"/>
 
-                                        <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>

MCTG/Views/Home.xaml.cs

@@ -2,29 +2,97 @@
 using DataPersistence;
 using Model;
 using Model.Managers;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 
 namespace Views
 {
     public partial class Home : ContentPage
     {
         public MasterManager MasterMgr => (App.Current as App).MasterMgr;
-        public User user => (App.Current as App).CurrentUser;
-        public Recipe Recipe => (App.Current as App).CurrentRecipe;
-        public RecipeCollection AllRecipes => (App.Current as App).AllRecipes;
+        public User? user => (App.Current as App).CurrentUser;
+        public RecipeCollection AllRecipe => (App.Current as App).AllRecipes;
+
+        private readonly RecipeCollection _recipesDisplayed;
+        public ReadOnlyObservableCollection<Recipe> RecipesDisplayed { get; private set; }
+
+        public static readonly BindableProperty IsNotConnectedProperty =
+        BindableProperty.Create("IsNotConnected", typeof(bool), typeof(bool));
+
+        public bool IsNotConnected
+        {
+            get => (bool)GetValue(IsNotConnectedProperty);
+            set => SetValue(IsNotConnectedProperty, value);
+        }
+
+        public static readonly BindableProperty NeedReturnProperty =
+        BindableProperty.Create("NeedReturn", typeof(bool), typeof(bool));
+
+        public bool NeedReturn
+        {
+            get => (bool)GetValue(NeedReturnProperty);
+            set => SetValue(NeedReturnProperty, value);
+        }
+
+
         public Home()
         {
-            //DataMgr = new DataManager(new Stubs());
-            //AllRecipes = new RecipeCollection("Toutes les recettes", DataMgr.Data[nameof(Recipe)].Cast<Recipe>().ToArray());
+            _recipesDisplayed = (RecipeCollection)AllRecipe.Clone();
+            RecipesDisplayed = new ReadOnlyObservableCollection<Recipe>(_recipesDisplayed);
+            InitializeComponent();
+            BindingContext = this;
+            IsNotConnected = true;
+            NeedReturn = false;
+        }
 
+        public Home(RecipeCollection recipesDisplayed)
+        {
+            _recipesDisplayed = recipesDisplayed;
             InitializeComponent();
             BindingContext = this;
+            IsNotConnected = true;
+            NeedReturn = true;
+        }
+
+        private void ModifyRecipesDisplayed(RecipeCollection recipes)
+        {
+            _recipesDisplayed.Clear();
+            _recipesDisplayed.Description = recipes.Description;
+            foreach (Recipe recipe in recipes)
+            {
+                _recipesDisplayed.Add(recipe);
+            }
+        }
+
+        private void SearchBar_SearchButtonPressed(object sender, EventArgs e)
+        {
+            string searchStr = (sender as SearchBar).Text;
+            ModifyRecipesDisplayed(AllRecipe.ResearchByName(searchStr));
         }
         public void OnImageClicked(object sender, EventArgs e)
         {
             (App.Current as App).CurrentRecipe = (Recipe)(sender as ImageButton).BindingContext;
             Navigation.PushModalAsync(new ViewRecette());
-            
         }
 
+        private void Entrees_Clicked(object sender, EventArgs e)
+        {
+            ModifyRecipesDisplayed(new RecipeCollection("Entrées", AllRecipe.ToList().FindAll(r => r.Type == RecipeType.Starter).ToArray()));
+        }
+
+        private void Plats_Clicked(object sender, EventArgs e)
+        {
+            ModifyRecipesDisplayed(new RecipeCollection("Plats", AllRecipe.ToList().FindAll(r => r.Type == RecipeType.Dish).ToArray()));
+        }
+
+        private void Desserts_Clicked(object sender, EventArgs e)
+        {
+            ModifyRecipesDisplayed(new RecipeCollection("Desserts", AllRecipe.ToList().FindAll(r => r.Type == RecipeType.Dessert).ToArray()));
+        }
+
+        private void AllRecipes_Clicked(object sender, EventArgs e)
+        {
+            ModifyRecipesDisplayed(AllRecipe);
+        }
     }
 }

MCTG/Views/RecipeCase.xaml

@@ -8,12 +8,14 @@
     <Border Style="{StaticResource recipeCase}">
         <Grid RowDefinitions="*, 40">
 
-            <Image
+            <ImageButton
                 Grid.Row="0" VerticalOptions="Fill"
-                Source="{Binding CaseImageSource, Source={x:Reference rCase}}"/>
-            
-            <Label Text="Recette 1" FontSize="18" 
-                   Grid.Row="1" HorizontalOptions="Center"/>
+                Source="{Binding CaseImageSource, Source={x:Reference rCase}}"
+                Clicked="ImageButton_Clicked"/>
+
+            <Label
+                Grid.Row="1" HorizontalOptions="Center" VerticalOptions="Center"
+                Text="{Binding RecipeTitle, Source={x:Reference rCase}}"/>
         </Grid>
     </Border>
 

MCTG/Views/RecipeCase.xaml.cs

@@ -1,18 +1,32 @@
-namespace Views;
-
-public partial class RecipeCase : ContentView
-{
-	public RecipeCase()
-	{
-		InitializeComponent();
-	}
-
-    public static readonly BindableProperty CaseImageSourceProperty =
-        BindableProperty.Create("CaseImageSource", typeof(ImageSource), typeof(Image));
-
-    public ImageSource CaseImageSource
-    {
-        get => (ImageSource)GetValue(CaseImageSourceProperty);
-        set => SetValue(CaseImageSourceProperty, value);
-    }
-}
+namespace Views;
+
+public partial class RecipeCase : ContentView
+{
+	public RecipeCase()
+	{
+		InitializeComponent();
+	}
+
+    public static readonly BindableProperty CaseImageSourceProperty =
+        BindableProperty.Create("CaseImageSource", typeof(ImageSource), typeof(Image));
+
+    public ImageSource CaseImageSource
+    {
+        get => (ImageSource)GetValue(CaseImageSourceProperty);
+        set => SetValue(CaseImageSourceProperty, value);
+    }
+
+    public static readonly BindableProperty RecipeTitleProperty =
+        BindableProperty.Create("RecipeTitle", typeof(string), typeof(Label));
+
+    public string RecipeTitle
+    {
+        get => (string)GetValue(RecipeTitleProperty);
+        set => SetValue(RecipeTitleProperty, value);
+    }
+
+    private async void ImageButton_Clicked(object sender, EventArgs e)
+    {
+        await Navigation.PushModalAsync(new ViewRecette());
+    }
+}

MCTG/Views/ReturnButton.xaml.cs

@@ -1,24 +1,24 @@
-namespace Views;
-
-public partial class ReturnButton : ContentView
-{
-	public ReturnButton()
-	{
-		InitializeComponent();
-	}
-
-    // 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);
+namespace Views;
+
+public partial class ReturnButton : ContentView
+{
+	public ReturnButton()
+	{
+		InitializeComponent();
 	}
 
-    public void OnClickedReturn(object sender, EventArgs e)
-    {
+    // 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);
+	}
+
+	public void OnClickedReturn(object sender, EventArgs e)
+	{
 		Navigation.PopModalAsync();
-    }
+	}
 }

MCTG/Views/Views.csproj

@@ -30,7 +30,7 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
-		<Configurations>Debug;Release;CI</Configurations>
+		<Configurations>Debug;Release</Configurations>
 	</PropertyGroup>
 
 	<ItemGroup>