From f1901f0c351dd54ead6742242615a82a3818c75c Mon Sep 17 00:00:00 2001
From: Lars <l.rook2002@hotmail.nl>
Date: Mon, 19 Oct 2020 23:07:48 +0200
Subject: [PATCH 01/18] added something to the user

---
 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 ce6c70d..8bfdcc1 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -117,14 +117,14 @@ namespace Server.Models
             }
         }
 
-        public void AddToLobby(Lobby lobby, string username)
+        public void AddToLobby(Lobby lobby, User user)
         {
             foreach (Lobby l in lobbies)
             {
                 if (l == lobby)
                 {
                     bool succ;
-                    l.AddUser(username, out succ);
+                    l.AddUser(user, out succ);
                     if (!succ)
                     {
                         // TODO send lobby full message

From 55425bbec4f7698507f18ce6f8786398597ee246 Mon Sep 17 00:00:00 2001
From: Lars <l.rook2002@hotmail.nl>
Date: Tue, 20 Oct 2020 13:03:04 +0200
Subject: [PATCH 02/18] for some reason, didnt added this stuff-_-

---
 SharedClientServer/User.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/SharedClientServer/User.cs b/SharedClientServer/User.cs
index c639071..f25efbf 100644
--- a/SharedClientServer/User.cs
+++ b/SharedClientServer/User.cs
@@ -8,11 +8,13 @@ namespace SharedClientServer
     {
         private string _username;
         private int _score;
+        private bool _host;
 
-        public User(string username, int score)
+        public User(string username, int score, bool host)
         {
             _username = username;
             _score = score;
+            _host = host;
         }
 
         public string Username
@@ -26,5 +28,11 @@ namespace SharedClientServer
             get { return _score; }
             set { _score = value; }
         }
+
+        public bool Host
+        {
+            get { return _host; }
+            set { _host = value; }
+        }
     }
 }

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 03/18] [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 04/18] [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 05/18] [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 06/18] [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 07/18] [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 08/18] [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 09/18] [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;

From 84bf1b3e6445bf3828f0b588ec726275f054737e Mon Sep 17 00:00:00 2001
From: Lars <l.rook2002@hotmail.nl>
Date: Tue, 20 Oct 2020 16:36:34 +0200
Subject: [PATCH 10/18] [ADDED] the inlog screen and a data singleton for the
 client

---
 Client/App.xaml.cs                   |  9 +++--
 Client/ClientData.cs                 | 59 ++++++++++++++++++++++++++++
 Client/ViewModels/ViewModel.cs       |  2 +-
 Client/Views/GameWindow.xaml.cs      |  4 +-
 Client/Views/LoginScreen.xaml        | 29 ++++++++++++++
 Client/Views/LoginScreen.xaml.cs     | 40 +++++++++++++++++++
 Client/Views/MainWindow.xaml.cs      |  4 ++
 Server/Models/ServerCommunication.cs |  2 +-
 SharedClientServer/Lobby.cs          |  2 +-
 9 files changed, 142 insertions(+), 9 deletions(-)
 create mode 100644 Client/ClientData.cs
 create mode 100644 Client/Views/LoginScreen.xaml
 create mode 100644 Client/Views/LoginScreen.xaml.cs

diff --git a/Client/App.xaml.cs b/Client/App.xaml.cs
index 30a075c..9f2324b 100644
--- a/Client/App.xaml.cs
+++ b/Client/App.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using Client.Views;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
@@ -17,9 +18,9 @@ namespace Client
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
-            MainWindow startWindow = new MainWindow();
-            ViewModel VM = new ViewModel();
-            startWindow.DataContext = VM;
+            LoginScreen startWindow = new LoginScreen();
+            //ViewModel VM = new ViewModel();
+            //startWindow.DataContext = VM;
             startWindow.Show();
         }
 
diff --git a/Client/ClientData.cs b/Client/ClientData.cs
new file mode 100644
index 0000000..9442e8d
--- /dev/null
+++ b/Client/ClientData.cs
@@ -0,0 +1,59 @@
+using SharedClientServer;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Client
+{
+    class ClientData
+    {
+        private static ClientData _instance;
+        private static readonly object padlock = new object();
+
+        public static ClientData Instance
+        {
+            get
+            {
+                lock (padlock)
+                {
+                    if (_instance == null)
+                    {
+                        _instance = new ClientData();
+                    }
+                    return _instance;
+                }
+            }
+        }
+
+
+        private User _user;
+        private Client _client;
+        private Lobby _lobby;
+
+        private ClientData()
+        {
+
+        }
+
+
+        public User User
+        {
+            get { return _user; }
+            set { _user = value; }
+        }
+
+        public Client Client
+        {
+            get { return _client; }
+            set { _client = value; }
+        }
+
+        public Lobby Lobby
+        {
+            get { return _lobby; }
+            set { _lobby = value; }
+        }
+
+    }
+}
diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index 241b520..fb310bf 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -18,7 +18,7 @@ namespace Client
             ButtonCommand = new RelayCommand(() =>
             {
                 Client client = new Client();
-            });
+            }, true);
 
             _lobbies = new List<Lobby>();
 
