diff --git a/lib/pages/auth/bloc/auth_bloc.dart b/lib/pages/auth/bloc/auth_bloc.dart index 95ecb0ad..b931d90d 100644 --- a/lib/pages/auth/bloc/auth_bloc.dart +++ b/lib/pages/auth/bloc/auth_bloc.dart @@ -52,7 +52,8 @@ class AuthBloc extends Bloc { try { forgetEmailValidate = ''; _remainingTime = (await AuthenticationAPI.sendOtp( - email: forgetEmailController.text, regionUuid: regionUuid))!; + email: forgetEmailController.text, + ))!; } on DioException catch (e) { if (e.response!.statusCode == 400) { final errorData = e.response!.data; @@ -139,7 +140,7 @@ class AuthBloc extends Bloc { String validate = ''; String forgetValidate = ''; String forgetEmailValidate = ''; - String regionUuid = ''; + // String regionUuid = ''; static Token token = Token.emptyConstructor(); static UserModel? user; bool showValidationMessage = false; @@ -156,7 +157,9 @@ class AuthBloc extends Bloc { token = await AuthenticationAPI.loginWithEmail( model: LoginWithEmailModel( - email: event.username, password: event.password, regionUuid: event.regionUuid), + email: event.username, + password: event.password, + ), ); } catch (failure) { validate = 'Invalid Credentials!'; @@ -364,7 +367,7 @@ class AuthBloc extends Bloc { Future selectRegion(SelectRegionEvent event, Emitter emit) async { try { emit(AuthLoading()); - regionUuid = event.val; + // regionUuid = event.val; add(CheckEnableEvent()); emit(AuthInitialState()); } catch (e) { @@ -397,8 +400,7 @@ class AuthBloc extends Bloc { emit(AuthLoading()); checkValidate = isChecked == true && loginPasswordController.text.isNotEmpty && - loginEmailController.text.isNotEmpty && - regionUuid != ''; + loginEmailController.text.isNotEmpty; emit(LoginInitial()); return checkValidate; } diff --git a/lib/pages/auth/bloc/auth_event.dart b/lib/pages/auth/bloc/auth_event.dart index fa7e86b3..2b6a4eef 100644 --- a/lib/pages/auth/bloc/auth_event.dart +++ b/lib/pages/auth/bloc/auth_event.dart @@ -10,16 +10,16 @@ abstract class AuthEvent extends Equatable { class LoginButtonPressed extends AuthEvent { final String username; final String password; - final String regionUuid; + // final String regionUuid; const LoginButtonPressed({ required this.username, required this.password, - required this.regionUuid, + // required this.regionUuid, }); @override - List get props => [username, password, regionUuid]; + List get props => [username, password]; } class CheckBoxEvent extends AuthEvent { @@ -49,13 +49,9 @@ class UpdateTimerEvent extends AuthEvent { const UpdateTimerEvent({required this.remainingTime, required this.isButtonEnabled}); } -class ChangePasswordEvent extends AuthEvent { +class ChangePasswordEvent extends AuthEvent {} -} - -class SendOtpEvent extends AuthEvent { - -} +class SendOtpEvent extends AuthEvent {} class PasswordVisibleEvent extends AuthEvent { final bool? newValue; diff --git a/lib/pages/auth/model/login_with_email_model.dart b/lib/pages/auth/model/login_with_email_model.dart index 88be9808..ec3d4d98 100644 --- a/lib/pages/auth/model/login_with_email_model.dart +++ b/lib/pages/auth/model/login_with_email_model.dart @@ -1,19 +1,19 @@ class LoginWithEmailModel { final String email; final String password; - final String regionUuid; + // final String regionUuid; LoginWithEmailModel({ required this.email, required this.password, - required this.regionUuid, + // required this.regionUuid, }); factory LoginWithEmailModel.fromJson(Map json) { return LoginWithEmailModel( email: json['email'], password: json['password'], - regionUuid: json['regionUuid'], + // regionUuid: json['regionUuid'], ); } @@ -21,7 +21,7 @@ class LoginWithEmailModel { return { 'email': email, 'password': password, - 'regionUuid': regionUuid, + // 'regionUuid': regionUuid, }; } } diff --git a/lib/pages/auth/view/forget_password_web_page.dart b/lib/pages/auth/view/forget_password_web_page.dart index c04e7ee0..f389f44f 100644 --- a/lib/pages/auth/view/forget_password_web_page.dart +++ b/lib/pages/auth/view/forget_password_web_page.dart @@ -124,18 +124,18 @@ class ForgetPasswordWebPage extends StatelessWidget { .copyWith(fontSize: 14, fontWeight: FontWeight.w400), ), const SizedBox(height: 10), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - const SizedBox(height: 10), - Form( - key: forgetBloc.forgetRegionKey, - child: SizedBox( - child: - _buildDropdownField(context, forgetBloc, size))) - ], - ), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // const SizedBox(height: 10), + // Form( + // key: forgetBloc.forgetRegionKey, + // child: SizedBox( + // child: + // _buildDropdownField(context, forgetBloc, size))) + // ], + // ), const SizedBox(height: 20), Form( key: forgetBloc.forgetEmailKey, @@ -459,9 +459,9 @@ class ForgetPasswordWebPage extends StatelessWidget { ), ); }).toList(), - value: loginBloc.regionList!.any((region) => region.id == loginBloc.regionUuid) - ? loginBloc.regionUuid - : null, + // value: loginBloc.regionList!.any((region) => region.id == loginBloc.regionUuid) + // ? loginBloc.regionUuid + // : null, onChanged: (String? value) { if (value != null) { loginBloc.add(SelectRegionEvent(val: value)); diff --git a/lib/pages/auth/view/login_mobile_page.dart b/lib/pages/auth/view/login_mobile_page.dart index 1a5c8358..4f001bc6 100644 --- a/lib/pages/auth/view/login_mobile_page.dart +++ b/lib/pages/auth/view/login_mobile_page.dart @@ -6,7 +6,7 @@ import 'package:go_router/go_router.dart'; import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart'; import 'package:syncrow_web/pages/auth/bloc/auth_event.dart'; import 'package:syncrow_web/pages/auth/bloc/auth_state.dart'; -import 'package:syncrow_web/pages/auth/model/region_model.dart'; +// import 'package:syncrow_web/pages/auth/model/region_model.dart'; import 'package:syncrow_web/pages/auth/view/forget_password_page.dart'; import 'package:syncrow_web/pages/common/buttons/default_button.dart'; import 'package:syncrow_web/utils/color_manager.dart'; @@ -112,44 +112,44 @@ class LoginMobilePage extends StatelessWidget { color: Colors.white, fontSize: 24, fontWeight: FontWeight.bold), ), const SizedBox(height: 30), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Text( - "Country/Region", - style: Theme.of(context).textTheme.bodySmall, - ), - SizedBox( - child: DropdownButtonFormField( - validator: loginBloc.validateRegion, - icon: const Icon( - Icons.keyboard_arrow_down_outlined, - ), - decoration: textBoxDecoration()!.copyWith( - hintText: null, - ), - hint: const Align( - alignment: Alignment.centerLeft, - child: Text( - 'Select your region/country', - textAlign: TextAlign.center, - ), - ), - isDense: true, - style: const TextStyle(color: Colors.black), - items: loginBloc.regionList!.map((RegionModel region) { - return DropdownMenuItem( - value: region.name, - child: Text(region.name), - ); - }).toList(), - onChanged: (String? value) {}, - ), - ) - ], - ), - const SizedBox(height: 20.0), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // Text( + // "Country/Region", + // style: Theme.of(context).textTheme.bodySmall, + // ), + // SizedBox( + // child: DropdownButtonFormField( + // validator: loginBloc.validateRegion, + // icon: const Icon( + // Icons.keyboard_arrow_down_outlined, + // ), + // decoration: textBoxDecoration()!.copyWith( + // hintText: null, + // ), + // hint: const Align( + // alignment: Alignment.centerLeft, + // child: Text( + // 'Select your region/country', + // textAlign: TextAlign.center, + // ), + // ), + // isDense: true, + // style: const TextStyle(color: Colors.black), + // items: loginBloc.regionList!.map((RegionModel region) { + // return DropdownMenuItem( + // value: region.name, + // child: Text(region.name), + // ); + // }).toList(), + // onChanged: (String? value) {}, + // ), + // ) + // ], + // ), + // const SizedBox(height: 20.0), Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, @@ -207,7 +207,10 @@ class LoginMobilePage extends StatelessWidget { }, child: Text( "Forgot Password?", - style: Theme.of(context).textTheme.bodySmall, + style: Theme.of(context) + .textTheme + .bodySmall! + .copyWith(color: ColorsManager.blackColor), ), ), ], @@ -276,7 +279,6 @@ class LoginMobilePage extends StatelessWidget { if (loginBloc.loginFormKey.currentState!.validate()) { loginBloc.add( LoginButtonPressed( - regionUuid: '', username: loginBloc.loginEmailController.text, password: loginBloc.loginPasswordController.text, ), diff --git a/lib/pages/auth/view/login_web_page.dart b/lib/pages/auth/view/login_web_page.dart index 303dac76..72cad7cc 100644 --- a/lib/pages/auth/view/login_web_page.dart +++ b/lib/pages/auth/view/login_web_page.dart @@ -155,8 +155,8 @@ class _LoginWebPageState extends State with HelperResponsiveLayout children: [ const SizedBox(height: 40), Text('Login', style: Theme.of(context).textTheme.headlineLarge), - SizedBox(height: size.height * 0.03), - _buildDropdownField(context, loginBloc, size), + // SizedBox(height: size.height * 0.03), + // _buildDropdownField(context, loginBloc, size), const SizedBox(height: 20.0), _buildEmailField(context, loginBloc), const SizedBox(height: 20.0), @@ -219,11 +219,11 @@ class _LoginWebPageState extends State with HelperResponsiveLayout ), ); }).toList(), - value: loginBloc.regionList!.any( - (region) => region.id == loginBloc.regionUuid, - ) - ? loginBloc.regionUuid - : null, + // value: loginBloc.regionList!.any( + // (region) => region.id == loginBloc.regionUuid, + // ) + // ? loginBloc.regionUuid + // : null, onChanged: (String? value) { if (value != null) { loginBloc.add(CheckEnableEvent()); @@ -462,7 +462,7 @@ class _LoginWebPageState extends State with HelperResponsiveLayout onPressed: () { if (loginBloc.loginFormKey.currentState!.validate()) { loginBloc.add(LoginButtonPressed( - regionUuid: loginBloc.regionUuid, + // regionUuid: loginBloc.regionUuid, username: loginBloc.loginEmailController.text, password: loginBloc.loginPasswordController.text, )); diff --git a/lib/services/auth_api.dart b/lib/services/auth_api.dart index 2b158cdb..190eb624 100644 --- a/lib/services/auth_api.dart +++ b/lib/services/auth_api.dart @@ -22,16 +22,16 @@ class AuthenticationAPI { }) async { final response = await HTTPService().post( path: ApiEndpoints.forgetPassword, - body: {"email": email, "password": password,"otpCode": otpCode}, + body: {"email": email, "password": password, "otpCode": otpCode}, showServerMessage: true, expectedResponseModel: (json) {}); return response; } - static Future sendOtp({required String email, required String regionUuid}) async { + static Future sendOtp({required String email}) async { final response = await HTTPService().post( path: ApiEndpoints.sendOtp, - body: {"email": email, "type": "PASSWORD", "regionUuid": regionUuid}, + body: {"email": email, "type": "PASSWORD"}, showServerMessage: true, expectedResponseModel: (json) { return json['data']['cooldown'];