diff --git a/notus/Biblioteque_de_Class/Database.cs b/notus/Biblioteque_de_Class/Database.cs index 980f4f9..685e232 100644 --- a/notus/Biblioteque_de_Class/Database.cs +++ b/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 ThemeList { get; private set; } [DataMember] - public List UserList { get; private set; } + private List UserList = null!; + public List Users { get => UserList; private set + { + UserList = value; + } + } + [DataMember] + private Dictionary> AddedThemeList; public Database() { diff --git a/notus/Biblioteque_de_Class/PersistenceManager.cs b/notus/Biblioteque_de_Class/PersistenceManager.cs index e68f7e1..4d06776 100644 --- a/notus/Biblioteque_de_Class/PersistenceManager.cs +++ b/notus/Biblioteque_de_Class/PersistenceManager.cs @@ -1,52 +1,52 @@ 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 Database(); + private readonly IManager persistence; public PersistenceManager(IManager pers) { - persistence = pers; + persistence = pers; + } + + public void SaveDatabaseData(Database database) + { + persistence.SaveDatabaseData(database.UserList); } - public void SaveDatabaseData(Database database) - { - persistence.SaveDatabaseData(database.UserList); - } - public void SaveDefaultData(Database database) { persistence.SaveDefaultData(database.ThemeList, database.DefaultLogoList); - } - - public Database LoadDatabaseData() - { - db.SetUserList(persistence.LoadDatabaseData()); - db.SetDefaultThemeList(persistence.LoadDefaultTheme()); - db.SetDefaultLogoList(persistence.LoadDefaultLogo()); - return db; - } - - public Database GetOnlyDatabaseUser() + } + + public Database LoadDatabaseData() { db.SetUserList(persistence.LoadDatabaseData()); + db.SetDefaultThemeList(persistence.LoadDefaultTheme()); + db.SetDefaultLogoList(persistence.LoadDefaultLogo()); return db; - } - - public Database GetOnlyDatabaseDefaultTheme() + } + + public Database GetOnlyDatabaseUser() + { + db.SetUserList(persistence.LoadDatabaseData()); + return db; + } + + public Database GetOnlyDatabaseDefaultTheme() { db.SetDefaultThemeList(persistence.LoadDefaultTheme()); return db; - } - - public Database GetOnlyDatabaseDefaultLogo() + } + + public Database GetOnlyDatabaseDefaultLogo() { db.SetDefaultLogoList(persistence.LoadDefaultLogo()); return db; - } - } -} + } + } +} diff --git a/notus/Biblioteque_de_Class/User.cs b/notus/Biblioteque_de_Class/User.cs index d6bcc30..dad2a6c 100644 --- a/notus/Biblioteque_de_Class/User.cs +++ b/notus/Biblioteque_de_Class/User.cs @@ -43,7 +43,6 @@ namespace Biblioteque_de_Class NoteTagged = new Dictionary>(); AddedTheme = new List(); } - public override string ToString() => $"username: {Username}\nemail: {Email}\npassword: {Password}\nOwned notes: {NoteList.Count}"; /// diff --git a/notus/Notus_Console/Program.cs b/notus/Notus_Console/Program.cs index 9b728b1..d021b66 100644 --- a/notus/Notus_Console/Program.cs +++ b/notus/Notus_Console/Program.cs @@ -7,8 +7,8 @@ using System.Security.Cryptography; using System.Text; // load database -PersistenceManager managerLoad = new(new ToXML()); -Database db = managerLoad.LoadDatabaseData(); +PersistenceManager manager = new PersistenceManager(new Stub()); +Database db = manager.LoadDatabaseData(); //save database PersistenceManager managerSave = new(new ToXML()); diff --git a/notus/notus.sln b/notus/notus.sln index d225530..6fa0582 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/App.xaml.cs b/notus/notus_vue/App.xaml.cs index cb06065..f6bc467 100644 --- a/notus/notus_vue/App.xaml.cs +++ b/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(); - - MainPage = new AppShell(); + db = manager.LoadDatabaseData(); + MainPage = new AppShell(); } 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/ConnecPage.xaml b/notus/notus_vue/ConnecPage.xaml index 2986e66..8e5a0aa 100644 --- a/notus/notus_vue/ConnecPage.xaml +++ b/notus/notus_vue/ConnecPage.xaml @@ -39,7 +39,7 @@ FontFamily="strong" /> - - + +