diff --git a/Client/Views/GameWindow.xaml.cs b/Client/Views/GameWindow.xaml.cs
index 0b609ba..aacc67e 100644
--- a/Client/Views/GameWindow.xaml.cs
+++ b/Client/Views/GameWindow.xaml.cs
@@ -18,7 +18,7 @@ namespace Client.Views
     /// </summary>
     public partial class GameWindow : Window
     {
-
+        ClientData data = ClientData.Instance;
         public GameWindow()
         {
             DataContext = new ViewModelGame();
@@ -110,7 +110,7 @@ namespace Client.Views
          */
         private void WriteToChat(string message)
         {
-            string user = "Monkey"; 
+            string user = data.User.Username; 
             SentMessage.AppendText($"{user}: {message}\n");
         }
     }
diff --git a/Client/Views/LoginScreen.xaml b/Client/Views/LoginScreen.xaml
new file mode 100644
index 0000000..e011780
--- /dev/null
+++ b/Client/Views/LoginScreen.xaml
@@ -0,0 +1,29 @@
+<Window x:Class="Client.Views.LoginScreen"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Client.Views"
+        mc:Ignorable="d"
+        Title="LoginScreen" Height="450" Width="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="60"/>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="30"/>
+        </Grid.RowDefinitions>
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+
+        <Label Grid.Row="0" FontSize="40" Content="Welcome to Scrubl.io"/>
+        <Label Grid.Row="1" FontSize="30" Content="Enter a username:"/>
+        <Label Grid.Row="2" FontSize="15" Content="(max amount of characters for the username is 10)"/>
+
+        <TextBox Name="usernameTextbox" Grid.Row="1" Grid.Column="1" MaxLength="10" FontSize="30" VerticalAlignment="Center" HorizontalAlignment="Left" Width="250"/>
+        <Button Content="ENTER" Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Width="100" Height="40" Click="Button_EnterUsername"/>
+
+    </Grid>
+</Window>
diff --git a/Client/Views/LoginScreen.xaml.cs b/Client/Views/LoginScreen.xaml.cs
new file mode 100644
index 0000000..76a20f0
--- /dev/null
+++ b/Client/Views/LoginScreen.xaml.cs
@@ -0,0 +1,40 @@
+using SharedClientServer;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Client.Views
+{
+    /// <summary>
+    /// Interaction logic for LoginScreen.xaml
+    /// </summary>
+    public partial class LoginScreen : Window
+    {
+        ClientData data = ClientData.Instance;
+        public LoginScreen()
+        {
+            InitializeComponent();
+        }
+
+        private void Button_EnterUsername(object sender, RoutedEventArgs e)
+        {
+            User user = new User(usernameTextbox.Text, 0, false);
+            Client client = new Client();
+
+            data.User = user;
+            data.Client = client;
+
+            MainWindow startWindow = new MainWindow();
+            startWindow.Show();
+            this.Close();
+        }
+    }
+}
diff --git a/Client/Views/MainWindow.xaml.cs b/Client/Views/MainWindow.xaml.cs
index 70bb34a..ae7e032 100644
--- a/Client/Views/MainWindow.xaml.cs
+++ b/Client/Views/MainWindow.xaml.cs
@@ -21,9 +21,13 @@ namespace Client
     /// </summary>
     public partial class MainWindow : Window
     {
+        ClientData data = ClientData.Instance;
         public MainWindow()
         {
+            this.DataContext = new ViewModel();
             InitializeComponent();
+
+            usernameTextbox.Text = data.User.Username;
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)
diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index 8bfdcc1..be3a8f8 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -132,7 +132,7 @@ 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..5a69627 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 33574a7b23a854e51a5bf07dd56c7acbc6281dc3 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 17:43:28 +0200
Subject: [PATCH 11/18] [FIX] fixed server client message structure

---
 Client/Client.cs                     |  9 ++++++---
 Client/ViewModels/ViewModel.cs       |  2 +-
 Client/Views/LoginScreen.xaml.cs     |  4 ++--
 Client/Views/MainWindow.xaml         |  2 +-
 Client/Views/MainWindow.xaml.cs      |  2 +-
 Server/Models/ServerClient.cs        | 16 ++++++++++++----
 Server/Models/ServerCommunication.cs |  2 +-
 SharedClientServer/JSONConvert.cs    | 23 ++++++++++++++++++-----
 8 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/Client/Client.cs b/Client/Client.cs
index 5152afe..d6e1220 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -16,11 +16,11 @@ namespace Client
         private int totalBufferReceived = 0;
         public int Port = 5555;
         public bool Connected = false;
-        //TODO send login packet to server with ClientServerUtil.createpayload(0x01,dynamic json with username)
-        public string Username { get; }
+        private string username;
 
-        public Client()
+        public Client(string username)
         {
+            this.username = username;
             this.tcpClient = new TcpClient();
             Debug.WriteLine("Starting connect to server");
             tcpClient.BeginConnect("localhost", Port, new AsyncCallback(OnConnect), null);
@@ -31,6 +31,7 @@ namespace Client
             Debug.Write("finished connecting to server");
             this.tcpClient.EndConnect(ar);
             this.stream = tcpClient.GetStream();
+            SendMessage(JSONConvert.ConstructUsernameMessage(username));
             this.stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete),null);
         }
 
