conflit fix

notus/Biblioteque_de_Class/Database.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
+using System.Web;
 
 namespace Biblioteque_de_Class
 {
@@ -18,7 +19,14 @@ namespace Biblioteque_de_Class
         [DataMember]
         public List<Theme> ThemeList { get; private set; }
         [DataMember]
-        public List<User> UserList { get; private set; }
+        private List<User> UserList = null!;
+        public List<User> Users { get => UserList; private set
+            {
+                UserList = value;
+            }
+        }
+        [DataMember]
+        private Dictionary<User, List<Theme>> AddedThemeList;
 
         public Database()
         {

notus/Biblioteque_de_Class/PersistenceManager.cs

@@ -4,7 +4,7 @@ namespace Biblioteque_de_Class
 {
     public class PersistenceManager
     {
-        private Database db = new();
+        private Database db = new Database();
 
         private readonly IManager persistence;
 

notus/Biblioteque_de_Class/User.cs

@@ -43,7 +43,6 @@ namespace Biblioteque_de_Class
             NoteTagged = new Dictionary<Note, List<Tags>>();
             AddedTheme = new List<Theme>();
         }
-
         public override string ToString() => $"username: {Username}\nemail: {Email}\npassword: {Password}\nOwned notes: {NoteList.Count}";
 
         /// <summary>

notus/Notus_Console/Program.cs

@@ -7,8 +7,8 @@ using System.Security.Cryptography;
 using System.Text;
 
 // load database
-PersistenceManager managerLoad = new(new ToXML());
+PersistenceManager manager = new PersistenceManager(new Stub());
-Database db = managerLoad.LoadDatabaseData();
+Database db = manager.LoadDatabaseData();
 
 //save database
 PersistenceManager managerSave = new(new ToXML());

notus/notus.sln

@@ -6,7 +6,10 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Notus_Vue", "notus_vue\Notus_Vue.csproj", "{561264A1-4611-40FB-A662-3EF65550CA71}"
 	ProjectSection(ProjectDependencies) = postProject
 		{184478A9-E14F-42E0-B963-B3A4474C9C1C} = {184478A9-E14F-42E0-B963-B3A4474C9C1C}
+		{7B7F1062-9498-44E5-AC77-84BC90A3B730} = {7B7F1062-9498-44E5-AC77-84BC90A3B730}
 		{92DD50C5-EEAD-44ED-AEFF-E21935725477} = {92DD50C5-EEAD-44ED-AEFF-E21935725477}
+		{AFCEAA99-3A25-4E9E-B498-72DD76A6B7FF} = {AFCEAA99-3A25-4E9E-B498-72DD76A6B7FF}
+		{EE443C17-B31D-4AD0-9141-920876E7DF79} = {EE443C17-B31D-4AD0-9141-920876E7DF79}
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Biblioteque_de_Class", "Biblioteque_de_Class\Biblioteque_de_Class.csproj", "{92DD50C5-EEAD-44ED-AEFF-E21935725477}"

notus/notus_vue/App.xaml.cs

@@ -1,13 +1,19 @@
 
+using Biblioteque_de_Class;
+using Notus_Persistance;
+
 namespace notus;
 
 public partial class App : Application
 {
-	public App()
+    public PersistenceManager manager = new PersistenceManager(new Stub());
+	public Database db = new Database();
+
+    public App()
 	{
 		InitializeComponent();
-
+		db = manager.LoadDatabaseData();
-		MainPage = new AppShell();
+        MainPage = new AppShell();
 	}
 
 	

notus/notus_vue/AppShell.xaml

@@ -6,7 +6,8 @@
     xmlns:local="clr-namespace:notus"
     Shell.FlyoutBehavior="Locked"
     Shell.FlyoutWidth="30"
-    Shell.NavBarIsVisible="False">
+    Shell.NavBarIsVisible="True"
+    Shell.BackgroundColor="Grey">
 
     <ShellContent
         Title="main_page"
@@ -28,5 +29,9 @@
         ContentTemplate="{DataTemplate local:InscrPage}"
         Route="InscrPage"/>
 
+    <ShellContent
+        Title="ProfilPage"
+        ContentTemplate="{DataTemplate local:ProfilPage}"
+        Route="ProfilPage"/>
 </Shell>
 

notus/notus_vue/ConnecPage.xaml

@@ -39,7 +39,7 @@
             FontFamily="strong"
             />
         
-        <Entry
+        <Entry x:Name="Mail"
             Grid.Column="1" 
             Grid.ColumnSpan="3" 
             Grid.Row="3"
@@ -50,7 +50,7 @@
             BackgroundColor="#4A4A4A"
             />
 
-        <Entry 
+        <Entry x:Name="Password"
             Grid.Column="1" 
             Grid.ColumnSpan="3" 
             Grid.Row="5"
@@ -69,6 +69,16 @@
             Text="Valider"
             TextColor="Black"
             BackgroundColor="#74fabd"
+            Clicked="Valid_Clicked"
+            />
+
+        <Label
+            x:Name="ResultSearch"
+            Text="Mail ou mot de passe incorrect."
+            IsVisible="false"
+            Grid.Column="2"
+            Grid.Row="7"
+            TextColor="Red"
             />
 
     </Grid>

notus/notus_vue/ConnecPage.xaml.cs

@@ -1,9 +1,28 @@
+using Biblioteque_de_Class;
+
 namespace notus;
 
 public partial class ConnecPage : ContentPage
 {
-	public ConnecPage()
+    string mail = "";
+    string MDP = "";
+
+    public ConnecPage()
 	{
-		InitializeComponent();
+        InitializeComponent();
 	}
+
+    private async void Valid_Clicked(object sender, EventArgs e)
+    {
+        mail = Mail.Text;
+        MDP = Password.Text;
+        if ((Application.Current as App).db.SearchUser(mail, MDP))
+        {
+            await Navigation.PushAsync(new RecherPage());
+        }
+        else
+        {
+            ResultSearch.IsVisible = true;
+        }
+    }
 }

notus/notus_vue/InscrPage.xaml

@@ -74,6 +74,7 @@
                 BackgroundColor="#74fabd"
                 TextColor="Black"
                 CornerRadius="10"
+                Clicked="Valid_Clicked"
                 />
 
     </Grid>

notus/notus_vue/InscrPage.xaml.cs

@@ -6,4 +6,9 @@ public partial class InscrPage : ContentPage
     {
         InitializeComponent();
     }
+
+    private async void Valid_Clicked(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new RecherPage());
+    }
 }

notus/notus_vue/MainPage.xaml

@@ -35,13 +35,14 @@
 
         <Button
             CornerRadius="50"
-            Text="Connection"
+            Text="Connexion"
             TextColor="#74fabd"
             FontSize="30"
             Grid.Row="2"
             Grid.Column="1"
             HeightRequest="75"
             BackgroundColor="#4A4A4A"
+            Clicked="Connec_Clicked"
             />
         
         <Button
@@ -53,6 +54,7 @@
             Grid.Column="1"
             HeightRequest="75"
             BackgroundColor="#4A4A4A"
+            Clicked="Inscr_Clicked"
             />
 
     </Grid>

notus/notus_vue/MainPage.xaml.cs

@@ -4,5 +4,16 @@ public partial class MainPage : ContentPage{
 	public MainPage(){
 		InitializeComponent();
 	}
+
+    private async void Connec_Clicked(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new ConnecPage());
+    }
+
+    private async void Inscr_Clicked(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new InscrPage());
+    }
+
 }
 

