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

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +4 -5
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e410e9ec88 - Show all commits

4
ClientApp/ViewModels/LoginViewModel.cs
View File

@@ -14,7 +14,7 @@ namespace ClientApp.ViewModels
{ {
public string Username { get; set; } public string Username { get; set; }
public ICommand LoginCommand { get; set; } public ICommand LoginCommand { get; set; }
public bool LoginStatus { get; set; } public bool InvertedLoginStatus { get; set; }
private MainWindowViewModel mainWindowViewModel; private MainWindowViewModel mainWindowViewModel;
public LoginViewModel(MainWindowViewModel mainWindowViewModel) public LoginViewModel(MainWindowViewModel mainWindowViewModel)
{ {
@@ -31,7 +31,7 @@ namespace ClientApp.ViewModels
internal void setLoginStatus(bool status) internal void setLoginStatus(bool status)
{ {
this.mainWindowViewModel.InfoModel.ConnectedToServer = status; this.mainWindowViewModel.InfoModel.ConnectedToServer = status;
this.LoginStatus = status; this.InvertedLoginStatus = !status;
if (status) if (status)
{ {
this.mainWindowViewModel.SelectedViewModel = new MainViewModel(mainWindowViewModel); this.mainWindowViewModel.SelectedViewModel = new MainViewModel(mainWindowViewModel);

5
ClientApp/Views/LoginView.xaml
View File

@@ -14,9 +14,8 @@
<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 InvertedLoginStatus}" PopupAnimation = "Fade" HorizontalAlignment="Left">
<Popup IsOpen="{Binding LoginStatus}" PopupAnimation = "Slide"> <Label Content="Login failed" Foreground="Red" Background="#FFFF" />
<Label Content="Login failed" Foreground="Red"/>
</Popup> </Popup>
</StackPanel> </StackPanel>
</DockPanel> </DockPanel>