diff --git a/ClientApp/ViewModels/LoginViewModel.cs b/ClientApp/ViewModels/LoginViewModel.cs index 345205e..dab0455 100644 --- a/ClientApp/ViewModels/LoginViewModel.cs +++ b/ClientApp/ViewModels/LoginViewModel.cs @@ -12,12 +12,15 @@ namespace ClientApp.ViewModels class LoginViewModel : ObservableObject { public string Username { get; set; } - public LoginViewModel() + //private MainWindowViewModel mainWindowViewModel; + public LoginViewModel(MainWindowViewModel mainWindowViewModel) { + //this.mainWindowViewModel = mainWindowViewModel; LoginCommand = new RelayCommand((parameter) => { Debug.WriteLine($"username {Username} password {((PasswordBox)parameter).Password}"); //TODO send username and password to server + mainWindowViewModel.SelectedViewModel = new MainViewModel(); }); } diff --git a/ClientApp/ViewModels/MainViewModel.cs b/ClientApp/ViewModels/MainViewModel.cs index 952439c..3e945e6 100644 --- a/ClientApp/ViewModels/MainViewModel.cs +++ b/ClientApp/ViewModels/MainViewModel.cs @@ -7,12 +7,11 @@ namespace ClientApp.ViewModels { class MainViewModel : ObservableObject { - - public ObservableObject SelectedViewModel { get; set; } + public string StatusLabelText { get; set; } public MainViewModel() { - SelectedViewModel = new LoginViewModel(); + StatusLabelText = "Status: not running"; } } } diff --git a/ClientApp/ViewModels/MainWindowViewModel.cs b/ClientApp/ViewModels/MainWindowViewModel.cs new file mode 100644 index 0000000..1044d10 --- /dev/null +++ b/ClientApp/ViewModels/MainWindowViewModel.cs @@ -0,0 +1,18 @@ +using ClientApp.Utils; +using System; +using System.Collections.Generic; +using System.Text; + +namespace ClientApp.ViewModels +{ + class MainWindowViewModel : ObservableObject + { + + public ObservableObject SelectedViewModel { get; set; } + + public MainWindowViewModel() + { + SelectedViewModel = new LoginViewModel(this); + } + } +} diff --git a/ClientApp/Views/MainView.xaml b/ClientApp/Views/MainView.xaml index ab49d25..21d15ff 100644 --- a/ClientApp/Views/MainView.xaml +++ b/ClientApp/Views/MainView.xaml @@ -6,8 +6,15 @@ xmlns:local="clr-namespace:ClientApp.Views" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"> - - + + + diff --git a/ClientApp/Views/MainWindow.xaml.cs b/ClientApp/Views/MainWindow.xaml.cs index 5e62f41..4ae4a80 100644 --- a/ClientApp/Views/MainWindow.xaml.cs +++ b/ClientApp/Views/MainWindow.xaml.cs @@ -24,7 +24,7 @@ namespace ClientApp public MainWindow() { InitializeComponent(); - DataContext = new MainViewModel(); + DataContext = new MainWindowViewModel(); } } }