From 6681c11444d74e1ef4a84ed82244bbcb0aa45b3d Mon Sep 17 00:00:00 2001 From: "Amir.H Khademi" Date: Fri, 14 May 2021 14:40:12 +0430 Subject: [PATCH] complete rls 2 --- iElection/iElection/App.xaml.cs | 2 +- .../Services/Rest/IAccountApiRest.cs | 2 + .../iElection/Utilities/PopUpUtilities.cs | 5 +- .../ViewModels/AddContactPageViewModel.cs | 8 ++- .../ViewModels/LoginPageViewModel.cs | 6 ++ iElection/iElection/Views/AddContactPage.xaml | 43 ++++-------- iElection/iElection/Views/LoginPage.xaml | 6 ++ .../Views/PopUps/ForegetPassPopUp.xaml | 66 +++++++++++++++++++ .../Views/PopUps/ForegetPassPopUp.xaml.cs | 51 ++++++++++++++ iElection/iElection/Views/SignUpPage.xaml | 2 + iElection/iElection/iElection.csproj | 3 + 11 files changed, 161 insertions(+), 33 deletions(-) create mode 100644 iElection/iElection/Views/PopUps/ForegetPassPopUp.xaml create mode 100644 iElection/iElection/Views/PopUps/ForegetPassPopUp.xaml.cs diff --git a/iElection/iElection/App.xaml.cs b/iElection/iElection/App.xaml.cs index f1ad3d1..f11b004 100644 --- a/iElection/iElection/App.xaml.cs +++ b/iElection/iElection/App.xaml.cs @@ -31,7 +31,7 @@ namespace iElection if (UtilitiesWrapper.Instance.UserUtilities.IsAuthorized) await NavigationService.NavigateAsync("NavigationPage/MainPage"); else - await NavigationService.NavigateAsync("NavigationPage/SignUpPage"); + await NavigationService.NavigateAsync("NavigationPage/LoginPage"); } catch (Exception e) { diff --git a/iElection/iElection/Services/Rest/IAccountApiRest.cs b/iElection/iElection/Services/Rest/IAccountApiRest.cs index cbb1ac3..faabbee 100644 --- a/iElection/iElection/Services/Rest/IAccountApiRest.cs +++ b/iElection/iElection/Services/Rest/IAccountApiRest.cs @@ -16,5 +16,7 @@ namespace iElection.Services.Rest Task> LoginUser([Body] LoginRequest loginRequest); [Post("/RegisterUser")] Task> RegisterUser([Body] RegisterDto registerDto); + [Post("/ForgetPassUser/{phone}")] + Task> ForgetPassUser(string phone); } } diff --git a/iElection/iElection/Utilities/PopUpUtilities.cs b/iElection/iElection/Utilities/PopUpUtilities.cs index 342626b..3bb4a74 100644 --- a/iElection/iElection/Utilities/PopUpUtilities.cs +++ b/iElection/iElection/Utilities/PopUpUtilities.cs @@ -29,9 +29,10 @@ namespace iElection.Utilities }); } - public async void PushIndicator() + public async void PushIndicator(bool popOthers = true) { - await PopAsync(); + if(popOthers) + await PopAsync(); var indicator = new Frame { BackgroundColor = Color.White, diff --git a/iElection/iElection/ViewModels/AddContactPageViewModel.cs b/iElection/iElection/ViewModels/AddContactPageViewModel.cs index bc8169b..9104098 100644 --- a/iElection/iElection/ViewModels/AddContactPageViewModel.cs +++ b/iElection/iElection/ViewModels/AddContactPageViewModel.cs @@ -36,9 +36,15 @@ namespace iElection.ViewModels var contact = parameters.GetValue("Contact"); if (contact != null) { - PageDto = contact; IsAdding = false; IsReadOnly = true; + PageDto.Age = contact.Age; + PageDto.District = contact.District; + PageDto.FirstName = contact.FirstName; + PageDto.LastName = contact.LastName; + PageDto.Gender = contact.Gender; + PageDto.Job = contact.Job; + PageDto.Phone = contact.Phone; Title = PageDto.FullName; } else diff --git a/iElection/iElection/ViewModels/LoginPageViewModel.cs b/iElection/iElection/ViewModels/LoginPageViewModel.cs index acae8f5..ebc1a22 100644 --- a/iElection/iElection/ViewModels/LoginPageViewModel.cs +++ b/iElection/iElection/ViewModels/LoginPageViewModel.cs @@ -7,6 +7,7 @@ using System.Windows.Input; using iElection.Models.Api; using iElection.Services.Contracts; using iElection.Utilities; +using iElection.Views.PopUps; using Prism.Navigation; using Refit; @@ -16,6 +17,7 @@ namespace iElection.ViewModels { public ICommand SignUpCommand { get; set; } public ICommand LoginCommand { get; set; } + public ICommand ForgetPassCommand { get; set; } public LoginPageViewModel(INavigationService navigationService, IRestWrapper restWrapper) : base(navigationService, restWrapper) { @@ -52,6 +54,10 @@ namespace iElection.ViewModels { NavigationService.NavigateAsync("SignUpPage"); }); + ForgetPassCommand = new DelegateCommand(async () => + { + await UtilitiesWrapper.Instance.PopUpUtilities.PushAsync(new ForegetPassPopUp()); + }); } } } diff --git a/iElection/iElection/Views/AddContactPage.xaml b/iElection/iElection/Views/AddContactPage.xaml index 54c0692..b97e036 100644 --- a/iElection/iElection/Views/AddContactPage.xaml +++ b/iElection/iElection/Views/AddContactPage.xaml @@ -47,10 +47,7 @@ Padding="8,3" HasShadow="True" MaterialTheme="Acrylic"> - + - + @@ -164,16 +155,14 @@ HasShadow="True" MaterialTheme="Acrylic"> - +