fix issues

fatima
Fatimah Alshammari 4 years ago
parent 4f17e7f22b
commit 6ff81c47b5

@ -47,7 +47,13 @@ class UserApiClent {
} }
Future<RegisterUser> basicComplete(String userId, String firstName, String lastName, String email, String password) async { Future<RegisterUser> 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); 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); return await ApiClient().postJsonForObject((json) => VerifyEmail.fromJson(json), ApiConsts.EmailVerify, postParams, token: t);
} }
Future<VerifyEmailOTP> EmailVerifyOTPVerify(String userToken, String userOTP) async { Future<MResponse> EmailVerifyOTPVerify(String userToken, String userOTP) async {
var postParams = var postParams =
{"userToken": userToken, {"userToken": userToken,
"userOTP": userOTP}; "userOTP": userOTP};
String t = AppState().getUser.data!.accessToken ?? ""; 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);
} }
} }

@ -52,7 +52,7 @@ class _CompleteProfilePageState extends State<CompleteProfilePage> {
12.height, 12.height,
TxtField( TxtField(
hint: "First Name", hint: "First Name *",
value: firstName, value: firstName,
onChanged: (v) { onChanged: (v) {
firstName = v; firstName = v;
@ -60,7 +60,7 @@ class _CompleteProfilePageState extends State<CompleteProfilePage> {
), ),
12.height, 12.height,
TxtField( TxtField(
hint: "Surname", hint: "Surname *",
value: lastName, value: lastName,
onChanged: (v) { onChanged: (v) {
lastName = v; lastName = v;
@ -78,7 +78,7 @@ class _CompleteProfilePageState extends State<CompleteProfilePage> {
), ),
12.height, 12.height,
TxtField( TxtField(
hint: "Create Password", hint: "Create Password *",
isPasswordEnabled: true, isPasswordEnabled: true,
maxLines: 1, maxLines: 1,
value: password, value: password,
@ -88,7 +88,7 @@ class _CompleteProfilePageState extends State<CompleteProfilePage> {
), ),
12.height, 12.height,
TxtField( TxtField(
hint: "Confirm Password", hint: "Confirm Password *",
isPasswordEnabled: true, isPasswordEnabled: true,
maxLines: 1, maxLines: 1,
value: confirmPassword, value: confirmPassword,

@ -3,10 +3,12 @@
import 'dart:convert'; import 'dart:convert';
import 'package:car_provider_app/api/client/user_api_client.dart'; 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/classes/utils.dart';
import 'package:car_provider_app/config/routes.dart'; import 'package:car_provider_app/config/routes.dart';
import 'package:car_provider_app/extensions/int_extensions.dart'; import 'package:car_provider_app/extensions/int_extensions.dart';
import 'package:car_provider_app/extensions/string_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.dart';
import 'package:car_provider_app/models/user/verify_email_otp.dart'; import 'package:car_provider_app/models/user/verify_email_otp.dart';
import 'package:car_provider_app/utils/navigator.dart'; import 'package:car_provider_app/utils/navigator.dart';
@ -52,7 +54,7 @@ class _EditAccountPageState extends State<EditAccountPage> {
children: [ children: [
SvgPicture.asset("assets/images/ic_mobile.svg"), SvgPicture.asset("assets/images/ic_mobile.svg"),
"Change Mobile".toText12(), "Change Mobile".toText12(),
"Verified".toText12(), "Verify".toText12(),
RaisedButton( RaisedButton(
onPressed: (){ onPressed: (){
navigateWithName(context, AppRoutes.changeMobilePage); navigateWithName(context, AppRoutes.changeMobilePage);
@ -71,11 +73,14 @@ class _EditAccountPageState extends State<EditAccountPage> {
children: [ children: [
Icon(Icons.email, color: Colors.blue,), Icon(Icons.email, color: Colors.blue,),
"Change Email".toText12(), "Change Email".toText12(),
InkWell( InkWell(
child: "Verify".toText12(), child:((AppState().getUser.data!.userInfo!.isEmailVerified??false)?"Verified" :"Verify").toText12(),
onTap:() { onTap:
verifyEmail(context); (AppState().getUser.data!.userInfo!.isEmailVerified??false) ?
}, null
:(){
verifyEmail(context);
},
), ),
RaisedButton( RaisedButton(
onPressed: (){ onPressed: (){
@ -120,20 +125,22 @@ class _EditAccountPageState extends State<EditAccountPage> {
onClick: (String code) async { onClick: (String code) async {
pop(context); pop(context);
Utils.showLoading(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); Utils.hideLoading(context);
if (otpCompare.success == true) { if (otpCompare.messageStatus == 1) {
showMDialog( Utils.showToast("Email is verified successfully");
context, // Navigator.of(context).pushNamedAndRemoveUntil(AppRoutes.dashboard, (Route<dynamic> route) => false);
child: MessageDialog( // showMDialog(
title: "Email is Verified", // context,
onClick: () { // child: MessageDialog(
Navigator.of(context).pushNamedAndRemoveUntil(AppRoutes.dashboard, (Route<dynamic> route) => false); // title: "Email is Verified",
}, // onClick: () {
), // Navigator.of(context).pushNamedAndRemoveUntil(AppRoutes.dashboard, (Route<dynamic> route) => false);
); // },
// ),
// );
} else { } else {
Utils.showToast(otpCompare.errors ?? ""); Utils.showToast(otpCompare.message ?? "");
} }
}, },
)); ));

@ -104,7 +104,7 @@ class _LoginWithPasswordState extends State<LoginWithPassword> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
"Forget Password".toText12(color: Colors.blue).onPress(() { "Forget Password ?".toText12(color: Colors.blue).onPress(() {
navigateWithName(context, AppRoutes.forgetPassword); navigateWithName(context, AppRoutes.forgetPassword);
}), }),
], ],

Loading…
Cancel
Save