ammar/syncrow-web
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/web.git synced 2025-07-10 15:17:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from SyncrowIOT/web_changes_1

Browse Source 
fix changes
This commit is contained in:
Abdullah
2024-09-09 13:12:22 +03:00
committed by GitHub
parent 177baca864 2162c996ea
commit eddd4828bb
4 changed files with 706 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/pages/auth/bloc/auth_bloc.dart
View File

@ -34,6 +34,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
final TextEditingController forgetPasswordController = TextEditingController();
final TextEditingController forgetOtp = TextEditingController();
final forgetFormKey = GlobalKey<FormState>();
final forgetEmailKey = GlobalKey<FormState>();
final forgetRegionKey = GlobalKey<FormState>();
late bool checkValidate = false;
Timer? _timer;
@ -93,34 +95,36 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
}
Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
try {
emit(LoadingForgetState());
var response = await AuthenticationAPI.verifyOtp(
email: forgetEmailController.text, otpCode: forgetOtp.text);
if (response == true) {
await AuthenticationAPI.forgetPassword(
password: forgetPasswordController.text, email: forgetEmailController.text);
_timer?.cancel();
emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
emit(SuccessForgetState());
emit(LoadingForgetState());
try {
var response = await AuthenticationAPI.verifyOtp(
email: forgetEmailController.text, otpCode: forgetOtp.text);
if (response == true) {
await AuthenticationAPI.forgetPassword(
password: forgetPasswordController.text,
email: forgetEmailController.text);
_timer?.cancel();
emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
emit(SuccessForgetState());
}
} on DioException catch (e) {
final errorData = e.response!.data;
String errorMessage = errorData['message'];
if (errorMessage == 'this email is not registered') {
validate = 'Invalid Credentials!';
emit(AuthInitialState());
} else if (errorMessage == "You entered wrong otp") {
forgetValidate = 'Wrong one time password.';
emit(AuthInitialState());
} else if (errorMessage == "OTP expired") {
forgetValidate = 'One time password has been expired.';
emit(AuthInitialState());
} else {
validate = '';
emit(AuthInitialState());
}
}
} on DioException catch (e) {
final errorData = e.response!.data;
String errorMessage = errorData['message'];
if (errorMessage == 'this email is not registered') {
validate = 'Invalid Credentials!';
emit(AuthInitialState());
} else if (errorMessage == "You entered wrong otp") {
forgetValidate = 'Wrong one time password.';
emit(AuthInitialState());
} else if (errorMessage == "OTP expired") {
forgetValidate = 'One time password has been expired.';
emit(AuthInitialState());
} else {
validate = '';
emit(AuthInitialState());
}
}
}
String? validateCode(String? value) {
@ -231,9 +235,10 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
return 'Email is required';
} else if (!RegExp(r'^[^@]+@[^@]+\.[^@]+').hasMatch(value)) {
return 'Enter a valid email address';
} else if (regionUuid == '') {
return 'Please select your region';
}
// else if (regionUuid == '') {
// return 'Please select your region';
// }
validate = '';
return null;
}
@ -371,6 +376,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
try {
emit(AuthLoading());
regionUuid = event.val;
add(CheckEnableEvent());
emit(AuthInitialState());
} catch (e) {
emit(FailureForgetState(error: e.toString()));

995
lib/pages/auth/view/forget_password_web_page.dart
View File

File diff suppressed because it is too large Load Diff

4
lib/pages/common/hour_picker_dialog.dart
View File

@ -10,7 +10,7 @@ class HourPickerDialog extends StatefulWidget {
class _HourPickerDialogState extends State<HourPickerDialog> {
late int _selectedHour;
bool _isPm = false;
bool _isPm = true;
@override
void initState() {
@ -18,7 +18,7 @@ class _HourPickerDialogState extends State<HourPickerDialog> {
_selectedHour = widget.initialTime.hour > 12
? widget.initialTime.hour - 12
: widget.initialTime.hour;
_isPm = widget.initialTime.period == DayPeriod.pm;
_isPm = widget.initialTime.period == DayPeriod.am;
}
@override

2
lib/pages/device_managment/ac/view/ac_device_control.dart
View File

@ -69,7 +69,7 @@ class AcDeviceControl extends StatelessWidget with HelperResponsiveLayout {
deviceId: device.uuid!,
description: 'Child Lock',
icon:
state.status.childLock ? Assets.unlock : Assets.childLock,
state.status.childLock ? Assets.childLock:Assets.unlock ,
),
],
);