@@ -100,11 +101,13 @@ namespace Client
 
         public void SendMessage(byte[] message)
         {
+            Debug.WriteLine("[CLIENT] sending message " + Encoding.ASCII.GetString(message));
             stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWriteComplete), null);
         }
 
         private void OnWriteComplete(IAsyncResult ar)
         {
+            Debug.WriteLine("[CLIENT] finished writing");
             stream.EndWrite(ar);
         }
     }
diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index abb89e3..c66fd15 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -18,7 +18,7 @@ namespace Client
             _model = new Model();
             ButtonCommand = new RelayCommand(() =>
             {
-                Client client = new Client();
+                
             }, true);
 
             _lobbies = new List<Lobby>();
diff --git a/Client/Views/LoginScreen.xaml.cs b/Client/Views/LoginScreen.xaml.cs
index 76a20f0..7dfe537 100644
--- a/Client/Views/LoginScreen.xaml.cs
+++ b/Client/Views/LoginScreen.xaml.cs
@@ -26,8 +26,8 @@ namespace Client.Views
 
         private void Button_EnterUsername(object sender, RoutedEventArgs e)
         {
-            User user = new User(usernameTextbox.Text, 0, false);
-            Client client = new Client();
+            User user = new User(usernameTextbox.Text);
+            Client client = new Client(user.Username);
 
             data.User = user;
             data.Client = client;
diff --git a/Client/Views/MainWindow.xaml b/Client/Views/MainWindow.xaml
index b3221df..68bf586 100644
--- a/Client/Views/MainWindow.xaml
+++ b/Client/Views/MainWindow.xaml
@@ -47,7 +47,7 @@
             </ComboBox>
 
             <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"/>
+            <Label Name="usernameLabel" Content="place username here" Grid.Column="1" HorizontalAlignment="Center" Margin="0,12,0,0" VerticalAlignment="Top" Grid.Row="1"/>
 
         </Grid>
 
diff --git a/Client/Views/MainWindow.xaml.cs b/Client/Views/MainWindow.xaml.cs
index 1fe9334..f1239c7 100644
--- a/Client/Views/MainWindow.xaml.cs
+++ b/Client/Views/MainWindow.xaml.cs
@@ -27,7 +27,7 @@ namespace Client
             this.DataContext = new ViewModel();
             InitializeComponent();
 
-            usernameTextbox.Text = data.User.Username;
+            usernameLabel.Content = data.User.Username;
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index accc07e..b10639b 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -24,8 +24,10 @@ namespace Server.Models
         /// <param name="client">the TcpClient object to use</param>
         public ServerClient(TcpClient client)
         {
+            Debug.WriteLine("[SERVERCLIENT] making new instance and starting");
             tcpClient = client;
             stream = tcpClient.GetStream();
+            Debug.WriteLine("[SERVERCLIENT] starting read");
             stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
         }
 
@@ -35,6 +37,10 @@ namespace Server.Models
         /// <param name="ar">the async result status</param>
         private void OnRead(IAsyncResult ar)
         {
+            if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead) || !this.tcpClient.Client.Connected)
+                return;
+
+
             int bytesReceived = this.stream.EndRead(ar);
 
             if (totalBufferReceived + bytesReceived > 1024)
