From 3aaff90178e1176fcabbd88fe238ecb4be9e4475 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 15:14:48 +0200
Subject: [PATCH 1/7] [EDIT] fixed some user stuff

---
 Server/Models/ServerCommunication.cs | 4 +++-
 SharedClientServer/Lobby.cs          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index 8bfdcc1..afc9a14 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -18,6 +18,7 @@ namespace Server.Models
         public List<Lobby> lobbies;
         private Dictionary<Lobby, List<ServerClient>> serverClientsInlobbies;
         public Action newClientAction;
+        
 
         /// <summary>
         /// use a padlock object to make sure the singleton is thread-safe
@@ -132,7 +133,8 @@ namespace Server.Models
                     {
                         foreach(ServerClient sc in serverClients)
                         {
-                            if (sc.Username == username)
+                            
+                            if (sc.Username == user.Username)
                             {
                                 serverClientsInlobbies[l].Add(sc);
                                 break;
diff --git a/SharedClientServer/Lobby.cs b/SharedClientServer/Lobby.cs
index 6961ca6..06dec00 100644
--- a/SharedClientServer/Lobby.cs
+++ b/SharedClientServer/Lobby.cs
@@ -41,7 +41,7 @@ namespace Client
             succes = false;
             if (_users.Count < _maxPlayers)
             {
-                _users.Add(new User(username, 0));
+                _users.Add(new User(username, 0,false));
                 succes = true;
             }
         }

From 1e11bc5416c64f4b4a8960ccf0f57789632e1845 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 15:21:11 +0200
Subject: [PATCH 2/7] [FIX] removed bad getter for model

---
 Client/ViewModels/ViewModel.cs | 3 ---
 Client/Views/MainWindow.xaml   | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index 241b520..5498197 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -43,9 +43,6 @@ namespace Client
         {
             get
             {
-                if (_model == null)
-                    _model = new Model();
-
                 return _model;
             }
 
diff --git a/Client/Views/MainWindow.xaml b/Client/Views/MainWindow.xaml
index 7830f07..64a1fb1 100644
--- a/Client/Views/MainWindow.xaml
+++ b/Client/Views/MainWindow.xaml
@@ -12,7 +12,7 @@
             <RowDefinition/>
         </Grid.RowDefinitions>
 
-        
+
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
             <ColumnDefinition/>
@@ -34,7 +34,6 @@
             <Label Grid.Row="0" Content="This client information:" FontSize="17"/>
 
             <Label Grid.Row="1" Grid.Column="0" Content="Your username:" FontSize="15" VerticalAlignment="Center"/>
-            <TextBox Name="usernameTextbox" Grid.Row="1" Grid.Column="1" MaxLength="10" FontSize="15" VerticalAlignment="Center"/>
 
             <Label Grid.Row="2" Grid.Column="0" Content="Which color you want to be:" FontSize="15" VerticalAlignment="Center"/>
             <ComboBox Name="colorSelection" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" FontSize="15">
@@ -46,8 +45,7 @@
                 <ComboBoxItem Content="ORANGE"/>
                 <ComboBoxItem Content="PURPLE"/>
             </ComboBox>
-
-            <Label Grid.Row="3" Name="testLabel" FontSize="15" VerticalAlignment="Center"/>
+            <Label Content="{Binding Username}" Grid.Column="1" HorizontalAlignment="Center" Margin="0,12,0,0" VerticalAlignment="Top" Grid.Row="1"/>
 
         </Grid>
 

From 78c1aad696e5943e4668174d73bf4a827f3bca2a Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 15:32:50 +0200
Subject: [PATCH 3/7] [ADD] new constructor for user

---
 Client/ViewModels/ViewModel.cs  | 6 ++++++
 Client/Views/MainWindow.xaml    | 6 ++++--
 Client/Views/MainWindow.xaml.cs | 1 -
 Server/Models/ServerClient.cs   | 1 +
 SharedClientServer/User.cs      | 7 +++++++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index 5498197..d55ba75 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -5,6 +5,7 @@ using System.ComponentModel;
 using System.Text;
 using System.Windows.Input;
 using SharedClientServer;
+using System.Diagnostics;
 
 namespace Client
 {
@@ -58,5 +59,10 @@ namespace Client
             get { return _lobbies; }
             set { _lobbies = value; }
         }
+
+        public void OnHostButtonClick()
+        {
+            Debug.WriteLine("Click host button");
+        }
     }
 }
diff --git a/Client/Views/MainWindow.xaml b/Client/Views/MainWindow.xaml
index 64a1fb1..b3221df 100644
--- a/Client/Views/MainWindow.xaml
+++ b/Client/Views/MainWindow.xaml
@@ -45,7 +45,9 @@
                 <ComboBoxItem Content="ORANGE"/>
                 <ComboBoxItem Content="PURPLE"/>
             </ComboBox>
-            <Label Content="{Binding Username}" Grid.Column="1" HorizontalAlignment="Center" Margin="0,12,0,0" VerticalAlignment="Top" Grid.Row="1"/>
+
+            <Label Grid.Row="3" Name="testLabel" FontSize="15" VerticalAlignment="Center"/>
+            <Label Content="place username here" Grid.Column="1" HorizontalAlignment="Center" Margin="0,12,0,0" VerticalAlignment="Top" Grid.Row="1"/>
 
         </Grid>
 
@@ -66,7 +68,7 @@
                 <RowDefinition Height="50"/>
             </Grid.RowDefinitions>
             <Button Name="joinButton" Grid.Row="0" Content="join a selected lobby" Click="Button_Click" Width="200" Height="40" HorizontalAlignment="Left" Margin="10, 0, 0, 0"/>
-            <Button Name="hostButton" Grid.Row="1" Content="host a new lobby" Command="{Binding ...}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
+            <Button Name="hostButton" Grid.Row="1" Content="host a new lobby" Command="{Binding Path=OnHostButtonClick}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
         </Grid>
 
     </Grid>
diff --git a/Client/Views/MainWindow.xaml.cs b/Client/Views/MainWindow.xaml.cs
index 70bb34a..ae75d9f 100644
--- a/Client/Views/MainWindow.xaml.cs
+++ b/Client/Views/MainWindow.xaml.cs
@@ -33,7 +33,6 @@ namespace Client
             if(lobbySelected != null)
             {
                 testLabel.Content = lobbySelected.ID;
-                usernameTextbox.IsEnabled = false;
                 colorSelection.IsEnabled = false;
                 joinButton.IsEnabled = false;
                 hostButton.IsEnabled = false;
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index ab8af5b..eb07ade 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -16,6 +16,7 @@ namespace Server.Models
         private byte[] buffer = new byte[1024];
         private byte[] totalBuffer = new byte[1024];
         private int totalBufferReceived = 0;
+        public User user;
         
 
         /// <summary>
diff --git a/SharedClientServer/User.cs b/SharedClientServer/User.cs
index f25efbf..6e95f64 100644
--- a/SharedClientServer/User.cs
+++ b/SharedClientServer/User.cs
@@ -17,6 +17,13 @@ namespace SharedClientServer
             _host = host;
         }
 
+        public User(string username)
+        {
+            _username = username;
+            _score = 0;
+            _host = false;
+        }
+
         public string Username
         {
             get { return _username; }

From d9f2b97d3eff2b1779bf73f182a803732292c248 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 15:46:28 +0200
Subject: [PATCH 4/7] [ADD] added method for generating a message

---
 Server/Models/ServerClient.cs     | 10 +++++-----
 SharedClientServer/JSONConvert.cs | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index eb07ade..b82e4f4 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -10,13 +10,12 @@ namespace Server.Models
 {
     class ServerClient : ObservableObject
     {
-        public string Username { get; set; }
         private TcpClient tcpClient;
         private NetworkStream stream;
         private byte[] buffer = new byte[1024];
         private byte[] totalBuffer = new byte[1024];
         private int totalBufferReceived = 0;
-        public User user;
+        public User User { get; set; }
         
 
         /// <summary>
@@ -85,7 +84,7 @@ namespace Server.Models
         /// <param name="message">the incoming message</param>
         private void HandleIncomingMessage(byte[] message)
         {
-            Debug.WriteLine($"Got message from {Username} : {message}");
+            Debug.WriteLine($"Got message from {User?.Username} : {message}");
             byte id = message[0];
             byte[] payload = new byte[message.Length - 1];
             Array.Copy(message,1,payload,0,message.Length-1);
@@ -97,8 +96,9 @@ namespace Server.Models
                     string uName = JSONConvert.GetUsernameLogin(message);
                     if (uName != null)
                     {
-                        Username = uName;
-                        Debug.WriteLine("[SERVERCLIENT] set username to " + Username);
+                        User = new User(uName);
+                        User.Username = uName;
+                        Debug.WriteLine("[SERVERCLIENT] set username to " + uName);
                         
                     }
                     break;
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index c62b9ae..1eb5c04 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -11,6 +11,7 @@ namespace SharedClientServer
         {
             string msg = Encoding.ASCII.GetString(json);
             dynamic payload = JsonConvert.DeserializeObject(msg);
+            
             return (payload.username, payload.message);
         }
 
@@ -19,5 +20,22 @@ namespace SharedClientServer
             dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
             return payload.username;
         }
+
+        /// <summary>
+        /// constructs a message that can be sent to the clients or server
+        /// </summary>
+        /// <param name="identifier">the identifier for what kind of message it is</param>
+        /// <param name="payload">the json payload</param>
+        /// <returns>a byte array containing a message that can be sent to clients or server</returns>
+        public static byte[] GetMessageToSend(byte identifier, dynamic payload)
+        {
+            // convert the dynamic to bytes
+            byte[] payloadBytes = Encoding.ASCII.GetBytes(JsonConvert.SerializeObject(payload));
+            // make the array that holds the message and copy the payload into it with the first spot containing the identifier
+            byte[] res = new byte[payloadBytes.Length + 1];
+            Array.Copy(payloadBytes, 0, res, 1, payloadBytes.Length);
+            res[0] = identifier;
+            return res;
+        }
     }
 }

From 5732f0b31d7bed80f82bfdc1a0ef8d81a231ac5c Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 15:50:26 +0200
Subject: [PATCH 5/7] [ADD] add constant identifiers to JSONConvert and made
 serverclient and client use them

---
 Client/Client.cs                  | 8 ++++----
 Server/Models/ServerClient.cs     | 8 ++++----
 SharedClientServer/JSONConvert.cs | 9 +++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Client/Client.cs b/Client/Client.cs
index 17551de..5152afe 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -72,10 +72,10 @@ namespace Client
             Array.Copy(message, 1, payload, 0, message.Length - 1);
             switch (id)
             {
-                case 0x01:
+                case JSONConvert.LOGIN:
                     // json log in username data
                     break;
-                case 0x02:
+                case JSONConvert.MESSAGE:
                     // json message data
                     (string, string) combo = JSONConvert.GetUsernameAndMessage(payload);
                     string textUsername = combo.Item1;
@@ -84,11 +84,11 @@ namespace Client
 
                     break;
 
-                case 0x03:
+                case JSONConvert.LOBBY:
                     // lobby data
                     //TODO fill lobby with the data received
                     break;
-                case 0x04:
+                case JSONConvert.CANVAS:
                     // canvas data
                     break;
                 default:
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index b82e4f4..7544baf 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -91,7 +91,7 @@ namespace Server.Models
             switch(id)
             {
                 
-                case 0x01:
+                case JSONConvert.LOGIN:
                     // json log in username data
                     string uName = JSONConvert.GetUsernameLogin(message);
                     if (uName != null)
@@ -102,7 +102,7 @@ namespace Server.Models
                         
                     }
                     break;
-                case 0x02:
+                case JSONConvert.MESSAGE:
                     // json message data
                     (string, string) combo = JSONConvert.GetUsernameAndMessage(payload);
                     string textUsername = combo.Item1;
@@ -111,10 +111,10 @@ namespace Server.Models
                     // todo handle sending to all except this user the username and message to display in chat
                     break;
 
-                case 0x03:
+                case JSONConvert.LOBBY:
                     // lobby data
                     break;
-                case 0x04:
+                case JSONConvert.CANVAS:
                     // canvas data
                     // todo send canvas data to all other serverclients in lobby
                     break;
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index 1eb5c04..de853eb 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -7,6 +7,10 @@ namespace SharedClientServer
 {
     class JSONConvert
     {
+        public const byte LOGIN = 0x01;
+        public const byte MESSAGE = 0x02;
+        public const byte LOBBY = 0x03;
+        public const byte CANVAS = 0x04;
         public static (string,string) GetUsernameAndMessage(byte[] json)
         {
             string msg = Encoding.ASCII.GetString(json);
@@ -21,6 +25,11 @@ namespace SharedClientServer
             return payload.username;
         }
 
+        public static byte[] GetUsernameMessage(string username)
+        {
+
+        }
+
         /// <summary>
         /// constructs a message that can be sent to the clients or server
         /// </summary>

From 00093939608033af19062cb531363f26e5f640e8 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 16:31:59 +0200
Subject: [PATCH 6/7] [ADD] added username handling sending with json convert

---
 Server/Models/ServerClient.cs     | 2 +-
 SharedClientServer/JSONConvert.cs | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index 7544baf..accc07e 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -93,7 +93,7 @@ namespace Server.Models
                 
                 case JSONConvert.LOGIN:
                     // json log in username data
-                    string uName = JSONConvert.GetUsernameLogin(message);
+                    string uName = JSONConvert.GetUsernameLogin(payload);
                     if (uName != null)
                     {
                         User = new User(uName);
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index de853eb..dac7455 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -25,9 +25,12 @@ namespace SharedClientServer
             return payload.username;
         }
 
-        public static byte[] GetUsernameMessage(string username)
+        public static byte[] GetUsernameMessage(string uName)
         {
-
+            return GetMessageToSend(LOGIN, new
+            {
+                username = uName
+            });
         }
 
         /// <summary>

From e90d782887f7d98609ccdfa28a7e69bbce683392 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 16:34:29 +0200
Subject: [PATCH 7/7] [EDIT] edited servercommunication methods to use
 serverclient users

---
 Server/Models/ServerCommunication.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index afc9a14..0dd10e6 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -99,7 +99,7 @@ namespace Server.Models
         {
             foreach (ServerClient sc in serverClients)
             {
-                if (sc.Username != username) sc.sendMessage(message);
+                if (sc.User.Username != username) sc.sendMessage(message);
             }
         }
 
@@ -134,7 +134,7 @@ namespace Server.Models
                         foreach(ServerClient sc in serverClients)
                         {
                             
-                            if (sc.Username == user.Username)
+                            if (sc.User.Username == user.Username)
                             {
                                 serverClientsInlobbies[l].Add(sc);
                                 break;