fix conflicts

MCTG/ConsoleApp/Program.cs

@@ -1,16 +1,14 @@
-// See https://aka.ms/new-console-template for more information
+using ConsoleApp;
-
+using Model;
-using ConsoleApp;
 using ConsoleApp.Menu;
 using DataPersistence;
-using Model;
 using System.Linq;
 using System.Text;
 
-Console.WriteLine("Hello, World!\n\n");
 
 
-// TESTS:
+Console.WriteLine("Hello, World!\n\n");
+
 DataManager dataMgr = new DataManager(new Stubs());
 //DataManager dataMgr = new DataManager(new DataContractXML());
 //DataManager dataMgr = new DataManager(new DataContractJSON());
@@ -44,5 +42,5 @@ MenuManager menuMgr = new MenuManager(dataMgr);
 
 menuMgr.Loop();
 
-Console.WriteLine(passwordManager.VerifyPassword(user.Password, "pamigos"));
 Console.ReadKey();
+

MCTG/DataPersistence/Stubs.cs

@@ -14,8 +14,6 @@ namespace DataPersistence
     {
         public Dictionary<string, List<object>> Load()
         {
-            PasswordManager passwordManager = new PasswordManager();
-
             Dictionary<string, List<object>> data = new Dictionary<string, List<object>>
             {
                 {
@@ -103,12 +101,13 @@ namespace DataPersistence
                             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
                 }

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")),
+            : this(new User(), null, stars, content)
-                  null, stars, content)
         {
         }
 

MCTG/Model/User/User.cs

@@ -1,3 +1,4 @@
+
 using System;
 using System.Collections.Generic;
 using System.Collections;
@@ -7,6 +8,7 @@ using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Text;
 using System.Runtime.Serialization;
+using System.ComponentModel;
 
 namespace Model
 {
@@ -15,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
 
@@ -25,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
@@ -36,13 +40,11 @@ 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();
             }
         }
 
@@ -53,13 +55,11 @@ 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();
             }
         }
 
@@ -129,6 +129,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}"; 
+        }
+
+        public IPasswordManager psswMgr { get; private set; }
+
+
         #endregion
 
         #region Constructors
@@ -136,15 +151,18 @@ namespace Model
         /// <summary>
         /// Construtors of user.
         /// </summary>
-        /// <param _name="name">The _name of the user</param>
+        /// <param name="name">The name of the user</param>
-        /// <param _name="surname">The surname of the user</param>
+        /// <param name="surname">The surname of the user</param>
-        /// <param _name="mail">The user needs an email to login. </param>
+        /// <param name="mail">The user needs an email to login.</param>
-        public User(string name, string surname, string mail, int password)
+        /// <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 )
         {
             Name = name;
             Surname = surname;
             Mail = mail;
-            Password = password;
+            psswMgr = passwordManager;
+            Password = psswMgr.HashPassword(password);
             priorities = new List<Priority> {
                 Priority.Gourmet,
                 Priority.Economic,
@@ -155,8 +173,40 @@ namespace Model
 
         }
 
+        /// <summary>
+        /// <inheritdoc cref="User.User"/>
+        /// </summary>
+        public User(string name, string surname, string mail, string password)
+            : this(name, surname,mail, password, new PasswordManager())
+        {
+
+        }
+
+        /// <summary>
+        /// <inheritdoc cref="User.User"/>
+        /// </summary>
+        public User()
+            : this("John", "Doe", "truc@gmail.com", "mdp")
+        {
+
+        }
+
+        /// <summary>
+        /// <inheritdoc cref="User.User"/>
+        /// </summary>
+        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
     }
 }
+

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);

MCTG/Views/App.xaml.cs

@@ -4,15 +4,21 @@ 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()
         {
+            user = DataMgr.Data[nameof(User)].Cast<User>().Last();
             InitializeComponent();
 
             Microsoft.Maui.Handlers.WindowHandler.Mapper.AppendToMapping(nameof(IWindow), (handler, view) =>
@@ -31,7 +37,7 @@ namespace Views
 
             /* - Comment(ctrl-k + ctrl-c)/Uncomment(ctrl-k + ctrl-u) to change page  - */
             UserAppTheme = AppTheme.Light;
-            MainPage = new MyProfil();
+            MainPage = new AddRecipe();
             //MainPage = new MyPosts();
         }
     }

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="Jean-Baptiste De La Fontaine"
+            <StackLayout BindingContext="{Binding user}">
-                   HorizontalOptions="Center" Margin="15"
+                <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>
 

MCTG/Views/ContainerFlyout.xaml.cs

@@ -1,10 +1,20 @@
+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()
 	{
         InitializeComponent();
+        BindingContext = this;
+
+
     }
 
     // Bind MyFlyoutContent

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="Mes Recettes" 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="Ajouter Recette" ImageSource="settings_icon.png" Style="{StaticResource button1}" Grid.Row="2"/>
                 </VerticalStackLayout>
             </Grid>
 
@@ -24,7 +24,8 @@
         <local:ContainerBase.MyContent>
 
             <ScrollView>
-                <StackLayout BindingContext="User"><!--Attention debut de binding-->
+                <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"/>
@@ -36,30 +37,28 @@
                                    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"/>
+                                   Margin="50,10,0,20"
+                                   Text="{Binding userBis.Surname} "/>
                             <Label Text="Mail :"
                                    Padding="50,0,0,0"
                                    FontSize="18"/>
                             <Entry BackgroundColor="#D1E8E2"
-                                   Margin="50,10,0,20"/>
+                                   Margin="50,10,0,20"
-                            <Label Text="Pseudo :"
+                                   IsEnabled="False"
-                                   Padding="50,0,0,0"
+                                   Text="{Binding user.Mail}"/>
-                                   FontSize="18"/>
-                            <Entry BackgroundColor="#D1E8E2"
-                                   Margin="50,10,0,50"/>
                             <Button BackgroundColor="#bdf5bd"
-                                    Text="Valider"
+                                    Text="Modifier"
                                     Margin="40,0,0,0"
                                     TextColor="Black"
-                                    MaximumWidthRequest="100"/>
+                                    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}}"
@@ -91,20 +90,10 @@
                                 <BoxView Color="Black" HeightRequest="1" Margin="10,10,10,10" Grid.Row="7" />
                                 <Label Text="Recettes gourmandes" Grid.Row="8"/>
                             </Grid>
-
-                            
                         </VerticalStackLayout>
-                        
-                        
                     </HorizontalStackLayout>
-                   
-
-                  
                 </StackLayout>
             </ScrollView>
-
         </local:ContainerBase.MyContent>
-
     </local:ContainerBase>
-
 </ContentPage>

MCTG/Views/MyProfil.xaml.cs

@@ -1,9 +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 => (App.Current as App).user;
+	public User userBis {get; set; }
+
 	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;
 	}
 }

MCTG/Views/Views.csproj

@@ -57,10 +57,14 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <ProjectReference Include="..\DataPersistence\DataPersistence.csproj" />
 	  <ProjectReference Include="..\Model\Model.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="AddRecipe.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="ContainerBase.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>