From 065ed2bfa0ac4c4d9b73f1374345c69322fb5c90 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Mon, 23 Nov 2020 19:20:34 +0100 Subject: [PATCH] Added: Login Pages (Select Host, Choose Login Method, Login with Password) --- Borepin/Borepin/App.xaml.cs | 8 +-- Borepin/Borepin/Borepin.csproj | 9 +++ Borepin/Borepin/Page/HostSelectPage.xaml | 17 ++++++ Borepin/Borepin/Page/HostSelectPage.xaml.cs | 20 +++++++ Borepin/Borepin/Page/LoginChoosePage.xaml | 19 ++++++ Borepin/Borepin/Page/LoginChoosePage.xaml.cs | 20 +++++++ Borepin/Borepin/Page/LoginPasswordPage.xaml | 19 ++++++ .../Borepin/Page/LoginPasswordPage.xaml.cs | 20 +++++++ .../Borepin/PageModel/HostSelectPageModel.cs | 60 +++++++++++++++++++ .../Borepin/PageModel/LoginChoosePageModel.cs | 38 ++++++++++++ .../PageModel/LoginPasswordPageModel.cs | 56 +++++++++++++++++ Borepin/Borepin/PageModel/MachinePageModel.cs | 4 +- Borepin/Borepin/Service/MachineService.cs | 5 ++ 13 files changed, 289 insertions(+), 6 deletions(-) create mode 100644 Borepin/Borepin/Page/HostSelectPage.xaml create mode 100644 Borepin/Borepin/Page/HostSelectPage.xaml.cs create mode 100644 Borepin/Borepin/Page/LoginChoosePage.xaml create mode 100644 Borepin/Borepin/Page/LoginChoosePage.xaml.cs create mode 100644 Borepin/Borepin/Page/LoginPasswordPage.xaml create mode 100644 Borepin/Borepin/Page/LoginPasswordPage.xaml.cs create mode 100644 Borepin/Borepin/PageModel/HostSelectPageModel.cs create mode 100644 Borepin/Borepin/PageModel/LoginChoosePageModel.cs create mode 100644 Borepin/Borepin/PageModel/LoginPasswordPageModel.cs diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs index a0e9e50..75cdde7 100644 --- a/Borepin/Borepin/App.xaml.cs +++ b/Borepin/Borepin/App.xaml.cs @@ -18,7 +18,7 @@ namespace Borepin { InitializeComponent(); - var result = await NavigationService.NavigateAsync("MainPage/NavigationPage/MachinesPage"); + var result = await NavigationService.NavigateAsync("//NavigationPage/HostSelectPage"); if (!result.Success) { @@ -33,9 +33,9 @@ namespace Borepin containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); - - // Use Admin as Default - containerRegistry.RegisterInstance(typeof(BFFHInterface), BFFHService.Auth(BFFHService.AdminID)); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); } } } diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj index fbc0d73..f3b76b6 100644 --- a/Borepin/Borepin/Borepin.csproj +++ b/Borepin/Borepin/Borepin.csproj @@ -46,6 +46,15 @@ + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + MSBuild:UpdateDesignTimeXaml diff --git a/Borepin/Borepin/Page/HostSelectPage.xaml b/Borepin/Borepin/Page/HostSelectPage.xaml new file mode 100644 index 0000000..bcd172f --- /dev/null +++ b/Borepin/Borepin/Page/HostSelectPage.xaml @@ -0,0 +1,17 @@ + + + + + + + + + +