diff --git a/vs/LO23/Client/App.xaml b/vs/LO23/Client/App.xaml
index 4d35622b333bf1654819984316e93e9a0d9cdae4..628c7352b8e68b91352da90e22bf2275fabd5099 100644
--- a/vs/LO23/Client/App.xaml
+++ b/vs/LO23/Client/App.xaml
@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Client"
- StartupUri="MainWindow.xaml">
+ Startup="App_Startup">
<Application.Resources>
</Application.Resources>
diff --git a/vs/LO23/Client/App.xaml.cs b/vs/LO23/Client/App.xaml.cs
index 50d72be9dbf559a6b9834299fa4d443a287177c1..b19adb739a36f806278bd6759c6a30864950438f 100644
--- a/vs/LO23/Client/App.xaml.cs
+++ b/vs/LO23/Client/App.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using Client.data;
+using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
@@ -13,5 +14,11 @@ namespace Client
/// </summary>
public partial class App : Application
{
+ private DataCore dataCore;
+
+ private void App_Startup(object sender, StartupEventArgs e)
+ {
+ dataCore = new DataCore();
+ }
}
}
diff --git a/vs/LO23/Client/Client.csproj b/vs/LO23/Client/Client.csproj
index e4af624dfcb0da3ea1edd40fa58ffd28295e3567..4a4160f10c0dd50ecd08615ce3f2fa02f4146019 100644
--- a/vs/LO23/Client/Client.csproj
+++ b/vs/LO23/Client/Client.csproj
@@ -65,9 +65,10 @@
</Compile>
<Compile Include="comm\Class1.cs" />
<Compile Include="data\Class1.cs" />
+ <Compile Include="data\Data_Client_ctrl.cs" />
<Compile Include="data\DataCore.cs" />
<Compile Include="data\Comm_calls_Data_Client_Impl.cs" />
- <Compile Include="data\Data_Client_ctrl.cs" />
+ <Compile Include="data\2.cs" />
<Compile Include="data\IHM_Main_calls_Data_Client_Impl.cs" />
<Compile Include="data\Programtest.cs" />
<Compile Include="ihm-game\Class1.cs" />
@@ -95,6 +96,7 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
+ <None Include="bin\Debug\Client.exe.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -103,15 +105,18 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
- <ItemGroup>
- <Content Include="bin\Debug\Shared.dll" />
- <Content Include="bin\Debug\Shared.pdb" />
- </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Shared\Shared.csproj">
<Project>{deedb05f-755c-4573-a317-e84f11529284}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup />
+ <ItemGroup>
+ <Content Include="bin\Debug\Client.exe" />
+ <Content Include="bin\Debug\Client.pdb" />
+ <Content Include="bin\Debug\Shared.dll" />
+ <Content Include="bin\Debug\Shared.pdb" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
diff --git a/vs/LO23/Client/data/2.cs b/vs/LO23/Client/data/2.cs
new file mode 100644
index 0000000000000000000000000000000000000000..5e296dff4d6dbc5d31df8a406c47290cb1dbb959
--- /dev/null
+++ b/vs/LO23/Client/data/2.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Client.Data
+{
+ public class Data_Client
+ {
+ private Comm_calls_Data_Client_impl implInterfaceForComm;
+
+ public Data_Client()
+ {
+ this.implInterfaceForComm = new Comm_calls_Data_Client_impl();
+ }
+
+ public Comm_calls_Data_Client_impl getImplInterfaceForComm()
+ {
+ return implInterfaceForComm;
+ }
+ }
+}
diff --git a/vs/LO23/Client/data/DataCore.cs b/vs/LO23/Client/data/DataCore.cs
index 4539d7eb6d3b77ea8e849c4203d783ed3c6f878a..746e873cd5d08e85bb8872d1298d7173e25cdcaf 100644
--- a/vs/LO23/Client/data/DataCore.cs
+++ b/vs/LO23/Client/data/DataCore.cs
@@ -23,7 +23,7 @@ namespace Client.data
{
//Association des vues et de leur view model
- mainWindow.Show();
+ Console.WriteLine("hello bor");
}
}
diff --git a/vs/LO23/Client/data/Data_Client_ctrl.cs b/vs/LO23/Client/data/Data_Client_ctrl.cs
index 3b5ccd1fc775fd946e742fea8d23223eefb075dd..79f8cbe1cf78cdfbb380d52db2949dfdea4cdee3 100644
--- a/vs/LO23/Client/data/Data_Client_ctrl.cs
+++ b/vs/LO23/Client/data/Data_Client_ctrl.cs
@@ -1,16 +1,21 @@
+using Client.Data;
using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
-namespace Client.Data
+namespace Client.data
{
- public class Data_Client
+ public class Data_Client_ctrl
{
private Comm_calls_Data_Client_impl implInterfaceForComm;
- public Data_Client()
+ public Data_Client_ctrl()
{
this.implInterfaceForComm = new Comm_calls_Data_Client_impl();
}
-
+
public Comm_calls_Data_Client_impl getImplInterfaceForComm()
{
return implInterfaceForComm;
diff --git a/vs/LO23/Client/data/IHM_Main_calls_Data_Client_Impl.cs b/vs/LO23/Client/data/IHM_Main_calls_Data_Client_Impl.cs
index 829f0e23b5f0b30f339852fc8e8e507be9e6545d..5c2fcb03edddd284713788caf70b46226a517917 100644
--- a/vs/LO23/Client/data/IHM_Main_calls_Data_Client_Impl.cs
+++ b/vs/LO23/Client/data/IHM_Main_calls_Data_Client_Impl.cs
@@ -1,4 +1,5 @@
using System;
+using Client.data;
//using user1;
public class IHM_Main_calls_Data_Client_Impl : Data_Client_ctrl
@@ -8,7 +9,7 @@ public class IHM_Main_calls_Data_Client_Impl : Data_Client_ctrl
}
-
+ /*
Boolean authenticate(logint string, passwordt string)
{
int i = 0;
@@ -25,6 +26,6 @@ public class IHM_Main_calls_Data_Client_Impl : Data_Client_ctrl
user = getLigthUserdeUser(login);
}
-
+ */
}
diff --git a/vs/LO23/Client/data/Programtest.cs b/vs/LO23/Client/data/Programtest.cs
index 74b3b57ffcd044d7a52f716b1033b2d99b50935f..ea76cbe07148e6ad8aeb6d01ab070a66903cd242 100644
--- a/vs/LO23/Client/data/Programtest.cs
+++ b/vs/LO23/Client/data/Programtest.cs
@@ -3,7 +3,7 @@
namespace network_test
{
class Program
- {
+ {/*
static void Main(string[] args)
{
@@ -20,7 +20,7 @@ namespace network_test
Console.WriteLine("hello nina ");
}
- s
- }
+
+ }*/
}
}
diff --git a/vs/LO23/Shared/data/Deck.cs b/vs/LO23/Shared/data/Deck.cs
index 4ead8713612e65aeaa0d4f9ade3d867a988084ad..7a73283f5c59cdfbbc4125dd7e682ddc9a888e29 100644
--- a/vs/LO23/Shared/data/Deck.cs
+++ b/vs/LO23/Shared/data/Deck.cs
@@ -1,5 +1,5 @@
using System;
-using Card;
+using static Card;
public class Deck
{
diff --git a/vs/LO23/Shared/data/LightGame.cs b/vs/LO23/Shared/data/LightGame.cs
index a458980e16deae197d53a40669936e82374b728a..633279a2c8965f6ed92072ad77109ab4ce903e9a 100644
--- a/vs/LO23/Shared/data/LightGame.cs
+++ b/vs/LO23/Shared/data/LightGame.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Shared.data
{
- enum GameStatus : ushort
+ public enum GameStatus : ushort
{
lobby = 0,
running = 1,
@@ -14,7 +14,7 @@ namespace Shared.data
finished = 3
}
- class LightGame
+ public class LightGame
{
int id { get; set; }
GameStatus status { get; set; }
diff --git a/vs/LO23/Shared/data/Player.cs b/vs/LO23/Shared/data/Player.cs
index 32ff7e6156b7c21359cc569991c11373480edc76..24acaa90b58b63cc06a74e2a202bb8acb015f506 100644
--- a/vs/LO23/Shared/data/Player.cs
+++ b/vs/LO23/Shared/data/Player.cs
@@ -1,5 +1,5 @@
using System;
-using Card;
+using static Card;
enum PlayerRole : ushort {
smallBlind = 1,