diff --git a/bibtalk/bib-talk/Icons/logo - Copy.png b/bibtalk/bib-talk/Icons/logo - Copy.png new file mode 100644 index 0000000..b7ff500 Binary files /dev/null and b/bibtalk/bib-talk/Icons/logo - Copy.png differ diff --git a/bibtalk/bib-talk/Repository/LoginDatabase.cs b/bibtalk/bib-talk/Repository/LoginDatabase.cs index bc79991..ee2fd9c 100644 --- a/bibtalk/bib-talk/Repository/LoginDatabase.cs +++ b/bibtalk/bib-talk/Repository/LoginDatabase.cs @@ -23,7 +23,7 @@ namespace bib_talk.Repository { string username = loginWindow.usernbox.Text; string password = loginWindow.passwordbox.Password; - var loginData = new { Username = username, Password = password, Email = "", Birthday = "", IsOnline = "" }; + var loginData = new { Username = username, Password = password, Email = "", Birthday = "", IsOnline = ""}; string json = JsonConvert.SerializeObject(loginData); using (var client = new HttpClient()) diff --git a/bibtalk/bib-talk/Repository/MainWindowDatabase.cs b/bibtalk/bib-talk/Repository/MainWindowDatabase.cs index c4dc2ec..43f4931 100644 --- a/bibtalk/bib-talk/Repository/MainWindowDatabase.cs +++ b/bibtalk/bib-talk/Repository/MainWindowDatabase.cs @@ -1,6 +1,7 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Net.Http; using System.Text; @@ -71,12 +72,18 @@ namespace bib_talk.Repository if (response.IsSuccessStatusCode) { var responseContent = await response.Content.ReadAsStringAsync(); + var onlineUsers = JsonConvert.DeserializeObject>(responseContent); + + mainWindow.onlineUsersListBox.ItemsSource = onlineUsers; } } } + + + public async void LogoutUser() { using (var client = new HttpClient()) diff --git a/bibtalk/bib-talk/UI/Login.xaml b/bibtalk/bib-talk/UI/Login.xaml index 547a489..8a20353 100644 --- a/bibtalk/bib-talk/UI/Login.xaml +++ b/bibtalk/bib-talk/UI/Login.xaml @@ -62,7 +62,7 @@ - + diff --git a/bibtalk/bib-talk/UI/Logo_bib-Talk.png b/bibtalk/bib-talk/UI/Logo_bib-Talk.png new file mode 100644 index 0000000..00fbd91 Binary files /dev/null and b/bibtalk/bib-talk/UI/Logo_bib-Talk.png differ diff --git a/bibtalk/bib-talk/UI/MainWindow.xaml b/bibtalk/bib-talk/UI/MainWindow.xaml index 9c1e661..15e6ac7 100644 --- a/bibtalk/bib-talk/UI/MainWindow.xaml +++ b/bibtalk/bib-talk/UI/MainWindow.xaml @@ -99,11 +99,9 @@ - - - - - + + +