@@ -84,16 +90,18 @@ namespace Server.Models
         /// <param name="message">the incoming message</param>
         private void HandleIncomingMessage(byte[] 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);
+            Debug.WriteLine($"Got message : {Encoding.ASCII.GetString(message)}");
+            byte id = message[4];
+            byte[] payload = new byte[message.Length - 5];
+            Array.Copy(message,5,payload,0,message.Length-5);
+            Debug.WriteLine("[SERVERCLIENT] GOT STRING" + Encoding.ASCII.GetString(payload));
             switch(id)
             {
                 
                 case JSONConvert.LOGIN:
                     // json log in username data
                     string uName = JSONConvert.GetUsernameLogin(payload);
+                    
                     if (uName != null)
                     {
                         User = new User(uName);
diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index 96a7ace..5507103 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -133,7 +133,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;
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index dac7455..74f526c 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -1,6 +1,8 @@
-using Newtonsoft.Json;
+using Client;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Text;
 
 namespace SharedClientServer
@@ -25,7 +27,7 @@ namespace SharedClientServer
             return payload.username;
         }
 
-        public static byte[] GetUsernameMessage(string uName)
+        public static byte[] ConstructUsernameMessage(string uName)
         {
             return GetMessageToSend(LOGIN, new
             {
@@ -33,6 +35,13 @@ namespace SharedClientServer
             });
         }
 
+        public static byte[] ConstructLobbyDataMessage(Lobby lobby)
+        {
+            return null;
+        }
+
+
+
         /// <summary>
         /// constructs a message that can be sent to the clients or server
         /// </summary>
@@ -44,9 +53,13 @@ namespace SharedClientServer
             // 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;
+            byte[] res = new byte[payloadBytes.Length + 5];
+            // put the payload in the res array
+            Array.Copy(payloadBytes, 0, res, 5, payloadBytes.Length);
+            // put the identifier at the start of the payload part
+            res[4] = identifier;
+            // put the length of the payload at the start of the res array
+            res[0] = BitConverter.GetBytes(payloadBytes.Length+5);
             return res;
         }
     }

From f6c70bc7178aa2081464cf00490fe809f2cb5e21 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 18:17:42 +0200
Subject: [PATCH 12/18] [FIX] message can now be 4 bytes long

---
 SharedClientServer/JSONConvert.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index 74f526c..a2b655a 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -59,7 +59,7 @@ namespace SharedClientServer
             // put the identifier at the start of the payload part
             res[4] = identifier;
             // put the length of the payload at the start of the res array
-            res[0] = BitConverter.GetBytes(payloadBytes.Length+5);
+            Array.Copy(BitConverter.GetBytes(payloadBytes.Length+5),0,res,0,4);
             return res;
         }
     }

From 73dc0b94def493d998d47c090b42ac290e294d1f Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 18:27:53 +0200
Subject: [PATCH 13/18] [EDIT] made main window open only when the client has
 connected

