Avatar URL support

Hawkchat/Client/Client.csproj

@@ -143,7 +143,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\test.png" />
+    <None Include="Resources\profile-default-male.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Hawkchat/Client/LoginWindow.cs

@@ -22,7 +22,7 @@ public partial class LoginWindow : VisualForm
     {
 
         public static long ACCOUNTID;
-        public static string USERNAME;
+        public static string USERNAME, AVATAR_URL;
 
         public LoginWindow()
         {
@@ -72,6 +72,8 @@ private void btnLogin_Click(object sender, EventArgs e)
 
                 // show main window
                 ACCOUNTID = long.Parse(returnedJson["accountID"].ToString());
+                USERNAME = txtUsername.Text.Trim();
+                AVATAR_URL = returnedJson["avatarURL"].ToString();
 
 #if DEBUG
                 btnLogin.Enabled = true;

Hawkchat/Client/MainWindow.cs

@@ -23,6 +23,27 @@ private void MainWindow_FormClosing(object sender, FormClosingEventArgs e)
 
             Environment.Exit(0);
 
+        }
+
+        private void MainWindow_Load(object sender, EventArgs e)
+        {
+
+            // Set the user's username and avatar URL
+            userProfilePicture.ImageLocation = LoginWindow.AVATAR_URL;
+            groupBoxUserInfo.Text = LoginWindow.USERNAME;
+            lblLoggedInUserStatus.Text = "Online";
+            lblLoggedInUserStatus.ForeColor = Color.Green;
+            this.Text = "Hawk Chat";
+
+            this.Update();
+
+        }
+
+        private void visualButton1_Click(object sender, EventArgs e)
+        {
+
+
+
         }
     }
 }

Hawkchat/Client/Properties/Resources.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="test" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\test.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="DefaultAvatar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\profile-default-male.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

Hawkchat/Client/RegisterForm.cs

@@ -77,8 +77,6 @@ private async void btnRegister_Click(object sender, EventArgs e)
                 txtUsernameTaken.ForeColor = Color.Green;
 
                 txtUsernameTaken.Visible = true;
-                await Task.Delay(5000);
-                txtUsernameTaken.Visible = false;
 
             }
 
@@ -96,8 +94,12 @@ private async void btnRegister_Click(object sender, EventArgs e)
 
             LoginWindow.ACCOUNTID = long.Parse(jObject["AccountID"].ToString());
             LoginWindow.USERNAME = jObject["username"].ToString();
+            LoginWindow.AVATAR_URL = jObject["avatarURL"].ToString();
+
+            MainWindow mainWindow = new MainWindow();
 
-            MessageBox.Show("Show the main program UI here...");
+            mainWindow.Show();
+            this.Hide();
 
         }
     }

Hawkchat/Server/Parser.cs

@@ -49,18 +49,20 @@ public static async void ParseCommand(string command, Message message, JObject j
 
                     }
 
-                    string UserID = "";
+                    string UserID = "", avatarURL = "";
 
                     while (reader.Read())
                     {
 
                         UserID = reader["AccountID"].ToString();
+                        avatarURL = reader["avatarurl"].ToString();
 
                     }
 
                     reader.Close();
 
                     jsonResponse.accountID = UserID;
+                    jsonResponse.avatarURL = avatarURL;
 
                     string banQuery = $"SELECT * FROM bans WHERE accountid='{UserID}'";
 
@@ -115,12 +117,13 @@ public static async void ParseCommand(string command, Message message, JObject j
                     string usrName = json["username"].ToString();
                     string pwd = json["password"].ToString();
                     string IPAddress = json["IP"].ToString();
+                    string avatarURLl = json["avatarURL"].ToString();
 
                     long AccountID = Util.GenerateAccountID();
 
                     SQLiteConnection sQLiteConnection = DBUtils.EstablishConnection();
 
-                    int rowsAffected = await DBUtils.ExecuteNonQuery(sQLiteConnection, $"INSERT INTO users (AccountID, username, password, lastip) VALUES ('{AccountID}', '{usrName}', '{pwd}', '{IPAddress}')");
+                    int rowsAffected = await DBUtils.ExecuteNonQuery(sQLiteConnection, $"INSERT INTO users (AccountID, username, password, avatarurl, lastip) VALUES ('{AccountID}', '{usrName}', '{pwd}', '{avatarURLl}', '{IPAddress}')");
 
 
                     if (rowsAffected == 1)
@@ -129,6 +132,7 @@ public static async void ParseCommand(string command, Message message, JObject j
                         jsonResponse.success = true;
                         jsonResponse.AccountID = AccountID;
                         jsonResponse.username = usrName;
+                        jsonResponse.avatarURL = avatarURLl;
 
                         DBUtils.CloseConnection(sQLiteConnection);
 

Hawkchat/Server/models/ClientModel.cs

@@ -15,10 +15,12 @@ public class ClientModel
         public string IP { get; set; }
 
         public int Port { get; set; }
-        
+
         public string Username { get; set; }
 
+        //public string AvatarURL { get; set; }
+
         public Int64 UserID { get; set; }
-        
+
     }
 }