Improved Keyboard View.

Applies TouchPanel to PPC.
Implemented LoginView for PPC.

2 files changed, 49 insertions, 8 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
index 5bc02f829..f14fb7283 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
@@ -34,14 +34,9 @@ namespace Tango.PPC.UI.ViewModels
         /// <summary>
         /// Called when the application has been started.
         /// </summary>
-        public async override void OnApplicationStarted()
+        public override void OnApplicationStarted()
         {
-            ApplicationManager.ModulesInitialized += (_, __) =>
-            {
-                NavigationManager.NavigateTo(NavigationView.HomeModule);
-            };
-
-            await AuthenticationProvider.Login("roy@twine-s.com", "1234");
+            NavigationManager.NavigateTo(NavigationView.LoginView);
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
index 6962de59d..5086fd323 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
@@ -3,15 +3,61 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core.Commands;
 using Tango.PPC.Common;
+using Tango.PPC.Common.Navigation;
+using SimpleValidator.Extensions;
+using System.ComponentModel.DataAnnotations;
 
 namespace Tango.PPC.UI.ViewModels
 {
     public class LoginViewVM : PPCViewModel
     {
+        public RelayCommand LoginCommand { get; set; }
+
+        private String _email;
+        [Required(ErrorMessage = "Email is required")]
+        [EmailAddress(ErrorMessage = "Please enter a valid email address")]
+        public String Email
+        {
+            get { return _email; }
+            set { _email = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _password;
+        [Required(ErrorMessage = "Password is required")]
+        public String Password
+        {
+            get { return _password; }
+            set { _password = value; RaisePropertyChangedAuto(); }
+        }
+
+        public LoginViewVM()
+        {
+            LoginCommand = new RelayCommand(Login);
+        }
+
         public override void OnApplicationStarted()
         {
-            
+
+        }
+
+        private void Login()
+        {
+            if (Validate())
+            {
+                var user = AuthenticationProvider.Login(Email, Password);
+
+                if (user == null)
+                {
+                    NotificationProvider.ShowWarning("Email or password are incorrect.");
+                }
+
+                ApplicationManager.ModulesInitialized += (_, __) =>
+                {
+                    NavigationManager.NavigateTo(NavigationView.HomeModule);
+                };
+            }
         }
     }
 }