---
 Client/Client.cs                       |  2 ++
 Client/Views/LoginScreen.xaml.cs       | 17 +++++++++++------
 SharedClientServer/ClientServerUtil.cs |  1 +
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Client/Client.cs b/Client/Client.cs
index d6e1220..6ba9b16 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -17,6 +17,7 @@ namespace Client
         public int Port = 5555;
         public bool Connected = false;
         private string username;
+        public Callback OnSuccessfullConnect;
 
         public Client(string username)
         {
@@ -31,6 +32,7 @@ namespace Client
             Debug.Write("finished connecting to server");
             this.tcpClient.EndConnect(ar);
             this.stream = tcpClient.GetStream();
+            OnSuccessfullConnect?.Invoke();
             SendMessage(JSONConvert.ConstructUsernameMessage(username));
             this.stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete),null);
         }
diff --git a/Client/Views/LoginScreen.xaml.cs b/Client/Views/LoginScreen.xaml.cs
index 7dfe537..780b619 100644
--- a/Client/Views/LoginScreen.xaml.cs
+++ b/Client/Views/LoginScreen.xaml.cs
@@ -28,13 +28,18 @@ namespace Client.Views
         {
             User user = new User(usernameTextbox.Text);
             Client client = new Client(user.Username);
+            client.OnSuccessfullConnect = () =>
+            {
+                // because we need to start the main window on a UI thread, we need to let the dispatcher handle it, which will execute the code on the ui thread
+                Application.Current.Dispatcher.Invoke(delegate {
+                    data.User = user;
+                    data.Client = client;
+                    MainWindow startWindow = new MainWindow();
+                    startWindow.Show();
+                    this.Close();
+                });
+            };
 
-            data.User = user;
-            data.Client = client;
-
-            MainWindow startWindow = new MainWindow();
-            startWindow.Show();
-            this.Close();
         }
     }
 }
diff --git a/SharedClientServer/ClientServerUtil.cs b/SharedClientServer/ClientServerUtil.cs
index 3572562..f79c448 100644
--- a/SharedClientServer/ClientServerUtil.cs
+++ b/SharedClientServer/ClientServerUtil.cs
@@ -6,6 +6,7 @@ using System.Text;
 
 namespace SharedClientServer
 {
+    public delegate void Callback();
     class ClientServerUtil
     {
         // creates a message array to send to the server or to clients

From f1a47b509d78c5dbe8801cc404fa4ac72028a909 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 18:55:12 +0200
Subject: [PATCH 14/18] [ADD] added mvvm button commands for host and join

---
 Client/ViewModels/ViewModel.cs  | 21 ++++++++++++++++-----
 Client/Views/MainWindow.xaml    |  4 ++--
 Client/Views/MainWindow.xaml.cs |  1 +
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index c66fd15..876cb5c 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -6,6 +6,7 @@ using System.Text;
 using System.Windows.Input;
 using SharedClientServer;
 using System.Diagnostics;
+using System.Windows;
 
 namespace Client
 {
@@ -13,9 +14,13 @@ namespace Client
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
+        public ICommand OnHostButtonClick { get; set; }
+        public ICommand JoinSelectedLobby { get; set; }
+
         public ViewModel()
         {
             _model = new Model();
+
             ButtonCommand = new RelayCommand(() =>
             {
                 
@@ -26,6 +31,17 @@ namespace Client
             _lobbies.Add(new Lobby(50, 3, 8));
             _lobbies.Add(new Lobby(69, 1, 9));
             _lobbies.Add(new Lobby(420, 7, 7));
+
+            OnHostButtonClick = new RelayCommand(() => 
+            {
+                Debug.WriteLine("Host button clicked");
+            });
+
+            JoinSelectedLobby = new RelayCommand(() =>
+            {
+                
+                Debug.WriteLine("Joining selected lobby");
+            });
         }
 
         private void ClickCheck()
@@ -59,10 +75,5 @@ 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 68bf586..3af77f3 100644
--- a/Client/Views/MainWindow.xaml
+++ b/Client/Views/MainWindow.xaml
@@ -67,8 +67,8 @@
                 <RowDefinition Height="50"/>
                 <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 Path=OnHostButtonClick}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
+            <Button Name="joinButton" Grid.Row="0" Content="join a selected lobby" Command="{Binding JoinSelectedLobby}" Width="200" Height="40" HorizontalAlignment="Left" Margin="10, 0, 0, 0"/>
+            <Button Name="hostButton" Grid.Row="1" Content="host a new lobby" Command="{Binding 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 f1239c7..aa9cf2f 100644
--- a/Client/Views/MainWindow.xaml.cs
+++ b/Client/Views/MainWindow.xaml.cs
@@ -43,6 +43,7 @@ namespace Client
 
                 GameWindow window = new GameWindow();
                 window.Show();
+                Close();
             }
         }
     }

From 1552479f4d7dc5411b2ca5c03fc8f5e2dfedf5ea Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 19:25:56 +0200
Subject: [PATCH 15/18] [FIX] made mainwindow MVVM

---
 Client/ViewModels/ViewModel.cs | 25 +++++++++++++------------
 Client/Views/MainWindow.xaml   |  8 ++++----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index 876cb5c..0c41749 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -7,6 +7,8 @@ using System.Windows.Input;
 using SharedClientServer;
 using System.Diagnostics;
 using System.Windows;
+using System.Collections.ObjectModel;
+using Client.Views;
 
 namespace Client
 {
@@ -17,16 +19,12 @@ namespace Client
         public ICommand OnHostButtonClick { get; set; }
         public ICommand JoinSelectedLobby { get; set; }
 
+        public Lobby SelectedLobby { get; set; }
+
         public ViewModel()
         {
             _model = new Model();
-
-            ButtonCommand = new RelayCommand(() =>
-            {
-                
-            }, true);
-
-            _lobbies = new List<Lobby>();
+            _lobbies = new ObservableCollection<Lobby>();
 
             _lobbies.Add(new Lobby(50, 3, 8));
             _lobbies.Add(new Lobby(69, 1, 9));
@@ -39,9 +37,13 @@ namespace Client
 
             JoinSelectedLobby = new RelayCommand(() =>
             {
+                if (SelectedLobby != null)
+                {
+                    GameWindow window = new GameWindow();
+                    window.Show();
+                }
                 
-                Debug.WriteLine("Joining selected lobby");
-            });
+            }, true);
         }
 
         private void ClickCheck()
