sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-10-09 12:49:22 +02:00
parent 5cc008cd03 50a2ae9521
commit bcdf8587c0
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ClientApp/Utils/Client.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
using System.Text; using System.Text;
@@ -121,14 +122,15 @@ namespace ClientApp.Utils
string responseStatus = DataParser.getResponseStatus(payloadbytes); string responseStatus = DataParser.getResponseStatus(payloadbytes);
if (responseStatus == "OK") if (responseStatus == "OK")
{ {
Console.WriteLine("Username and password correct!"); Debug.WriteLine("Username and password correct!");
this.LoginViewModel.setLoginStatus(true); this.LoginViewModel.setLoginStatus(true);
this.connected = true; this.connected = true;
initEngine(); initEngine();
} }
else else
{ {
Console.WriteLine($"login failed \"{responseStatus}\""); this.LoginViewModel.setLoginStatus(false);
Debug.WriteLine($"login failed \"{responseStatus}\"");
} }
break; break;
case DataParser.START_SESSION: case DataParser.START_SESSION:

7
ClientApp/ViewModels/LoginViewModel.cs
View File

@@ -13,6 +13,8 @@ namespace ClientApp.ViewModels
class LoginViewModel : ObservableObject class LoginViewModel : ObservableObject
{ {
public string Username { get; set; } public string Username { get; set; }
public ICommand LoginCommand { get; set; }
public bool LoginStatus { get; set; }
private MainWindowViewModel mainWindowViewModel; private MainWindowViewModel mainWindowViewModel;
public LoginViewModel(MainWindowViewModel mainWindowViewModel) public LoginViewModel(MainWindowViewModel mainWindowViewModel)
{ {
@@ -24,11 +26,12 @@ namespace ClientApp.ViewModels
}); });
} }
public ICommand LoginCommand { get; set; }
internal void setLoginStatus(bool status) internal void setLoginStatus(bool status)
{ {
this.mainWindowViewModel.InfoModel.ConnectedToServer = true; this.mainWindowViewModel.InfoModel.ConnectedToServer = status;
this.LoginStatus = status;
if (status) if (status)
{ {
this.mainWindowViewModel.SelectedViewModel = new MainViewModel(mainWindowViewModel); this.mainWindowViewModel.SelectedViewModel = new MainViewModel(mainWindowViewModel);

5
ClientApp/Views/LoginView.xaml
View File

@@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ClientApp.Views" xmlns:local="clr-namespace:ClientApp.Views"
xmlns:viewModels="clr-namespace:ClientApp.ViewModels"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<DockPanel> <DockPanel>
@@ -13,6 +14,10 @@
<Label Content="Password" HorizontalContentAlignment="Center"/> <Label Content="Password" HorizontalContentAlignment="Center"/>
<PasswordBox x:Name="Password" Width="120"/> <PasswordBox x:Name="Password" Width="120"/>
<Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/> <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
<CheckBox Name = "PCheckBox" Margin = "198,94,208,194" Content = "Checked Me"/>
<Popup IsOpen="{Binding LoginStatus}" PopupAnimation = "Slide">
<Label Content="Login failed" Foreground="Red"/>
</Popup>
</StackPanel> </StackPanel>
</DockPanel> </DockPanel>
</UserControl> </UserControl>