From c362973c941eab96153f4b3c74facc1b1e0090d0 Mon Sep 17 00:00:00 2001 From: Abdullah Alassaf Date: Tue, 17 Dec 2024 01:55:08 +0300 Subject: [PATCH 1/2] Hide unused widgets --- .../view/access_management.dart | 73 +++--- lib/pages/auth/bloc/auth_bloc.dart | 40 +-- lib/pages/auth/view/login_web_page.dart | 4 +- .../ac/view/ac_device_batch_control.dart | 14 +- .../view/ceiling_sensor_batch_control.dart | 4 +- .../view/curtain_batch_status_view.dart | 11 +- .../view/door_lock_batch_control_view.dart | 27 +- .../view/garage_door_batch_control_view.dart | 19 +- .../gateway/view/gateway_batch_control.dart | 23 +- .../view/main_door_sensor_batch_view.dart | 24 +- .../one_gang_glass_batch_control_view.dart | 19 +- .../view/wall_light_batch_control.dart | 22 +- .../view/power_clamp_batch_control_view.dart | 29 +-- .../shared/batch_control/firmware_update.dart | 244 +++++++++--------- .../sos/view/sos_batch_control_view.dart | 19 +- ..._gang_glass_switch_batch_control_view.dart | 10 +- .../view/living_room_batch_controls.dart | 23 +- ..._gang_glass_switch_batch_control_view.dart | 14 +- .../view/wall_light_batch_control.dart | 16 +- .../view/wall_sensor_batch_control.dart | 4 +- .../view/water_heater_batch_control.dart | 20 +- .../view/water_leak_batch_control_view.dart | 29 +-- lib/pages/home/bloc/home_bloc.dart | 70 ++--- lib/pages/home/view/home_page_web.dart | 2 +- lib/utils/user_drop_down_menu.dart | 46 ++-- 25 files changed, 378 insertions(+), 428 deletions(-) diff --git a/lib/pages/access_management/view/access_management.dart b/lib/pages/access_management/view/access_management.dart index bed27eea..9fe3a722 100644 --- a/lib/pages/access_management/view/access_management.dart +++ b/lib/pages/access_management/view/access_management.dart @@ -11,7 +11,7 @@ import 'package:syncrow_web/pages/common/filter/filter_widget.dart'; import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart'; import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart'; import 'package:syncrow_web/pages/visitor_password/view/visitor_password_dialog.dart'; -import 'package:syncrow_web/utils/color_manager.dart'; +// import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/constants/app_enum.dart'; import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/extension/build_context_x.dart'; @@ -27,8 +27,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { final isLargeScreen = isLargeScreenSize(context); final isSmallScreen = isSmallScreenSize(context); final isHalfMediumScreen = isHafMediumScreenSize(context); - final padding = - isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15); + final padding = isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15); return WebScaffold( enableMenuSidebar: false, @@ -40,8 +39,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { ), rightBody: const NavigateHomeGridView(), scaffoldBody: BlocProvider( - create: (BuildContext context) => - AccessBloc()..add(FetchTableData()), + create: (BuildContext context) => AccessBloc()..add(FetchTableData()), child: BlocConsumer( listener: (context, state) {}, builder: (context, state) { @@ -95,14 +93,11 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { return [ item.passwordName, item.passwordType.value, - accessBloc - .timestampToDate(item.effectiveTime), - accessBloc - .timestampToDate(item.invalidTime), + accessBloc.timestampToDate(item.effectiveTime), + accessBloc.timestampToDate(item.invalidTime), item.deviceName.toString(), item.authorizerEmail.toString(), - accessBloc - .timestampToDate(item.invalidTime), + accessBloc.timestampToDate(item.invalidTime), item.passwordStatus.value, ]; }).toList(), @@ -113,8 +108,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { }))); } - Wrap _buildVisitorAdminPasswords( - BuildContext context, AccessBloc accessBloc) { + Wrap _buildVisitorAdminPasswords(BuildContext context, AccessBloc accessBloc) { return Wrap( spacing: 10, runSpacing: 10, @@ -140,23 +134,22 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { borderRadius: 8, child: Text( 'Create Visitor Password ', - style: context.textTheme.titleSmall! - .copyWith(color: Colors.white, fontSize: 12), - )), - ), - Container( - width: 133, - height: 42, - decoration: containerDecoration, - child: DefaultButton( - borderRadius: 8, - backgroundColor: ColorsManager.whiteColors, - child: Text( - 'Admin Password', - style: context.textTheme.titleSmall! - .copyWith(color: Colors.black, fontSize: 12), + style: context.textTheme.titleSmall!.copyWith(color: Colors.white, fontSize: 12), )), ), + // Container( + // width: 133, + // height: 42, + // decoration: containerDecoration, + // child: DefaultButton( + // borderRadius: 8, + // backgroundColor: ColorsManager.whiteColors, + // child: Text( + // 'Admin Password', + // style: context.textTheme.titleSmall! + // .copyWith(color: Colors.black, fontSize: 12), + // )), + // ), ], ); } @@ -179,10 +172,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { description: '', onSubmitted: (value) { accessBloc.add(FilterDataEvent( - emailAuthorizer: - accessBloc.emailAuthorizer.text.toLowerCase(), - selectedTabIndex: - BlocProvider.of(context).selectedIndex, + emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(), + selectedTabIndex: BlocProvider.of(context).selectedIndex, passwordName: accessBloc.passwordName.text.toLowerCase(), startTime: accessBloc.effectiveTimeTimeStamp, endTime: accessBloc.expirationTimeTimeStamp)); @@ -200,10 +191,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { description: '', onSubmitted: (value) { accessBloc.add(FilterDataEvent( - emailAuthorizer: - accessBloc.emailAuthorizer.text.toLowerCase(), - selectedTabIndex: - BlocProvider.of(context).selectedIndex, + emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(), + selectedTabIndex: BlocProvider.of(context).selectedIndex, passwordName: accessBloc.passwordName.text.toLowerCase(), startTime: accessBloc.effectiveTimeTimeStamp, endTime: accessBloc.expirationTimeTimeStamp)); @@ -232,8 +221,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { onSearch: () { accessBloc.add(FilterDataEvent( emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(), - selectedTabIndex: - BlocProvider.of(context).selectedIndex, + selectedTabIndex: BlocProvider.of(context).selectedIndex, passwordName: accessBloc.passwordName.text.toLowerCase(), startTime: accessBloc.effectiveTimeTimeStamp, endTime: accessBloc.expirationTimeTimeStamp)); @@ -261,10 +249,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { description: '', onSubmitted: (value) { accessBloc.add(FilterDataEvent( - emailAuthorizer: - accessBloc.emailAuthorizer.text.toLowerCase(), - selectedTabIndex: - BlocProvider.of(context).selectedIndex, + emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(), + selectedTabIndex: BlocProvider.of(context).selectedIndex, passwordName: accessBloc.passwordName.text.toLowerCase(), startTime: accessBloc.effectiveTimeTimeStamp, endTime: accessBloc.expirationTimeTimeStamp)); @@ -288,8 +274,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { onSearch: () { accessBloc.add(FilterDataEvent( emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(), - selectedTabIndex: - BlocProvider.of(context).selectedIndex, + selectedTabIndex: BlocProvider.of(context).selectedIndex, passwordName: accessBloc.passwordName.text.toLowerCase(), startTime: accessBloc.effectiveTimeTimeStamp, endTime: accessBloc.expirationTimeTimeStamp)); diff --git a/lib/pages/auth/bloc/auth_bloc.dart b/lib/pages/auth/bloc/auth_bloc.dart index 60cc2f86..95ecb0ad 100644 --- a/lib/pages/auth/bloc/auth_bloc.dart +++ b/lib/pages/auth/bloc/auth_bloc.dart @@ -31,8 +31,7 @@ class AuthBloc extends Bloc { ////////////////////////////// forget password ////////////////////////////////// final TextEditingController forgetEmailController = TextEditingController(); - final TextEditingController forgetPasswordController = - TextEditingController(); + final TextEditingController forgetPasswordController = TextEditingController(); final TextEditingController forgetOtp = TextEditingController(); final forgetFormKey = GlobalKey(); final forgetEmailKey = GlobalKey(); @@ -49,8 +48,7 @@ class AuthBloc extends Bloc { return; } _remainingTime = 1; - add(UpdateTimerEvent( - remainingTime: _remainingTime, isButtonEnabled: false)); + add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false)); try { forgetEmailValidate = ''; _remainingTime = (await AuthenticationAPI.sendOtp( @@ -86,8 +84,7 @@ class AuthBloc extends Bloc { _timer?.cancel(); add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true)); } else { - add(UpdateTimerEvent( - remainingTime: _remainingTime, isButtonEnabled: false)); + add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false)); } }); } @@ -97,8 +94,7 @@ class AuthBloc extends Bloc { emit(const TimerState(isButtonEnabled: true, remainingTime: 0)); } - Future changePassword( - ChangePasswordEvent event, Emitter emit) async { + Future changePassword(ChangePasswordEvent event, Emitter emit) async { emit(LoadingForgetState()); try { var response = await AuthenticationAPI.verifyOtp( @@ -114,8 +110,7 @@ class AuthBloc extends Bloc { } } on DioException catch (e) { final errorData = e.response!.data; - String errorMessage = - errorData['error']['message'] ?? 'something went wrong'; + String errorMessage = errorData['error']['message'] ?? 'something went wrong'; validate = errorMessage; emit(AuthInitialState()); } @@ -129,16 +124,14 @@ class AuthBloc extends Bloc { } void _onUpdateTimer(UpdateTimerEvent event, Emitter emit) { - emit(TimerState( - isButtonEnabled: event.isButtonEnabled, - remainingTime: event.remainingTime)); + emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime)); } ///////////////////////////////////// login ///////////////////////////////////// final TextEditingController loginEmailController = TextEditingController(); final TextEditingController loginPasswordController = TextEditingController(); final loginFormKey = GlobalKey(); - bool isChecked = false; + bool isChecked = true; bool obscureText = true; String newPassword = ''; String maskedEmail = ''; @@ -163,9 +156,7 @@ 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, regionUuid: event.regionUuid), ); } catch (failure) { validate = 'Invalid Credentials!'; @@ -175,8 +166,7 @@ class AuthBloc extends Bloc { if (token.accessTokenIsNotEmpty) { FlutterSecureStorage storage = const FlutterSecureStorage(); - await storage.write( - key: Token.loginAccessTokenKey, value: token.accessToken); + await storage.write(key: Token.loginAccessTokenKey, value: token.accessToken); const FlutterSecureStorage().write( key: UserModel.userUuidKey, value: Token.decodeToken(token.accessToken)['uuid'].toString()); @@ -334,14 +324,12 @@ class AuthBloc extends Bloc { static Future getTokenAndValidate() async { try { const storage = FlutterSecureStorage(); - final firstLaunch = await SharedPreferencesHelper.readBoolFromSP( - StringsManager.firstLaunch) ?? - true; + final firstLaunch = + await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true; if (firstLaunch) { storage.deleteAll(); } - await SharedPreferencesHelper.saveBoolToSP( - StringsManager.firstLaunch, false); + await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false); final value = await storage.read(key: Token.loginAccessTokenKey) ?? ''; if (value.isEmpty) { return 'Token not found'; @@ -394,9 +382,7 @@ class AuthBloc extends Bloc { final String formattedTime = [ if (days > 0) '${days}d', // Append 'd' for days if (days > 0 || hours > 0) - hours - .toString() - .padLeft(2, '0'), // Show hours if there are days or hours + hours.toString().padLeft(2, '0'), // Show hours if there are days or hours minutes.toString().padLeft(2, '0'), seconds.toString().padLeft(2, '0'), ].join(':'); diff --git a/lib/pages/auth/view/login_web_page.dart b/lib/pages/auth/view/login_web_page.dart index 555f8f4a..303dac76 100644 --- a/lib/pages/auth/view/login_web_page.dart +++ b/lib/pages/auth/view/login_web_page.dart @@ -163,8 +163,8 @@ class _LoginWebPageState extends State with HelperResponsiveLayout _buildPasswordField(context, loginBloc), const SizedBox(height: 20), _buildForgotPassword(context), - const SizedBox(height: 20), - _buildCheckbox(context, loginBloc, size), + // const SizedBox(height: 20), + // _buildCheckbox(context, loginBloc, size), const SizedBox(height: 20.0), _buildSignInButton(context, loginBloc, size), const SizedBox(height: 15.0), diff --git a/lib/pages/device_managment/ac/view/ac_device_batch_control.dart b/lib/pages/device_managment/ac/view/ac_device_batch_control.dart index 2da394c7..3005c1c5 100644 --- a/lib/pages/device_managment/ac/view/ac_device_batch_control.dart +++ b/lib/pages/device_managment/ac/view/ac_device_batch_control.dart @@ -8,7 +8,7 @@ import 'package:syncrow_web/pages/device_managment/ac/view/batch_control_list/ba import 'package:syncrow_web/pages/device_managment/ac/view/batch_control_list/batch_fan_speed.dart'; import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart'; import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/constants/assets.dart'; @@ -26,7 +26,8 @@ class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayo final isLarge = isLargeScreenSize(context); final isMedium = isMediumScreenSize(context); return BlocProvider( - create: (context) => AcBloc(deviceId: devicesIds.first)..add(AcFetchBatchStatusEvent(devicesIds)), + create: (context) => + AcBloc(deviceId: devicesIds.first)..add(AcFetchBatchStatusEvent(devicesIds)), child: BlocBuilder( builder: (context, state) { if (state is ACStatusLoaded) { @@ -98,7 +99,8 @@ class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayo ), Text( 'h', - style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor), + style: + context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor), ), Text( '30', @@ -107,7 +109,9 @@ class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayo fontWeight: FontWeight.bold, ), ), - Text('m', style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor)), + Text('m', + style: context.textTheme.bodySmall! + .copyWith(color: ColorsManager.blackColor)), IconButton( onPressed: () {}, icon: const Icon( @@ -138,7 +142,7 @@ class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayo )); }, ), - FirmwareUpdateWidget(deviceId: devicesIds.first, version: 5), + // FirmwareUpdateWidget(deviceId: devicesIds.first, version: 5), FactoryResetWidget( callFactoryReset: () { context.read().add(AcFactoryResetEvent( diff --git a/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_batch_control.dart b/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_batch_control.dart index b7f9af5d..cf645b6f 100644 --- a/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_batch_control.dart +++ b/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_batch_control.dart @@ -6,7 +6,7 @@ import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_e import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_state.dart'; import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/ceiling_sensor_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_space_type.dart'; import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart'; import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presense_nobody_time.dart'; @@ -110,7 +110,7 @@ class CeilingSensorBatchControlView extends StatelessWidget with HelperResponsiv ), ), ), - FirmwareUpdateWidget(deviceId: devicesIds.first, version: 4), + // FirmwareUpdateWidget(deviceId: devicesIds.first, version: 4), FactoryResetWidget( callFactoryReset: () { context.read().add( diff --git a/lib/pages/device_managment/curtain/view/curtain_batch_status_view.dart b/lib/pages/device_managment/curtain/view/curtain_batch_status_view.dart index b558c837..7c873e20 100644 --- a/lib/pages/device_managment/curtain/view/curtain_batch_status_view.dart +++ b/lib/pages/device_managment/curtain/view/curtain_batch_status_view.dart @@ -6,11 +6,10 @@ import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_bloc.dar import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_event.dart'; import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_state.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class CurtainBatchStatusView extends StatelessWidget - with HelperResponsiveLayout { +class CurtainBatchStatusView extends StatelessWidget with HelperResponsiveLayout { const CurtainBatchStatusView({super.key, required this.devicesIds}); final List devicesIds; @@ -18,8 +17,8 @@ class CurtainBatchStatusView extends StatelessWidget @override Widget build(BuildContext context) { return BlocProvider( - create: (context) => CurtainBloc(deviceId: devicesIds.first) - ..add(CurtainFetchBatchStatus(devicesIds)), + create: (context) => + CurtainBloc(deviceId: devicesIds.first)..add(CurtainFetchBatchStatus(devicesIds)), child: BlocBuilder( builder: (context, state) { if (state is CurtainStatusLoading) { @@ -68,7 +67,7 @@ class CurtainBatchStatusView extends StatelessWidget )); }, ), - FirmwareUpdateWidget(deviceId: devicesIds.first, version: 5), + // FirmwareUpdateWidget(deviceId: devicesIds.first, version: 5), FactoryResetWidget( callFactoryReset: () { context.read().add( diff --git a/lib/pages/device_managment/door_lock/view/door_lock_batch_control_view.dart b/lib/pages/device_managment/door_lock/view/door_lock_batch_control_view.dart index abbd48dd..b28737fc 100644 --- a/lib/pages/device_managment/door_lock/view/door_lock_batch_control_view.dart +++ b/lib/pages/device_managment/door_lock/view/door_lock_batch_control_view.dart @@ -4,11 +4,10 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re import 'package:syncrow_web/pages/device_managment/door_lock/bloc/door_lock_bloc.dart'; import 'package:syncrow_web/pages/device_managment/door_lock/bloc/door_lock_event.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class DoorLockBatchControlView extends StatelessWidget - with HelperResponsiveLayout { +class DoorLockBatchControlView extends StatelessWidget with HelperResponsiveLayout { const DoorLockBatchControlView({super.key, required this.devicesIds}); final List devicesIds; @@ -18,17 +17,17 @@ class DoorLockBatchControlView extends StatelessWidget return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - width: 170, - height: 140, - child: FirmwareUpdateWidget( - deviceId: devicesIds.first, - version: 12, - ), - ), - const SizedBox( - width: 12, - ), + // SizedBox( + // width: 170, + // height: 140, + // child: FirmwareUpdateWidget( + // deviceId: devicesIds.first, + // version: 12, + // ), + // ), + // const SizedBox( + // width: 12, + // ), SizedBox( width: 170, height: 140, diff --git a/lib/pages/device_managment/garage_door/view/garage_door_batch_control_view.dart b/lib/pages/device_managment/garage_door/view/garage_door_batch_control_view.dart index 8c8b60cf..9b3159bb 100644 --- a/lib/pages/device_managment/garage_door/view/garage_door_batch_control_view.dart +++ b/lib/pages/device_managment/garage_door/view/garage_door_batch_control_view.dart @@ -6,17 +6,15 @@ import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_ import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart'; import 'package:syncrow_web/pages/device_managment/garage_door/models/garage_door_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart'; import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class GarageDoorBatchControlView extends StatelessWidget - with HelperResponsiveLayout { +class GarageDoorBatchControlView extends StatelessWidget with HelperResponsiveLayout { final List deviceIds; - const GarageDoorBatchControlView({Key? key, required this.deviceIds}) - : super(key: key); + const GarageDoorBatchControlView({Key? key, required this.deviceIds}) : super(key: key); @override Widget build(BuildContext context) { @@ -39,8 +37,7 @@ class GarageDoorBatchControlView extends StatelessWidget ); } - Widget _buildStatusControls( - BuildContext context, GarageDoorStatusModel status) { + Widget _buildStatusControls(BuildContext context, GarageDoorStatusModel status) { final isExtraLarge = isExtraLargeScreenSize(context); final isLarge = isLargeScreenSize(context); final isMedium = isMediumScreenSize(context); @@ -75,10 +72,10 @@ class GarageDoorBatchControlView extends StatelessWidget ); }, ), - FirmwareUpdateWidget( - deviceId: deviceIds.first, - version: 12, - ), + // FirmwareUpdateWidget( + // deviceId: deviceIds.first, + // version: 12, + // ), FactoryResetWidget( callFactoryReset: () { context.read().add( diff --git a/lib/pages/device_managment/gateway/view/gateway_batch_control.dart b/lib/pages/device_managment/gateway/view/gateway_batch_control.dart index cb85b7d9..f3a08a18 100644 --- a/lib/pages/device_managment/gateway/view/gateway_batch_control.dart +++ b/lib/pages/device_managment/gateway/view/gateway_batch_control.dart @@ -3,11 +3,10 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart'; import 'package:syncrow_web/pages/device_managment/gateway/bloc/gate_way_bloc.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class GatewayBatchControlView extends StatelessWidget - with HelperResponsiveLayout { +class GatewayBatchControlView extends StatelessWidget with HelperResponsiveLayout { const GatewayBatchControlView({super.key, required this.gatewayIds}); final List gatewayIds; @@ -24,14 +23,13 @@ class GatewayBatchControlView extends StatelessWidget return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - width: 170, - height: 140, - child: FirmwareUpdateWidget( - deviceId: gatewayIds.first, version: 2)), - const SizedBox( - width: 12, - ), + // SizedBox( + // width: 170, + // height: 140, + // child: FirmwareUpdateWidget(deviceId: gatewayIds.first, version: 2)), + // const SizedBox( + // width: 12, + // ), SizedBox( width: 170, height: 140, @@ -40,8 +38,7 @@ class GatewayBatchControlView extends StatelessWidget context.read().add( GateWayFactoryReset( deviceId: gatewayIds.first, - factoryReset: - FactoryResetModel(devicesUuid: gatewayIds), + factoryReset: FactoryResetModel(devicesUuid: gatewayIds), ), ); }, diff --git a/lib/pages/device_managment/main_door_sensor/view/main_door_sensor_batch_view.dart b/lib/pages/device_managment/main_door_sensor/view/main_door_sensor_batch_view.dart index 0cacc0be..7337c9fd 100644 --- a/lib/pages/device_managment/main_door_sensor/view/main_door_sensor_batch_view.dart +++ b/lib/pages/device_managment/main_door_sensor/view/main_door_sensor_batch_view.dart @@ -4,7 +4,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re import 'package:syncrow_web/pages/device_managment/main_door_sensor/bloc/main_door_sensor_bloc.dart'; import 'package:syncrow_web/pages/device_managment/main_door_sensor/bloc/main_door_sensor_event.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; class MainDoorSensorBatchView extends StatelessWidget { const MainDoorSensorBatchView({super.key, required this.devicesIds}); @@ -16,17 +16,17 @@ class MainDoorSensorBatchView extends StatelessWidget { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - width: 170, - height: 140, - child: FirmwareUpdateWidget( - deviceId: devicesIds.first, - version: 12, - ), - ), - const SizedBox( - width: 12, - ), + // SizedBox( + // width: 170, + // height: 140, + // child: FirmwareUpdateWidget( + // deviceId: devicesIds.first, + // version: 12, + // ), + // ), + // const SizedBox( + // width: 12, + // ), SizedBox( width: 170, height: 140, diff --git a/lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_batch_control_view.dart b/lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_batch_control_view.dart index 4239b08e..9b89e876 100644 --- a/lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_batch_control_view.dart +++ b/lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_batch_control_view.dart @@ -4,16 +4,14 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart'; import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/models/once_gang_glass_status_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class OneGangGlassSwitchBatchControlView extends StatelessWidget - with HelperResponsiveLayout { +class OneGangGlassSwitchBatchControlView extends StatelessWidget with HelperResponsiveLayout { final List deviceIds; - const OneGangGlassSwitchBatchControlView( - {required this.deviceIds, super.key}); + const OneGangGlassSwitchBatchControlView({required this.deviceIds, super.key}); @override Widget build(BuildContext context) { @@ -36,8 +34,7 @@ class OneGangGlassSwitchBatchControlView extends StatelessWidget ); } - Widget _buildStatusControls( - BuildContext context, OneGangGlassStatusModel status) { + Widget _buildStatusControls(BuildContext context, OneGangGlassStatusModel status) { final isExtraLarge = isExtraLargeScreenSize(context); final isLarge = isLargeScreenSize(context); final isMedium = isMediumScreenSize(context); @@ -71,10 +68,10 @@ class OneGangGlassSwitchBatchControlView extends StatelessWidget ); }, ), - FirmwareUpdateWidget( - deviceId: deviceIds.first, - version: 12, - ), + // FirmwareUpdateWidget( + // deviceId: deviceIds.first, + // version: 12, + // ), FactoryResetWidget( callFactoryReset: () { context.read().add( diff --git a/lib/pages/device_managment/one_gang_switch/view/wall_light_batch_control.dart b/lib/pages/device_managment/one_gang_switch/view/wall_light_batch_control.dart index e1dabb61..7094b506 100644 --- a/lib/pages/device_managment/one_gang_switch/view/wall_light_batch_control.dart +++ b/lib/pages/device_managment/one_gang_switch/view/wall_light_batch_control.dart @@ -6,12 +6,11 @@ import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_lig import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_state.dart'; import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class WallLightBatchControlView extends StatelessWidget - with HelperResponsiveLayout { +class WallLightBatchControlView extends StatelessWidget with HelperResponsiveLayout { const WallLightBatchControlView({super.key, required this.deviceIds}); final List deviceIds; @@ -27,8 +26,7 @@ class WallLightBatchControlView extends StatelessWidget return const Center(child: CircularProgressIndicator()); } else if (state is WallLightSwitchStatusLoaded) { return _buildStatusControls(context, state.status); - } else if (state is WallLightSwitchError || - state is WallLightSwitchControlError) { + } else if (state is WallLightSwitchError || state is WallLightSwitchControlError) { return const Center(child: Text('Error fetching status')); } else { return const Center(child: CircularProgressIndicator()); @@ -38,8 +36,7 @@ class WallLightBatchControlView extends StatelessWidget ); } - Widget _buildStatusControls( - BuildContext context, WallLightStatusModel status) { + Widget _buildStatusControls(BuildContext context, WallLightStatusModel status) { final isExtraLarge = isExtraLargeScreenSize(context); final isLarge = isLargeScreenSize(context); final isMedium = isMediumScreenSize(context); @@ -74,15 +71,14 @@ class WallLightBatchControlView extends StatelessWidget ); }, ), - FirmwareUpdateWidget( - deviceId: deviceIds.first, - version: 12, - ), + // FirmwareUpdateWidget( + // deviceId: deviceIds.first, + // version: 12, + // ), FactoryResetWidget( callFactoryReset: () { context.read().add(WallLightFactoryReset( - deviceId: status.uuid, - factoryReset: FactoryResetModel(devicesUuid: deviceIds))); + deviceId: status.uuid, factoryReset: FactoryResetModel(devicesUuid: deviceIds))); }, ), ], diff --git a/lib/pages/device_managment/power_clamp/view/power_clamp_batch_control_view.dart b/lib/pages/device_managment/power_clamp/view/power_clamp_batch_control_view.dart index c0244845..7f6a4b64 100644 --- a/lib/pages/device_managment/power_clamp/view/power_clamp_batch_control_view.dart +++ b/lib/pages/device_managment/power_clamp/view/power_clamp_batch_control_view.dart @@ -6,21 +6,19 @@ import 'package:syncrow_web/pages/device_managment/power_clamp/bloc/smart_power_ import 'package:syncrow_web/pages/device_managment/power_clamp/bloc/smart_power_state.dart'; import 'package:syncrow_web/pages/device_managment/power_clamp/models/power_clamp_batch_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class PowerClampBatchControlView extends StatelessWidget - with HelperResponsiveLayout { +class PowerClampBatchControlView extends StatelessWidget with HelperResponsiveLayout { final List deviceIds; - const PowerClampBatchControlView({Key? key, required this.deviceIds}) - : super(key: key); + const PowerClampBatchControlView({Key? key, required this.deviceIds}) : super(key: key); @override Widget build(BuildContext context) { return BlocProvider( - create: (context) => SmartPowerBloc(deviceId: deviceIds.first) - ..add(SmartPowerFetchBatchEvent(deviceIds)), + create: (context) => + SmartPowerBloc(deviceId: deviceIds.first)..add(SmartPowerFetchBatchEvent(deviceIds)), child: BlocBuilder( builder: (context, state) { if (state is SmartPowerLoading) { @@ -37,18 +35,17 @@ class PowerClampBatchControlView extends StatelessWidget ); } - Widget _buildStatusControls( - BuildContext context, PowerClampBatchModel status) { + Widget _buildStatusControls(BuildContext context, PowerClampBatchModel status) { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - width: 170, - // height: 140, - child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)), - const SizedBox( - width: 12, - ), + // SizedBox( + // width: 170, + // // height: 140, + // child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)), + // const SizedBox( + // width: 12, + // ), SizedBox( width: 170, height: 140, diff --git a/lib/pages/device_managment/shared/batch_control/firmware_update.dart b/lib/pages/device_managment/shared/batch_control/firmware_update.dart index e99ee948..8270fa36 100644 --- a/lib/pages/device_managment/shared/batch_control/firmware_update.dart +++ b/lib/pages/device_managment/shared/batch_control/firmware_update.dart @@ -1,128 +1,128 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:syncrow_web/pages/common/buttons/default_button.dart'; -import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart'; -import 'package:syncrow_web/utils/color_manager.dart'; -import 'package:syncrow_web/utils/constants/assets.dart'; -import 'package:syncrow_web/utils/extension/build_context_x.dart'; +// import 'package:flutter/material.dart'; +// import 'package:flutter_svg/flutter_svg.dart'; +// import 'package:syncrow_web/pages/common/buttons/default_button.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart'; +// import 'package:syncrow_web/utils/color_manager.dart'; +// import 'package:syncrow_web/utils/constants/assets.dart'; +// import 'package:syncrow_web/utils/extension/build_context_x.dart'; -class FirmwareUpdateWidget extends StatefulWidget { - const FirmwareUpdateWidget({super.key, required this.deviceId, required this.version}); +// class FirmwareUpdateWidget extends StatefulWidget { +// const FirmwareUpdateWidget({super.key, required this.deviceId, required this.version}); - final String deviceId; - final int version; +// final String deviceId; +// final int version; - @override - State createState() => _FirmwareUpdateWidgetState(); -} +// @override +// State createState() => _FirmwareUpdateWidgetState(); +// } -class _FirmwareUpdateWidgetState extends State { - bool _showConfirmation = false; +// class _FirmwareUpdateWidgetState extends State { +// bool _showConfirmation = false; - void _toggleConfirmation() { - setState(() { - _showConfirmation = !_showConfirmation; - }); - } +// void _toggleConfirmation() { +// setState(() { +// _showConfirmation = !_showConfirmation; +// }); +// } - @override - Widget build(BuildContext context) { - return DeviceControlsContainer( - child: _showConfirmation - ? Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Column( - children: [ - Text( - 'Firmware Update', - style: context.textTheme.titleMedium!.copyWith( - fontWeight: FontWeight.bold, - color: ColorsManager.blackColor, - ), - ), - Text( - 'Are you sure?', - style: context.textTheme.bodySmall!.copyWith( - color: ColorsManager.grayColor, - ), - ), - ], - ), - Row( - children: [ - Flexible( - child: DefaultButton( - height: 20, - elevation: 0, - padding: 0, - onPressed: _toggleConfirmation, - backgroundColor: ColorsManager.greyColor, - child: Text( - 'Cancel', - style: context.textTheme.bodyMedium!.copyWith( - color: ColorsManager.blackColor, - fontWeight: FontWeight.w400, - fontSize: 12, - ), - ), - ), - ), - const SizedBox(width: 8), - Flexible( - child: DefaultButton( - height: 20, - elevation: 0, - padding: 0, - onPressed: () { - _toggleConfirmation(); - }, - backgroundColor: ColorsManager.primaryColor, - child: Text( - 'Update', - style: context.textTheme.bodyMedium!.copyWith( - color: ColorsManager.whiteColors, - fontWeight: FontWeight.w400, - fontSize: 12, - ), - ), - ), - ), - ], - ), - ], - ) - : GestureDetector( - onTap: _toggleConfirmation, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - ClipOval( - child: Container( - color: ColorsManager.whiteColors, - height: 60, - width: 60, - child: Padding( - padding: const EdgeInsets.all(12.0), - child: SvgPicture.asset( - Assets.firmware, - fit: BoxFit.cover, - ), - ), - ), - ), - Text( - 'Firmware Update', - style: context.textTheme.titleMedium!.copyWith( - fontWeight: FontWeight.w400, - color: ColorsManager.blackColor, - ), - ), - ], - ), - ), - ); - } -} +// @override +// Widget build(BuildContext context) { +// return DeviceControlsContainer( +// child: _showConfirmation +// ? Column( +// crossAxisAlignment: CrossAxisAlignment.start, +// mainAxisAlignment: MainAxisAlignment.spaceBetween, +// children: [ +// Column( +// children: [ +// Text( +// 'Firmware Update', +// style: context.textTheme.titleMedium!.copyWith( +// fontWeight: FontWeight.bold, +// color: ColorsManager.blackColor, +// ), +// ), +// Text( +// 'Are you sure?', +// style: context.textTheme.bodySmall!.copyWith( +// color: ColorsManager.grayColor, +// ), +// ), +// ], +// ), +// Row( +// children: [ +// Flexible( +// child: DefaultButton( +// height: 20, +// elevation: 0, +// padding: 0, +// onPressed: _toggleConfirmation, +// backgroundColor: ColorsManager.greyColor, +// child: Text( +// 'Cancel', +// style: context.textTheme.bodyMedium!.copyWith( +// color: ColorsManager.blackColor, +// fontWeight: FontWeight.w400, +// fontSize: 12, +// ), +// ), +// ), +// ), +// const SizedBox(width: 8), +// Flexible( +// child: DefaultButton( +// height: 20, +// elevation: 0, +// padding: 0, +// onPressed: () { +// _toggleConfirmation(); +// }, +// backgroundColor: ColorsManager.primaryColor, +// child: Text( +// 'Update', +// style: context.textTheme.bodyMedium!.copyWith( +// color: ColorsManager.whiteColors, +// fontWeight: FontWeight.w400, +// fontSize: 12, +// ), +// ), +// ), +// ), +// ], +// ), +// ], +// ) +// : GestureDetector( +// onTap: _toggleConfirmation, +// child: Column( +// crossAxisAlignment: CrossAxisAlignment.start, +// mainAxisAlignment: MainAxisAlignment.spaceBetween, +// children: [ +// ClipOval( +// child: Container( +// color: ColorsManager.whiteColors, +// height: 60, +// width: 60, +// child: Padding( +// padding: const EdgeInsets.all(12.0), +// child: SvgPicture.asset( +// Assets.firmware, +// fit: BoxFit.cover, +// ), +// ), +// ), +// ), +// Text( +// 'Firmware Update', +// style: context.textTheme.titleMedium!.copyWith( +// fontWeight: FontWeight.w400, +// color: ColorsManager.blackColor, +// ), +// ), +// ], +// ), +// ), +// ); +// } +// } diff --git a/lib/pages/device_managment/sos/view/sos_batch_control_view.dart b/lib/pages/device_managment/sos/view/sos_batch_control_view.dart index ec15b7d6..bc66d69f 100644 --- a/lib/pages/device_managment/sos/view/sos_batch_control_view.dart +++ b/lib/pages/device_managment/sos/view/sos_batch_control_view.dart @@ -18,20 +18,21 @@ class SOSBatchControlView extends StatelessWidget { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - width: 170, - // height: 140, - child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)), - const SizedBox( - width: 12, - ), + // SizedBox( + // width: 170, + // // height: 140, + // child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)), + // const SizedBox( + // width: 12, + // ), SizedBox( width: 170, height: 140, child: FactoryResetWidget( callFactoryReset: () { - context.read().add( - SosFactoryReset(deviceId: deviceIds.first, factoryReset: FactoryResetModel(devicesUuid: deviceIds))); + context.read().add(SosFactoryReset( + deviceId: deviceIds.first, + factoryReset: FactoryResetModel(devicesUuid: deviceIds))); }, ), ), diff --git a/lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_batch_control_view.dart b/lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_batch_control_view.dart index 4d1bb91c..071d6ca0 100644 --- a/lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_batch_control_view.dart +++ b/lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_batch_control_view.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart'; import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart'; import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/models/three_gang_glass_switch.dart'; @@ -98,10 +98,10 @@ class ThreeGangGlassSwitchBatchControlView extends StatelessWidget with HelperRe ); }, ), - FirmwareUpdateWidget( - deviceId: deviceIds.first, - version: 12, // adjust the version according to your requirement - ), + // FirmwareUpdateWidget( + // deviceId: deviceIds.first, + // version: 12, // adjust the version according to your requirement + // ), FactoryResetWidget( callFactoryReset: () { context.read().add( diff --git a/lib/pages/device_managment/three_gang_switch/view/living_room_batch_controls.dart b/lib/pages/device_managment/three_gang_switch/view/living_room_batch_controls.dart index 0d82c515..97c25287 100644 --- a/lib/pages/device_managment/three_gang_switch/view/living_room_batch_controls.dart +++ b/lib/pages/device_managment/three_gang_switch/view/living_room_batch_controls.dart @@ -2,14 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart'; import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class LivingRoomBatchControlsView extends StatelessWidget - with HelperResponsiveLayout { +class LivingRoomBatchControlsView extends StatelessWidget with HelperResponsiveLayout { const LivingRoomBatchControlsView({super.key, required this.deviceIds}); final List deviceIds; @@ -17,16 +16,15 @@ class LivingRoomBatchControlsView extends StatelessWidget @override Widget build(BuildContext context) { return BlocProvider( - create: (context) => LivingRoomBloc(deviceId: deviceIds.first) - ..add(LivingRoomFetchBatchEvent(deviceIds)), + create: (context) => + LivingRoomBloc(deviceId: deviceIds.first)..add(LivingRoomFetchBatchEvent(deviceIds)), child: BlocBuilder( builder: (context, state) { if (state is LivingRoomDeviceStatusLoading) { return const Center(child: CircularProgressIndicator()); } else if (state is LivingRoomDeviceStatusLoaded) { return _buildStatusControls(context, state.status); - } else if (state is LivingRoomDeviceManagementError || - state is LivingRoomControlError) { + } else if (state is LivingRoomDeviceManagementError || state is LivingRoomControlError) { return const Center(child: Text('Error fetching status')); } else { return const Center(child: CircularProgressIndicator()); @@ -36,8 +34,7 @@ class LivingRoomBatchControlsView extends StatelessWidget ); } - Widget _buildStatusControls( - BuildContext context, LivingRoomStatusModel status) { + Widget _buildStatusControls(BuildContext context, LivingRoomStatusModel status) { final isExtraLarge = isExtraLargeScreenSize(context); final isLarge = isLargeScreenSize(context); final isMedium = isMediumScreenSize(context); @@ -102,10 +99,10 @@ class LivingRoomBatchControlsView extends StatelessWidget ); }, ), - FirmwareUpdateWidget( - deviceId: deviceIds.first, - version: 12, - ), + // FirmwareUpdateWidget( + // deviceId: deviceIds.first, + // version: 12, + // ), FactoryResetWidget(callFactoryReset: () { context.read().add( LivingRoomFactoryResetEvent( diff --git a/lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_batch_control_view.dart b/lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_batch_control_view.dart index d0288ca3..c84c1d07 100644 --- a/lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_batch_control_view.dart +++ b/lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_batch_control_view.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart'; import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart'; import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart'; @@ -16,8 +16,8 @@ class TwoGangGlassSwitchBatchControlView extends StatelessWidget with HelperResp @override Widget build(BuildContext context) { return BlocProvider( - create: (context) => - TwoGangGlassSwitchBloc(deviceId: deviceIds.first)..add(TwoGangGlassSwitchFetchBatchStatusEvent(deviceIds)), + create: (context) => TwoGangGlassSwitchBloc(deviceId: deviceIds.first) + ..add(TwoGangGlassSwitchFetchBatchStatusEvent(deviceIds)), child: BlocBuilder( builder: (context, state) { if (state is TwoGangGlassSwitchLoading) { @@ -83,10 +83,10 @@ class TwoGangGlassSwitchBatchControlView extends StatelessWidget with HelperResp ); }, ), - FirmwareUpdateWidget( - deviceId: deviceIds.first, - version: 12, // adjust the version according to your requirement - ), + // FirmwareUpdateWidget( + // deviceId: deviceIds.first, + // version: 12, // adjust the version according to your requirement + // ), FactoryResetWidget( callFactoryReset: () { context.read().add( diff --git a/lib/pages/device_managment/two_gang_switch/view/wall_light_batch_control.dart b/lib/pages/device_managment/two_gang_switch/view/wall_light_batch_control.dart index 52900155..b3a39287 100644 --- a/lib/pages/device_managment/two_gang_switch/view/wall_light_batch_control.dart +++ b/lib/pages/device_managment/two_gang_switch/view/wall_light_batch_control.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart'; import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart'; import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart'; @@ -10,8 +10,7 @@ import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class TwoGangBatchControlView extends StatelessWidget - with HelperResponsiveLayout { +class TwoGangBatchControlView extends StatelessWidget with HelperResponsiveLayout { const TwoGangBatchControlView({super.key, required this.deviceIds}); final List deviceIds; @@ -27,8 +26,7 @@ class TwoGangBatchControlView extends StatelessWidget return const Center(child: CircularProgressIndicator()); } else if (state is TwoGangSwitchStatusLoaded) { return _buildStatusControls(context, state.status); - } else if (state is TwoGangSwitchError || - state is TwoGangSwitchControlError) { + } else if (state is TwoGangSwitchError || state is TwoGangSwitchControlError) { return const Center(child: Text('Error fetching status')); } else { return const Center(child: CircularProgressIndicator()); @@ -84,10 +82,10 @@ class TwoGangBatchControlView extends StatelessWidget )); }, ), - FirmwareUpdateWidget( - deviceId: deviceIds.first, - version: 12, - ), + // FirmwareUpdateWidget( + // deviceId: deviceIds.first, + // version: 12, + // ), FactoryResetWidget(callFactoryReset: () { context.read().add( TwoGangFactoryReset( diff --git a/lib/pages/device_managment/wall_sensor/view/wall_sensor_batch_control.dart b/lib/pages/device_managment/wall_sensor/view/wall_sensor_batch_control.dart index 66ff67aa..27169f0e 100644 --- a/lib/pages/device_managment/wall_sensor/view/wall_sensor_batch_control.dart +++ b/lib/pages/device_managment/wall_sensor/view/wall_sensor_batch_control.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart'; import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_bloc.dart'; import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_event.dart'; @@ -113,7 +113,7 @@ class WallSensorBatchControlView extends StatelessWidget with HelperResponsiveLa ), ), ), - FirmwareUpdateWidget(deviceId: devicesIds.first, version: 2), + // FirmwareUpdateWidget(deviceId: devicesIds.first, version: 2), FactoryResetWidget( callFactoryReset: () { context.read().add( diff --git a/lib/pages/device_managment/water_heater/view/water_heater_batch_control.dart b/lib/pages/device_managment/water_heater/view/water_heater_batch_control.dart index cc62adfd..aaab5271 100644 --- a/lib/pages/device_managment/water_heater/view/water_heater_batch_control.dart +++ b/lib/pages/device_managment/water_heater/view/water_heater_batch_control.dart @@ -2,15 +2,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart'; import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart'; import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart'; import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class WaterHEaterBatchControlView extends StatelessWidget - with HelperResponsiveLayout { +class WaterHEaterBatchControlView extends StatelessWidget with HelperResponsiveLayout { const WaterHEaterBatchControlView({super.key, required this.deviceIds}); final List deviceIds; @@ -18,8 +17,8 @@ class WaterHEaterBatchControlView extends StatelessWidget @override Widget build(BuildContext context) { return BlocProvider( - create: (context) => WaterHeaterBloc() - ..add(FetchWaterHeaterBatchStatusEvent(devicesUuid: deviceIds)), + create: (context) => + WaterHeaterBloc()..add(FetchWaterHeaterBatchStatusEvent(devicesUuid: deviceIds)), child: BlocBuilder( builder: (context, state) { if (state is WaterHeaterLoadingState) { @@ -36,8 +35,7 @@ class WaterHEaterBatchControlView extends StatelessWidget ); } - Widget _buildStatusControls( - BuildContext context, WaterHeaterStatusModel status) { + Widget _buildStatusControls(BuildContext context, WaterHeaterStatusModel status) { final isExtraLarge = isExtraLargeScreenSize(context); final isLarge = isLargeScreenSize(context); final isMedium = isMediumScreenSize(context); @@ -73,10 +71,10 @@ class WaterHEaterBatchControlView extends StatelessWidget ); }, ), - FirmwareUpdateWidget( - deviceId: deviceIds.first, - version: 12, - ), + // FirmwareUpdateWidget( + // deviceId: deviceIds.first, + // version: 12, + // ), FactoryResetWidget( callFactoryReset: () {}, ), diff --git a/lib/pages/device_managment/water_leak/view/water_leak_batch_control_view.dart b/lib/pages/device_managment/water_leak/view/water_leak_batch_control_view.dart index 9d2c030f..1eb795e5 100644 --- a/lib/pages/device_managment/water_leak/view/water_leak_batch_control_view.dart +++ b/lib/pages/device_managment/water_leak/view/water_leak_batch_control_view.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart'; import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart'; -import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; +// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart'; import 'package:syncrow_web/pages/device_managment/water_leak/bloc/water_leak_bloc.dart'; import 'package:syncrow_web/pages/device_managment/water_leak/bloc/water_leak_event.dart'; @@ -10,18 +10,16 @@ import 'package:syncrow_web/pages/device_managment/water_leak/bloc/water_leak_st import 'package:syncrow_web/pages/device_managment/water_leak/model/water_leak_status_model.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; -class WaterLeakBatchControlView extends StatelessWidget - with HelperResponsiveLayout { +class WaterLeakBatchControlView extends StatelessWidget with HelperResponsiveLayout { final List deviceIds; - const WaterLeakBatchControlView({Key? key, required this.deviceIds}) - : super(key: key); + const WaterLeakBatchControlView({Key? key, required this.deviceIds}) : super(key: key); @override Widget build(BuildContext context) { return BlocProvider( - create: (context) => WaterLeakBloc(deviceIds.first) - ..add(FetchWaterLeakBatchStatusEvent(deviceIds)), + create: (context) => + WaterLeakBloc(deviceIds.first)..add(FetchWaterLeakBatchStatusEvent(deviceIds)), child: BlocBuilder( builder: (context, state) { if (state is WaterLeakLoadingState) { @@ -38,18 +36,17 @@ class WaterLeakBatchControlView extends StatelessWidget ); } - Widget _buildStatusControls( - BuildContext context, WaterLeakStatusModel status) { + Widget _buildStatusControls(BuildContext context, WaterLeakStatusModel status) { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - width: 170, - height: 140, - child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)), - const SizedBox( - width: 12, - ), + // SizedBox( + // width: 170, + // height: 140, + // child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)), + // const SizedBox( + // width: 12, + // ), SizedBox( width: 170, height: 140, diff --git a/lib/pages/home/bloc/home_bloc.dart b/lib/pages/home/bloc/home_bloc.dart index c837e40a..1772ef88 100644 --- a/lib/pages/home/bloc/home_bloc.dart +++ b/lib/pages/home/bloc/home_bloc.dart @@ -90,40 +90,40 @@ class HomeBloc extends Bloc { }, color: ColorsManager.primaryColor, ), - HomeItemModel( - title: 'Move in', - icon: Assets.moveinIcon, - active: false, - onPress: (context) {}, - color: ColorsManager.primaryColor, - ), - HomeItemModel( - title: 'Construction', - icon: Assets.constructionIcon, - active: false, - onPress: (context) {}, - color: ColorsManager.primaryColor, - ), - HomeItemModel( - title: 'Energy', - icon: Assets.energyIcon, - active: false, - onPress: (context) {}, - color: ColorsManager.slidingBlueColor.withOpacity(0.2), - ), - HomeItemModel( - title: 'Integrations', - icon: Assets.integrationsIcon, - active: false, - onPress: (context) {}, - color: ColorsManager.slidingBlueColor.withOpacity(0.2), - ), - HomeItemModel( - title: 'Asset', - icon: Assets.assetIcon, - active: false, - onPress: (context) {}, - color: ColorsManager.slidingBlueColor.withOpacity(0.2), - ), + // HomeItemModel( + // title: 'Move in', + // icon: Assets.moveinIcon, + // active: false, + // onPress: (context) {}, + // color: ColorsManager.primaryColor, + // ), + // HomeItemModel( + // title: 'Construction', + // icon: Assets.constructionIcon, + // active: false, + // onPress: (context) {}, + // color: ColorsManager.primaryColor, + // ), + // HomeItemModel( + // title: 'Energy', + // icon: Assets.energyIcon, + // active: false, + // onPress: (context) {}, + // color: ColorsManager.slidingBlueColor.withOpacity(0.2), + // ), + // HomeItemModel( + // title: 'Integrations', + // icon: Assets.integrationsIcon, + // active: false, + // onPress: (context) {}, + // color: ColorsManager.slidingBlueColor.withOpacity(0.2), + // ), + // HomeItemModel( + // title: 'Asset', + // icon: Assets.assetIcon, + // active: false, + // onPress: (context) {}, + // color: ColorsManager.slidingBlueColor.withOpacity(0.2), + // ), ]; } diff --git a/lib/pages/home/view/home_page_web.dart b/lib/pages/home/view/home_page_web.dart index cb806dfc..a198fa76 100644 --- a/lib/pages/home/view/home_page_web.dart +++ b/lib/pages/home/view/home_page_web.dart @@ -51,7 +51,7 @@ class HomeWebPage extends StatelessWidget { height: size.height * 0.6, width: size.width * 0.68, child: GridView.builder( - itemCount: 8, + itemCount: 3, //8 gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 4, crossAxisSpacing: 20.0, diff --git a/lib/utils/user_drop_down_menu.dart b/lib/utils/user_drop_down_menu.dart index 3a0c4194..cee9bbe9 100644 --- a/lib/utils/user_drop_down_menu.dart +++ b/lib/utils/user_drop_down_menu.dart @@ -75,26 +75,26 @@ class _UserDropdownMenuState extends State { ), ), items: [ - PopupMenuItem( - onTap: () {}, - child: ListTile( - leading: SvgPicture.asset(Assets.accountSetting), - title: Text( - "Account Settings", - style: context.textTheme.bodyMedium, - ), - ), - ), - PopupMenuItem( - onTap: () {}, - child: ListTile( - leading: SvgPicture.asset(Assets.settings), - title: Text( - "Settings", - style: context.textTheme.bodyMedium, - ), - ), - ), + // PopupMenuItem( + // onTap: () {}, + // child: ListTile( + // leading: SvgPicture.asset(Assets.accountSetting), + // title: Text( + // "Account Settings", + // style: context.textTheme.bodyMedium, + // ), + // ), + // ), + // PopupMenuItem( + // onTap: () {}, + // child: ListTile( + // leading: SvgPicture.asset(Assets.settings), + // title: Text( + // "Settings", + // style: context.textTheme.bodyMedium, + // ), + // ), + // ), PopupMenuItem( onTap: () { showDialog( @@ -211,8 +211,10 @@ class _UserDropdownMenuState extends State { elevation: 1, child: Text( 'Logout', - style: - Theme.of(context).textTheme.bodyMedium!.copyWith(fontSize: 12, color: Colors.white), + style: Theme.of(context) + .textTheme + .bodyMedium! + .copyWith(fontSize: 12, color: Colors.white), ), ), ), From c160220fcabfda0a1f05c741f2e318434723f2b3 Mon Sep 17 00:00:00 2001 From: Abdullah Alassaf Date: Mon, 23 Dec 2024 00:52:05 +0300 Subject: [PATCH 2/2] Hide region field --- lib/pages/auth/bloc/auth_bloc.dart | 14 ++-- lib/pages/auth/bloc/auth_event.dart | 14 ++-- .../auth/model/login_with_email_model.dart | 8 +- .../auth/view/forget_password_web_page.dart | 30 +++---- lib/pages/auth/view/login_mobile_page.dart | 84 ++++++++++--------- lib/pages/auth/view/login_web_page.dart | 16 ++-- lib/services/auth_api.dart | 6 +- 7 files changed, 86 insertions(+), 86 deletions(-) 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'];