@@ -52,7 +54,6 @@ namespace Client
             _model.Numbers = _model.Numbers + 5;
         }
 
-        public ICommand ButtonCommand { get; set; }
 
 
         private Model _model;
@@ -69,8 +70,8 @@ namespace Client
             }
         }
 
-        private List<Lobby> _lobbies;
-        public List<Lobby> Lobbies
+        private ObservableCollection<Lobby> _lobbies;
+        public ObservableCollection<Lobby> Lobbies
         {
             get { return _lobbies; }
             set { _lobbies = value; }
diff --git a/Client/Views/MainWindow.xaml b/Client/Views/MainWindow.xaml
index 3af77f3..c0db1de 100644
--- a/Client/Views/MainWindow.xaml
+++ b/Client/Views/MainWindow.xaml
@@ -35,7 +35,7 @@
 
             <Label Grid.Row="1" Grid.Column="0" Content="Your username:" FontSize="15" VerticalAlignment="Center"/>
 
-            <Label Grid.Row="2" Grid.Column="0" Content="Which color you want to be:" FontSize="15" VerticalAlignment="Center"/>
+            <Label Grid.Row="2" Grid.Column="0" Content="Select your color:" FontSize="15" VerticalAlignment="Center"/>
             <ComboBox Name="colorSelection" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" FontSize="15">
                 <ComboBoxItem Content="BLUE"/>
                 <ComboBoxItem Content="RED"/>
@@ -52,7 +52,7 @@
         </Grid>
 
 
-        <ListView Name="LobbyList" Grid.Row="1" Grid.Column="0" Margin="10, 10, 10, 10" ItemsSource="{Binding Path=Lobbies}">
+        <ListView Name="LobbyList" Grid.Row="1" Grid.Column="0" SelectedItem="{Binding SelectedLobby}" Margin="10, 10, 10, 10" ItemsSource="{Binding Path=Lobbies}">
             <ListView.View>
                 <GridView x:Name="grdList">
                     <GridViewColumn Header="Lobby ID" DisplayMemberBinding="{Binding ID}" Width="70"/>
@@ -67,8 +67,8 @@
                 <RowDefinition Height="50"/>
                 <RowDefinition Height="50"/>
             </Grid.RowDefinitions>
-            <Button Name="joinButton" Grid.Row="0" Content="join a selected lobby" Command="{Binding JoinSelectedLobby}" Width="200" Height="40" HorizontalAlignment="Left" Margin="10, 0, 0, 0"/>
-            <Button Name="hostButton" Grid.Row="1" Content="host a new lobby" Command="{Binding OnHostButtonClick}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
+            <Button Name="joinButton" Grid.Row="0" Content="join a selected lobby" Command="{Binding JoinSelectedLobby}" IsEnabled="{Binding Model.CanStartGame}" Width="200" Height="40" HorizontalAlignment="Left" Margin="10, 0, 0, 0"/>
+            <Button Name="hostButton" Grid.Row="1" Content="host a new lobby" Command="{Binding OnHostButtonClick}" IsEnabled="{Binding Model.CanStartGame}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
         </Grid>
 
     </Grid>

From a8376113170d1d2390320a73158833d1a5470df4 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 19:26:11 +0200
Subject: [PATCH 16/18] [ADD] made join buttons disabled when starting a game

---
 Client/Models/Model.cs         | 8 ++++++++
 Client/ViewModels/ViewModel.cs | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Client/Models/Model.cs b/Client/Models/Model.cs
index 59b3577..9e50229 100644
--- a/Client/Models/Model.cs
+++ b/Client/Models/Model.cs
@@ -11,6 +11,7 @@ namespace Client
 
         private int _numbers;
         private bool _status;
+        private bool _canStartGame;
 
         //Test code 
         public int Numbers
@@ -37,11 +38,18 @@ namespace Client
             }
         }
 