notus/notus_vue/ProfilPage.xaml

@@ -0,0 +1,74 @@
+<?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/dodnet/2022/maui/toolkit"
+             x:Class="notus.ProfilPage"
+             Title="ProfilPage"
+             BackgroundColor="#1C1C1C">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="1.5*"/>
+        </Grid.RowDefinitions>
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+        <Button
+            Text="Modifier Profil"
+            TextColor="#74fabd"
+            BackgroundColor="#4A4A4A"
+            Grid.Column="1"
+            Grid.Row="4"
+            VerticalOptions="Center"
+            HeightRequest="80"
+            FontSize="30"
+            />
+
+        <Button
+            Text="Modifier Theme"
+            TextColor="#74fabd"
+            BackgroundColor="#4A4A4A"
+            Grid.Column="1"
+            Grid.Row="5"
+            FontSize="30"
+            VerticalOptions="Start"
+            HeightRequest="80"
+            />
+
+        <Label
+            Text="Profil"
+            FontSize="30"
+            HorizontalTextAlignment="Center"
+            VerticalTextAlignment="Center"
+            TextColor="#74fabd"
+            BackgroundColor="#4A4A4A"
+            Grid.Column="1"
+            Grid.Row="3"
+            VerticalOptions="End"
+            HeightRequest="80"
+            />
+        
+        <ImageButton
+            Source="profil.png"
+            Aspect="AspectFit"
+            Grid.Column="1"
+            Grid.Row="2"
+            WidthRequest="550"
+            HeightRequest="250"
+            BackgroundColor="#6E6E6E"
+            CornerRadius="10"
+            Clicked="ProfilClicked"
+            />
+
+    </Grid>
+
+</ContentPage>

