From 6ff81c47b5183d05b449f8bda9873871c3796c68 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Thu, 31 Mar 2022 10:32:44 +0300 Subject: [PATCH] fix issues --- lib/api/client/user_api_client.dart | 12 ++++-- lib/pages/user/complete_profile_page.dart | 8 ++-- lib/pages/user/edit_account_page.dart | 43 ++++++++++++-------- lib/pages/user/login_with_password_page.dart | 2 +- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/lib/api/client/user_api_client.dart b/lib/api/client/user_api_client.dart index 8bed061..abf1fc3 100644 --- a/lib/api/client/user_api_client.dart +++ b/lib/api/client/user_api_client.dart @@ -47,7 +47,13 @@ class UserApiClent { } Future basicComplete(String userId, String firstName, String lastName, String email, String password) async { - var postParams = {"userID": userId, "firstName": firstName, "lastName": lastName, "email": email, "companyName": "string", "isEmailVerified": true, "password": password}; + var postParams; + if(email.isEmpty){ + postParams = {"userID": userId, "firstName": firstName, "lastName": lastName, "companyName": "string", "isEmailVerified": true, "password": password}; + }else{ + postParams = {"userID": userId, "firstName": firstName, "lastName": lastName, "email": email, "companyName": "string", "isEmailVerified": true, "password": password}; + } + return await ApiClient().postJsonForObject((json) => RegisterUser.fromJson(json), ApiConsts.BasicComplete, postParams); } @@ -177,13 +183,13 @@ class UserApiClent { return await ApiClient().postJsonForObject((json) => VerifyEmail.fromJson(json), ApiConsts.EmailVerify, postParams, token: t); } - Future EmailVerifyOTPVerify(String userToken, String userOTP) async { + Future EmailVerifyOTPVerify(String userToken, String userOTP) async { var postParams = {"userToken": userToken, "userOTP": userOTP}; String t = AppState().getUser.data!.accessToken ?? ""; - return await ApiClient().postJsonForObject((json) => VerifyEmailOTP.fromJson(json), ApiConsts.EmailVerifyOTPVerify, postParams, token: t); + return await ApiClient().postJsonForObject((json) => MResponse.fromJson(json), ApiConsts.EmailVerifyOTPVerify, postParams, token: t); } } diff --git a/lib/pages/user/complete_profile_page.dart b/lib/pages/user/complete_profile_page.dart index a63aeaf..09be0a6 100644 --- a/lib/pages/user/complete_profile_page.dart +++ b/lib/pages/user/complete_profile_page.dart @@ -52,7 +52,7 @@ class _CompleteProfilePageState extends State { 12.height, TxtField( - hint: "First Name", + hint: "First Name *", value: firstName, onChanged: (v) { firstName = v; @@ -60,7 +60,7 @@ class _CompleteProfilePageState extends State { ), 12.height, TxtField( - hint: "Surname", + hint: "Surname *", value: lastName, onChanged: (v) { lastName = v; @@ -78,7 +78,7 @@ class _CompleteProfilePageState extends State { ), 12.height, TxtField( - hint: "Create Password", + hint: "Create Password *", isPasswordEnabled: true, maxLines: 1, value: password, @@ -88,7 +88,7 @@ class _CompleteProfilePageState extends State { ), 12.height, TxtField( - hint: "Confirm Password", + hint: "Confirm Password *", isPasswordEnabled: true, maxLines: 1, value: confirmPassword, diff --git a/lib/pages/user/edit_account_page.dart b/lib/pages/user/edit_account_page.dart index b6ba583..9776b28 100644 --- a/lib/pages/user/edit_account_page.dart +++ b/lib/pages/user/edit_account_page.dart @@ -3,10 +3,12 @@ import 'dart:convert'; import 'package:car_provider_app/api/client/user_api_client.dart'; +import 'package:car_provider_app/classes/app_state.dart'; import 'package:car_provider_app/classes/utils.dart'; import 'package:car_provider_app/config/routes.dart'; import 'package:car_provider_app/extensions/int_extensions.dart'; import 'package:car_provider_app/extensions/string_extensions.dart'; +import 'package:car_provider_app/models/m_response.dart'; import 'package:car_provider_app/models/user/verify_email.dart'; import 'package:car_provider_app/models/user/verify_email_otp.dart'; import 'package:car_provider_app/utils/navigator.dart'; @@ -52,7 +54,7 @@ class _EditAccountPageState extends State { children: [ SvgPicture.asset("assets/images/ic_mobile.svg"), "Change Mobile".toText12(), - "Verified".toText12(), + "Verify".toText12(), RaisedButton( onPressed: (){ navigateWithName(context, AppRoutes.changeMobilePage); @@ -71,11 +73,14 @@ class _EditAccountPageState extends State { children: [ Icon(Icons.email, color: Colors.blue,), "Change Email".toText12(), - InkWell( - child: "Verify".toText12(), - onTap:() { - verifyEmail(context); - }, + InkWell( + child:((AppState().getUser.data!.userInfo!.isEmailVerified??false)?"Verified" :"Verify").toText12(), + onTap: + (AppState().getUser.data!.userInfo!.isEmailVerified??false) ? + null + :(){ + verifyEmail(context); + }, ), RaisedButton( onPressed: (){ @@ -120,20 +125,22 @@ class _EditAccountPageState extends State { onClick: (String code) async { pop(context); Utils.showLoading(context); - VerifyEmailOTP otpCompare = await UserApiClent().EmailVerifyOTPVerify(otpRequest.data!.userToken ?? "", code); + MResponse otpCompare = await UserApiClent().EmailVerifyOTPVerify(otpRequest.data!.userToken ?? "", code); Utils.hideLoading(context); - if (otpCompare.success == true) { - showMDialog( - context, - child: MessageDialog( - title: "Email is Verified", - onClick: () { - Navigator.of(context).pushNamedAndRemoveUntil(AppRoutes.dashboard, (Route route) => false); - }, - ), - ); + if (otpCompare.messageStatus == 1) { + Utils.showToast("Email is verified successfully"); + // Navigator.of(context).pushNamedAndRemoveUntil(AppRoutes.dashboard, (Route route) => false); + // showMDialog( + // context, + // child: MessageDialog( + // title: "Email is Verified", + // onClick: () { + // Navigator.of(context).pushNamedAndRemoveUntil(AppRoutes.dashboard, (Route route) => false); + // }, + // ), + // ); } else { - Utils.showToast(otpCompare.errors ?? ""); + Utils.showToast(otpCompare.message ?? ""); } }, )); diff --git a/lib/pages/user/login_with_password_page.dart b/lib/pages/user/login_with_password_page.dart index dd7b671..0a090b5 100644 --- a/lib/pages/user/login_with_password_page.dart +++ b/lib/pages/user/login_with_password_page.dart @@ -104,7 +104,7 @@ class _LoginWithPasswordState extends State { Row( mainAxisAlignment: MainAxisAlignment.end, children: [ - "Forget Password".toText12(color: Colors.blue).onPress(() { + "Forget Password ?".toText12(color: Colors.blue).onPress(() { navigateWithName(context, AppRoutes.forgetPassword); }), ],