diff --git a/notus/Biblioteque_de_Class/PersistenceManager.cs b/notus/Biblioteque_de_Class/PersistenceManager.cs
index bee3338..af6aea5 100644
--- a/notus/Biblioteque_de_Class/PersistenceManager.cs
+++ b/notus/Biblioteque_de_Class/PersistenceManager.cs
@@ -1,11 +1,11 @@
using Microsoft.VisualBasic;
-namespace Biblioteque_de_Class
-{
- public class PersistenceManager
- {
- private Database db = new();
-
+namespace Biblioteque_de_Class
+{
+ public class PersistenceManager
+ {
+ private Database db = new();
+
private readonly IManager persistence;
public PersistenceManager(IManager pers)
@@ -13,17 +13,17 @@ namespace Biblioteque_de_Class
persistence = pers;
}
- public void SaveDatabaseData(Database database)
- {
- persistence.SaveDatabaseData(database.GetUserList(), database.GetAddedThemeFromUser());
- }
-
- public Database LoadDatabaseData()
- {
- db = persistence.LoadDatabaseData();
- db.SetDefaultThemeList(persistence.LoadDefaultTheme());
- db.SetDefaultLogoList(persistence.LoadDefaultLogo());
- return db;
- }
- }
-}
+ public void SaveDatabaseData(Database database)
+ {
+ persistence.SaveDatabaseData(database.GetUserList(), database.GetAddedThemeFromUser());
+ }
+
+ public Database LoadDatabaseData()
+ {
+ db = persistence.LoadDatabaseData();
+ //db.SetDefaultThemeList(persistence.LoadDefaultTheme());
+ //db.SetDefaultLogoList(persistence.LoadDefaultLogo());
+ return db;
+ }
+ }
+}
diff --git a/notus/Notus_Persistence/Stub.cs b/notus/Notus_Persistence/Stub.cs
index fb8ed2c..226fb52 100644
--- a/notus/Notus_Persistence/Stub.cs
+++ b/notus/Notus_Persistence/Stub.cs
@@ -28,27 +28,35 @@ namespace Notus_Persistance
database.AddUser(new User("Nicolas", "leHeros@gmail.com", "Feur"));
database.AddUser(new User("Benjamin", "labsent@gmail.com", "Moto2005"));
database.AddUser(new User("Liam", "liammonchanin@gmail.com", "Baguette"));
- database.AddUser(new User("Brigitte", "Macroutte@gmail.com", "49Trois"));
+ database.AddUser(new User("Brigitte", "Brigitte@gmail.com", "493"));
// add some notes and tags to go faster
- foreach(User user in database.GetUserList().Where(x => x.GetUsername().Contains("m")))
+ foreach (User user in database.GetUserList().Where(x => x.GetUsername().Contains("a")))
{
user.CreateNote("Note 1", "");
user.CreateNote("Note 2", "");
user.CreateNote("Note 3", "");
- user.CreateTag("Tag 1","#FA0034");
+ user.CreateTag("Tag 1", "#FA0034");
user.CreateTag("Tag 2", "#2500A4");
}
// add note to user for sharing note test mixed with tag
- uselect = (User)database.GetUserList().Where(x => x.GetUsername() == "Nicolas");
- uselect.CreateNote("Note 4", "Logo_1");
- uselect.CreateTag("Tag 3", "#00FF00");
- nselect = (Note)uselect.GetNoteList().Where(x => x.GetName() == "Note 4");
- uselect.AddTagToNoteList(nselect, (Tags)uselect.GetTagList().Where(x => x.GetName() == "Tag 3"));
- nselect.AddCollaborator(uselect,(User)database.GetUserList().Where(x => x.GetUsername() == "Benjamin"));
- uselect = (User)database.GetUserList().Where(x => x.GetUsername() == "Benjamin");
- uselect.CreateTag("Tag 4", "#FF0000");
+ foreach (User user in database.GetUserList())
+ {
+ if (user.GetEmail().Equals("leHeros@gmail.com") && user.GetUsername().Equals("Nicolas") && user.GetPassword().Equals("Feur"))
+ {
+ uselect = user;
+ uselect.CreateNote("Note 4", "Logo_1");
+ uselect.CreateTag("Tag 3", "#00FF00");
+ //nselect = (Note)uselect.GetNoteList().Where(x => x.GetName() == "Note 4");
+ //uselect.AddTagToNoteList(nselect, (Tags)uselect.GetTagList().Where(x => x.GetName() == "Tag 3"));
+ //nselect.AddCollaborator(uselect, (User)database.GetUserList().Where(x => x.GetUsername() == "Benjamin"));
+ //uselect = (User)database.GetUserList().Where(x => x.GetUsername() == "Benjamin");
+ uselect.CreateTag("Tag 4", "#FF0000");
+ }
+
+ }
+
// add some default logos and themes
database.GetDefaultLogoList().Add(new Logo("Logo_1", "logo"));
diff --git a/notus/notus.sln b/notus/notus.sln
index 077c4f2..df0d5a1 100644
--- a/notus/notus.sln
+++ b/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}"
diff --git a/notus/notus_vue/AppShell.xaml b/notus/notus_vue/AppShell.xaml
index 0ce0df6..15947ae 100644
--- a/notus/notus_vue/AppShell.xaml
+++ b/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">
-
+
+
diff --git a/notus/notus_vue/InscrPage.xaml b/notus/notus_vue/InscrPage.xaml
index 59d3be8..5728e33 100644
--- a/notus/notus_vue/InscrPage.xaml
+++ b/notus/notus_vue/InscrPage.xaml
@@ -1,81 +1,81 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/notus/notus_vue/InscrPage.xaml.cs b/notus/notus_vue/InscrPage.xaml.cs
index 5f9da2a..6f2b743 100644
--- a/notus/notus_vue/InscrPage.xaml.cs
+++ b/notus/notus_vue/InscrPage.xaml.cs
@@ -1,9 +1,9 @@
-namespace notus;
-
-public partial class InscrPage : ContentPage
-{
- public InscrPage()
- {
- InitializeComponent();
- }
+namespace notus;
+
+public partial class InscrPage : ContentPage
+{
+ public InscrPage()
+ {
+ InitializeComponent();
+ }
}
\ No newline at end of file
diff --git a/notus/notus_vue/ProfilPage.xaml b/notus/notus_vue/ProfilPage.xaml
new file mode 100644
index 0000000..b36ba46
--- /dev/null
+++ b/notus/notus_vue/ProfilPage.xaml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/notus/notus_vue/ProfilPage.xaml.cs b/notus/notus_vue/ProfilPage.xaml.cs
new file mode 100644
index 0000000..c20fefa
--- /dev/null
+++ b/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)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/notus/notus_vue/RecherPage.xaml b/notus/notus_vue/RecherPage.xaml
index 59947ce..9884e3d 100644
--- a/notus/notus_vue/RecherPage.xaml
+++ b/notus/notus_vue/RecherPage.xaml
@@ -1,133 +1,133 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/notus/notus_vue/RecherPage.xaml.cs b/notus/notus_vue/RecherPage.xaml.cs
index ea9ed20..6e44e89 100644
--- a/notus/notus_vue/RecherPage.xaml.cs
+++ b/notus/notus_vue/RecherPage.xaml.cs
@@ -1,24 +1,19 @@
-namespace notus;
-
-public partial class RecherPage : ContentPage
-{
- public RecherPage()
- {
- InitializeComponent();
- }
-
- void ProfilClicked()
+using Microsoft.Maui.Controls;
+using Biblioteque_de_Class;
+using Notus_Persistance;
+
+
+namespace notus;
+
+public partial class RecherPage : ContentPage
+{
+ public PersistenceManager manager { get; private set; } = new PersistenceManager(new Stub());
+ public RecherPage()
{
-
- }
-
- void EditCLicked()
- {
-
- }
-
- void SuppClicked()
- {
-
- }
+ manager.LoadDatabaseData();
+ InitializeComponent();
+ ListNote.BindingContext = manager;
+ NomNote.BindingContext = manager;
+ }
+
}
\ No newline at end of file
diff --git a/notus/notus_vue/notus_vue.csproj b/notus/notus_vue/notus_vue.csproj
index b63ffc1..198a8ca 100644
--- a/notus/notus_vue/notus_vue.csproj
+++ b/notus/notus_vue/notus_vue.csproj
@@ -53,12 +53,23 @@
+
+
+
+
+
+
+
+
ConnecPage.xaml
-
- InscrPage.xaml
+
+ InscrPage.xaml
+
+
+ ProfilPage.xaml
RecherPage.xaml
@@ -69,8 +80,11 @@
MSBuild:Compile
-
- MSBuild:Compile
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
MSBuild:Compile