+        public bool CanStartGame
+        {
+            get { return _canStartGame; }
+            set { _canStartGame = value; }
+        }
+
 
         public Model()
         {
             _status = false;
             _numbers = 0;
+            _canStartGame = true;
         }
 
     }
diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index 0c41749..e874c00 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -39,6 +39,7 @@ namespace Client
             {
                 if (SelectedLobby != null)
                 {
+                    _model.CanStartGame = false;
                     GameWindow window = new GameWindow();
                     window.Show();
                 }
@@ -55,7 +56,6 @@ namespace Client
         }
 
 
-
         private Model _model;
         public Model Model
         {

From b1237e53a2ce89b55378455eeeb9be6cf5e614ea Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 19:34:24 +0200
Subject: [PATCH 17/18] [EDIT] made method for getting in lobby

---
 Client/ViewModels/ViewModel.cs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index e874c00..be55690 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -35,16 +35,19 @@ namespace Client
                 Debug.WriteLine("Host button clicked");
             });
 
-            JoinSelectedLobby = new RelayCommand(() =>
+            JoinSelectedLobby = new RelayCommand(startGameInLobby, true);
+        }
+
+        private void startGameInLobby()
+        {
+            if (SelectedLobby != null)
             {
-                if (SelectedLobby != null)
-                {
-                    _model.CanStartGame = false;
-                    GameWindow window = new GameWindow();
-                    window.Show();
-                }
+                ClientData.Instance.Lobby = SelectedLobby;
                 
-            }, true);
+                _model.CanStartGame = false;
+                GameWindow window = new GameWindow();
+                window.Show();
+            }
         }
 
         private void ClickCheck()

From 3255ae885b1f82dc45a68fccfec9b500ec1a4ff1 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 20 Oct 2020 19:40:10 +0200
Subject: [PATCH 18/18] [ADD] added lobby identifier enum

---
 SharedClientServer/JSONConvert.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index a2b655a..b0d83cb 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -13,6 +13,14 @@ namespace SharedClientServer
         public const byte MESSAGE = 0x02;
         public const byte LOBBY = 0x03;
         public const byte CANVAS = 0x04;
+
+        enum LobbyIdentifier
+        {
+            HOST,
+            ADD,
+            LEAVE,
+            REQUEST
+        }
         public static (string,string) GetUsernameAndMessage(byte[] json)
         {
             string msg = Encoding.ASCII.GetString(json);