diff --git a/LOLAPP/LOLAPP.sln b/LOLAPP/LOLAPP.sln index 63c19f9..46a99d1 100644 --- a/LOLAPP/LOLAPP.sln +++ b/LOLAPP/LOLAPP.sln @@ -5,6 +5,10 @@ VisualStudioVersion = 17.0.31611.283 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LOLAPP", "LOLAPP\LOLAPP.csproj", "{736A464D-D35B-47BD-AC29-04E11BFF186F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "Models\Models.csproj", "{495D58B1-27F0-4CF3-BA9B-426E4D3E8923}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stub", "Stub\Stub.csproj", "{B4BA7D18-1D1E-453D-B149-9E765428AD47}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -17,6 +21,14 @@ Global {736A464D-D35B-47BD-AC29-04E11BFF186F}.Release|Any CPU.ActiveCfg = Release|Any CPU {736A464D-D35B-47BD-AC29-04E11BFF186F}.Release|Any CPU.Build.0 = Release|Any CPU {736A464D-D35B-47BD-AC29-04E11BFF186F}.Release|Any CPU.Deploy.0 = Release|Any CPU + {495D58B1-27F0-4CF3-BA9B-426E4D3E8923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {495D58B1-27F0-4CF3-BA9B-426E4D3E8923}.Debug|Any CPU.Build.0 = Debug|Any CPU + {495D58B1-27F0-4CF3-BA9B-426E4D3E8923}.Release|Any CPU.ActiveCfg = Release|Any CPU + {495D58B1-27F0-4CF3-BA9B-426E4D3E8923}.Release|Any CPU.Build.0 = Release|Any CPU + {B4BA7D18-1D1E-453D-B149-9E765428AD47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4BA7D18-1D1E-453D-B149-9E765428AD47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4BA7D18-1D1E-453D-B149-9E765428AD47}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4BA7D18-1D1E-453D-B149-9E765428AD47}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LOLAPP/LOLAPP/App.xaml.cs b/LOLAPP/LOLAPP/App.xaml.cs index aea6b93..0ea5459 100644 --- a/LOLAPP/LOLAPP/App.xaml.cs +++ b/LOLAPP/LOLAPP/App.xaml.cs @@ -1,5 +1,6 @@ using LOLAPP.DataContractPersistance; -using LOLAPP.Modele; +using Models; +using Stub; using System.Collections.Generic; using System.Diagnostics; @@ -8,7 +9,7 @@ namespace LOLAPP; public partial class App : Application { - public Manager MyManager { get; private set; } = new Manager(new Stub()); + public Manager MyManager { get; private set; } = new Manager(new Stub.Stub()); public string FileNameC { get; set; } = "champions.xml"; public string FileNameU { get; set; } = "utilisateur.xml"; public string FilePath { get; set; } = FileSystem.AppDataDirectory; diff --git a/LOLAPP/LOLAPP/AppShell.xaml b/LOLAPP/LOLAPP/AppShell.xaml index 17ee620..9acce49 100644 --- a/LOLAPP/LOLAPP/AppShell.xaml +++ b/LOLAPP/LOLAPP/AppShell.xaml @@ -11,5 +11,17 @@ Title="Home" ContentTemplate="{DataTemplate view:Main}" Route="MainPage" /> + + + diff --git a/LOLAPP/LOLAPP/DataContractPersistance/DataContract.cs b/LOLAPP/LOLAPP/DataContractPersistance/DataContract.cs index 833975f..3f2e4e6 100644 --- a/LOLAPP/LOLAPP/DataContractPersistance/DataContract.cs +++ b/LOLAPP/LOLAPP/DataContractPersistance/DataContract.cs @@ -1,4 +1,4 @@ -using LOLAPP.Modele; +using Models; using System.Diagnostics; using System.Runtime.Serialization; using System.Xml; diff --git a/LOLAPP/LOLAPP/DataContractPersistance/DataToPersist.cs b/LOLAPP/LOLAPP/DataContractPersistance/DataToPersist.cs index 5952ab0..acd3c62 100644 --- a/LOLAPP/LOLAPP/DataContractPersistance/DataToPersist.cs +++ b/LOLAPP/LOLAPP/DataContractPersistance/DataToPersist.cs @@ -1,4 +1,4 @@ -using LOLAPP.Modele; +using Models; using System; using System.Collections.Generic; using System.Linq; diff --git a/LOLAPP/LOLAPP/LOLAPP.csproj b/LOLAPP/LOLAPP/LOLAPP.csproj index 24af873..bc16426 100644 --- a/LOLAPP/LOLAPP/LOLAPP.csproj +++ b/LOLAPP/LOLAPP/LOLAPP.csproj @@ -1,7 +1,7 @@  - net7.0-android;net7.0-ios;net7.0-maccatalyst + net7.0; $(TargetFrameworks);net7.0-windows10.0.19041.0 @@ -52,10 +52,19 @@ + + + Login.xaml + + + MSBuild:Compile + + MSBuild:Compile + MSBuild:Compile @@ -64,4 +73,13 @@ + + + + + + + + + diff --git a/LOLAPP/LOLAPP/View/Login.xaml b/LOLAPP/LOLAPP/View/Login.xaml new file mode 100644 index 0000000..cecfd43 --- /dev/null +++ b/LOLAPP/LOLAPP/View/Login.xaml @@ -0,0 +1,14 @@ + + +