notus/notus_vue/ProfilPage.xaml.cs

@@ -0,0 +1,17 @@
+using Microsoft.Maui.Controls;
+using Biblioteque_de_Class;
+using Notus_Persistance;
+
+namespace notus;
+
+public partial class ProfilPage : ContentPage
+{
+	public ProfilPage()
+	{
+        InitializeComponent();
+    }
+    void ProfilClicked(System.Object sender, System.EventArgs e)
+    {
+
+    }
+}

notus/notus_vue/RecherPage.xaml

@@ -34,7 +34,7 @@
             />
         
         <ImageButton
-            Source="profil.png"
+            Source="profl.png"
             Aspect="AspectFit"
             Grid.Column="4"
             Grid.Row="0"
@@ -44,6 +44,7 @@
             HeightRequest="120"
             BackgroundColor="#6E6E6E"
             CornerRadius="10"
+            Clicked="Profil_Clicked"
             />
         
         <ImageButton
@@ -60,8 +61,8 @@
             CornerRadius="50"
             />
         
-        <Label
+        <Label x:Name="NomNote"
-            Text="Nom de la note"
+            Text="{Binding Name}"
             Grid.Column="1"
             Grid.Row="0"
             TextColor="#74fabd"
@@ -72,7 +73,6 @@
             HeightRequest="50"
             HorizontalOptions="Center"
             VerticalOptions="Start"
-            BindingContext="NomDeLaNoteSelected"
             />
 
         <ImageButton
@@ -104,10 +104,11 @@
             PlaceholderColor="#74fabd"
             />
 
-        <VerticalStackLayout
+        <ListView x:Name="ListNote"
             Grid.Column="0"
+            Grid.Row="2"
             Grid.RowSpan="5"
-            BindingContext="ARefaire"
+            ItemsSource="{Binding NoteList}"
             />
 
         <Editor

notus/notus_vue/RecherPage.xaml.cs

@@ -1,24 +1,23 @@
+using Microsoft.Maui.Controls;
+using Biblioteque_de_Class;
+using Notus_Persistance;
+
+
 namespace notus;
 
 public partial class RecherPage : ContentPage
 {
-	public RecherPage()
+    PersistenceManager manager = (Application.Current as App).manager;
+    public RecherPage()
 	{
+        manager.LoadDatabaseData();
 		InitializeComponent();
+        ListNote.BindingContext = manager;
+        NomNote.BindingContext = manager;
 	}
 
-	void ProfilClicked()
+    private async void Profil_Clicked(object sender, EventArgs e)
-	{
+    {
-        
+        await Navigation.PushAsync(new ProfilPage());
-    }
-
-	void EditCLicked()
-	{
-        
-    }
-
-	void SuppClicked()
-	{
-        
     }
 }

notus/notus_vue/notus_vue.csproj

@@ -53,6 +53,14 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <ProjectReference Include="..\Biblioteque_de_Class\Biblioteque_de_Class.csproj" />
+	  <ProjectReference Include="..\Notus_Persistence\Notus_Persistance.csproj" />
+	  <ProjectReference Include="..\Tests\Notus_UnitTest_Database\Notus_UnitTest_Database.csproj" />
+	  <ProjectReference Include="..\Tests\Notus_UnitTest_Note\Notus_UnitTest_Note.csproj" />
+	  <ProjectReference Include="..\Tests\Notus_UnitTest_User\Notus_UnitTest_User.csproj" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <Compile Update="ConnecPage.xaml.cs">
 	    <DependentUpon>ConnecPage.xaml</DependentUpon>
@@ -60,6 +68,9 @@
 	  <Compile Update="InscrPage.xaml.cs">
 	    <DependentUpon>InscrPage.xaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="ProfilPage.xaml.cs">
+	    <DependentUpon>ProfilPage.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="RecherPage.xaml.cs">
 	    <DependentUpon>RecherPage.xaml</DependentUpon>
 	  </Compile>
@@ -72,6 +83,9 @@
 	  <MauiXaml Update="InscrPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="ProfilPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="RecherPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>