Hide region field

Added project entity

.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml

@@ -0,0 +1,60 @@
+name: Azure Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - main
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          lfs: false
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.22.2' # Specify the Flutter version you want to use
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Build Flutter Web App
+        run: flutter build web --release --dart-define=FLAVOR=production
+
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_MANGO_BUSH_01E607F10 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "/build/web" # App source code path
+          api_location: "" # Api source code path - optional
+          output_location: "/build/web" # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_MANGO_BUSH_01E607F10 }}
+          action: "close"

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 =
+    final padding = isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
-        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) =>
+            create: (BuildContext context) => AccessBloc()..add(FetchTableData()),
-                AccessBloc()..add(FetchTableData()),
             child: BlocConsumer<AccessBloc, AccessState>(
                 listener: (context, state) {},
                 builder: (context, state) {
@@ -95,14 +93,11 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                                   return [
                                     item.passwordName,
                                     item.passwordType.value,
-                                    accessBloc
+                                    accessBloc.timestampToDate(item.effectiveTime),
-                                        .timestampToDate(item.effectiveTime),
+                                    accessBloc.timestampToDate(item.invalidTime),
-                                    accessBloc
-                                        .timestampToDate(item.invalidTime),
                                     item.deviceName.toString(),
                                     item.authorizerEmail.toString(),
-                                    accessBloc
+                                    accessBloc.timestampToDate(item.invalidTime),
-                                        .timestampToDate(item.invalidTime),
                                     item.passwordStatus.value,
                                   ];
                                 }).toList(),
@@ -113,8 +108,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 })));
   }
 
-  Wrap _buildVisitorAdminPasswords(
+  Wrap _buildVisitorAdminPasswords(BuildContext context, AccessBloc accessBloc) {
-      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!
+                style: context.textTheme.titleSmall!.copyWith(color: Colors.white, fontSize: 12),
-                    .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),
               )),
         ),
+        // 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:
+                  emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
-                  selectedTabIndex:
-                      BlocProvider.of<AccessBloc>(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:
+                  emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
-                  selectedTabIndex:
-                      BlocProvider.of<AccessBloc>(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:
+                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
-                    BlocProvider.of<AccessBloc>(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:
+                    emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                        accessBloc.emailAuthorizer.text.toLowerCase(),
+                    selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
-                    selectedTabIndex:
-                        BlocProvider.of<AccessBloc>(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:
+                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
-                    BlocProvider.of<AccessBloc>(context).selectedIndex,
                 passwordName: accessBloc.passwordName.text.toLowerCase(),
                 startTime: accessBloc.effectiveTimeTimeStamp,
                 endTime: accessBloc.expirationTimeTimeStamp));

lib/pages/auth/bloc/auth_bloc.dart

@@ -31,8 +31,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   ////////////////////////////// forget password //////////////////////////////////
   final TextEditingController forgetEmailController = TextEditingController();
-  final TextEditingController forgetPasswordController =
+  final TextEditingController forgetPasswordController = TextEditingController();
-      TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
   final forgetEmailKey = GlobalKey<FormState>();
@@ -49,12 +48,12 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return;
     }
     _remainingTime = 1;
-    add(UpdateTimerEvent(
+    add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
-        remainingTime: _remainingTime, isButtonEnabled: false));
     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;
@@ -86,8 +85,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
       } else {
-        add(UpdateTimerEvent(
+        add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
-            remainingTime: _remainingTime, isButtonEnabled: false));
       }
     });
   }
@@ -97,8 +95,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
   }
 
-  Future<void> changePassword(
+  Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
-      ChangePasswordEvent event, Emitter<AuthState> emit) async {
     emit(LoadingForgetState());
     try {
       var response = await AuthenticationAPI.verifyOtp(
@@ -114,8 +111,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;
-      String errorMessage =
+      String errorMessage = errorData['error']['message'] ?? 'something went wrong';
-          errorData['error']['message'] ?? 'something went wrong';
       validate = errorMessage;
       emit(AuthInitialState());
     }
@@ -129,16 +125,14 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   void _onUpdateTimer(UpdateTimerEvent event, Emitter<AuthState> emit) {
-    emit(TimerState(
+    emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime));
-        isButtonEnabled: event.isButtonEnabled,
-        remainingTime: event.remainingTime));
   }
 
   /////////////////////////////////////  login  /////////////////////////////////////
   final TextEditingController loginEmailController = TextEditingController();
   final TextEditingController loginPasswordController = TextEditingController();
   final loginFormKey = GlobalKey<FormState>();
-  bool isChecked = false;
+  bool isChecked = true;
   bool obscureText = true;
   String newPassword = '';
   String maskedEmail = '';
@@ -146,7 +140,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   String validate = '';
   String forgetValidate = '';
   String forgetEmailValidate = '';
-  String regionUuid = '';
+  // String regionUuid = '';
   static Token token = Token.emptyConstructor();
   static UserModel? user;
   bool showValidationMessage = false;
@@ -165,7 +159,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
           model: LoginWithEmailModel(
             email: event.username,
             password: event.password,
-              regionUuid: event.regionUuid),
+          ),
         );
       } catch (failure) {
         validate = 'Invalid Credentials!';
@@ -175,8 +169,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
       if (token.accessTokenIsNotEmpty) {
         FlutterSecureStorage storage = const FlutterSecureStorage();
-        await storage.write(
+        await storage.write(key: Token.loginAccessTokenKey, value: token.accessToken);
-            key: Token.loginAccessTokenKey, value: token.accessToken);
         const FlutterSecureStorage().write(
             key: UserModel.userUuidKey,
             value: Token.decodeToken(token.accessToken)['uuid'].toString());
@@ -334,14 +327,12 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<String> getTokenAndValidate() async {
     try {
       const storage = FlutterSecureStorage();
-      final firstLaunch = await SharedPreferencesHelper.readBoolFromSP(
+      final firstLaunch =
-              StringsManager.firstLaunch) ??
+          await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true;
-          true;
       if (firstLaunch) {
         storage.deleteAll();
       }
-      await SharedPreferencesHelper.saveBoolToSP(
+      await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false);
-          StringsManager.firstLaunch, false);
       final value = await storage.read(key: Token.loginAccessTokenKey) ?? '';
       if (value.isEmpty) {
         return 'Token not found';
@@ -376,7 +367,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   Future selectRegion(SelectRegionEvent event, Emitter<AuthState> emit) async {
     try {
       emit(AuthLoading());
-      regionUuid = event.val;
+      // regionUuid = event.val;
       add(CheckEnableEvent());
       emit(AuthInitialState());
     } catch (e) {
@@ -394,9 +385,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     final String formattedTime = [
       if (days > 0) '${days}d', // Append 'd' for days
       if (days > 0 || hours > 0)
-        hours
+        hours.toString().padLeft(2, '0'), // Show hours if there are days or hours
-            .toString()
-            .padLeft(2, '0'), // Show hours if there are days or hours
       minutes.toString().padLeft(2, '0'),
       seconds.toString().padLeft(2, '0'),
     ].join(':');
@@ -411,8 +400,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(AuthLoading());
     checkValidate = isChecked == true &&
         loginPasswordController.text.isNotEmpty &&
-        loginEmailController.text.isNotEmpty &&
+        loginEmailController.text.isNotEmpty;
-        regionUuid != '';
     emit(LoginInitial());
     return checkValidate;
   }

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<Object> get props => [username, password, regionUuid];
+  List<Object> 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;

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<String, dynamic> 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,
     };
   }
 }

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(
+                                  // Column(
-                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                  //   crossAxisAlignment: CrossAxisAlignment.start,
-                                    mainAxisAlignment: MainAxisAlignment.start,
+                                  //   mainAxisAlignment: MainAxisAlignment.start,
-                                    children: [
+                                  //   children: [
-                                      const SizedBox(height: 10),
+                                  // const SizedBox(height: 10),
-                                      Form(
+                                  // Form(
-                                          key: forgetBloc.forgetRegionKey,
+                                  //     key: forgetBloc.forgetRegionKey,
-                                          child: SizedBox(
+                                  //     child: SizedBox(
-                                              child:
+                                  //         child:
-                                                  _buildDropdownField(context, forgetBloc, size)))
+                                  //             _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)
+                    // value: loginBloc.regionList!.any((region) => region.id == loginBloc.regionUuid)
-                        ? loginBloc.regionUuid
+                    //     ? loginBloc.regionUuid
-                        : null,
+                    //     : null,
                     onChanged: (String? value) {
                       if (value != null) {
                         loginBloc.add(SelectRegionEvent(val: value));

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(
+                            // Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
+                            //   crossAxisAlignment: CrossAxisAlignment.start,
-                              mainAxisAlignment: MainAxisAlignment.start,
+                            //   mainAxisAlignment: MainAxisAlignment.start,
-                              children: [
+                            //   children: [
-                                Text(
+                            //     Text(
-                                  "Country/Region",
+                            //       "Country/Region",
-                                  style: Theme.of(context).textTheme.bodySmall,
+                            //       style: Theme.of(context).textTheme.bodySmall,
-                                ),
+                            //     ),
-                                SizedBox(
+                            //     SizedBox(
-                                  child: DropdownButtonFormField<String>(
+                            //       child: DropdownButtonFormField<String>(
-                                    validator: loginBloc.validateRegion,
+                            //         validator: loginBloc.validateRegion,
-                                    icon: const Icon(
+                            //         icon: const Icon(
-                                      Icons.keyboard_arrow_down_outlined,
+                            //           Icons.keyboard_arrow_down_outlined,
-                                    ),
+                            //         ),
-                                    decoration: textBoxDecoration()!.copyWith(
+                            //         decoration: textBoxDecoration()!.copyWith(
-                                      hintText: null,
+                            //           hintText: null,
-                                    ),
+                            //         ),
-                                    hint: const Align(
+                            //         hint: const Align(
-                                      alignment: Alignment.centerLeft,
+                            //           alignment: Alignment.centerLeft,
-                                      child: Text(
+                            //           child: Text(
-                                        'Select your region/country',
+                            //             'Select your region/country',
-                                        textAlign: TextAlign.center,
+                            //             textAlign: TextAlign.center,
-                                      ),
+                            //           ),
-                                    ),
+                            //         ),
-                                    isDense: true,
+                            //         isDense: true,
-                                    style: const TextStyle(color: Colors.black),
+                            //         style: const TextStyle(color: Colors.black),
-                                    items: loginBloc.regionList!.map((RegionModel region) {
+                            //         items: loginBloc.regionList!.map((RegionModel region) {
-                                      return DropdownMenuItem<String>(
+                            //           return DropdownMenuItem<String>(
-                                        value: region.name,
+                            //             value: region.name,
-                                        child: Text(region.name),
+                            //             child: Text(region.name),
-                                      );
+                            //           );
-                                    }).toList(),
+                            //         }).toList(),
-                                    onChanged: (String? value) {},
+                            //         onChanged: (String? value) {},
-                                  ),
+                            //       ),
-                                )
+                            //     )
-                              ],
+                            //   ],
-                            ),
+                            // ),
-                            const SizedBox(height: 20.0),
+                            // 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,
                                       ),

lib/pages/auth/view/login_web_page.dart

@@ -155,16 +155,16 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
             children: <Widget>[
               const SizedBox(height: 40),
               Text('Login', style: Theme.of(context).textTheme.headlineLarge),
-              SizedBox(height: size.height * 0.03),
+              // SizedBox(height: size.height * 0.03),
-              _buildDropdownField(context, loginBloc, size),
+              // _buildDropdownField(context, loginBloc, size),
               const SizedBox(height: 20.0),
               _buildEmailField(context, loginBloc),
               const SizedBox(height: 20.0),
               _buildPasswordField(context, loginBloc),
               const SizedBox(height: 20),
               _buildForgotPassword(context),
-              const SizedBox(height: 20),
+              // const SizedBox(height: 20),
-              _buildCheckbox(context, loginBloc, size),
+              // _buildCheckbox(context, loginBloc, size),
               const SizedBox(height: 20.0),
               _buildSignInButton(context, loginBloc, size),
               const SizedBox(height: 15.0),
@@ -219,11 +219,11 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
                   ),
                 );
               }).toList(),
-              value: loginBloc.regionList!.any(
+              // value: loginBloc.regionList!.any(
-                (region) => region.id == loginBloc.regionUuid,
+              //   (region) => region.id == loginBloc.regionUuid,
-              )
+              // )
-                  ? loginBloc.regionUuid
+              //     ? loginBloc.regionUuid
-                  : null,
+              //     : null,
               onChanged: (String? value) {
                 if (value != null) {
                   loginBloc.add(CheckEnableEvent());
@@ -462,7 +462,7 @@ class _LoginWebPageState extends State<LoginWebPage> 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,
                 ));

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<AcBloc, AcsState>(
         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<AcBloc>().add(AcFactoryResetEvent(

lib/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart

@@ -1,28 +0,0 @@
-import 'dart:async';
-
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-
-part 'switch_tabs_event.dart';
-part 'switch_tabs_state.dart';
-
-class SwitchTabsBloc extends Bloc<SwitchTabsEvent, SwitchTabsState> {
-  SwitchTabsBloc() : super(SwitchTabsInitial()) {
-    on<TriggerSwitchTabsEvent>(_switchTab);
-    on<CreateNewRoutineViewEvent>(_newRoutineView);
-  }
-
-  FutureOr<void> _switchTab(
-    TriggerSwitchTabsEvent event,
-    Emitter<SwitchTabsState> emit,
-  ) {
-    emit(SelectedTabState(event.isRoutineView));
-  }
-
-  FutureOr<void> _newRoutineView(
-    CreateNewRoutineViewEvent event,
-    Emitter<SwitchTabsState> emit,
-  ) {
-    emit(ShowCreateRoutineState(event.showCreateNewRoutineView));
-  }
-}

lib/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_event.dart

@@ -1,21 +0,0 @@
-part of 'switch_tabs_bloc.dart';
-
-sealed class SwitchTabsEvent extends Equatable {
-  const SwitchTabsEvent();
-}
-
-class TriggerSwitchTabsEvent extends SwitchTabsEvent {
-  final bool isRoutineView;
-  const TriggerSwitchTabsEvent(this.isRoutineView);
-
-  @override
-  List<Object?> get props => [isRoutineView];
-}
-
-class CreateNewRoutineViewEvent extends SwitchTabsEvent {
-  final bool showCreateNewRoutineView;
-  const CreateNewRoutineViewEvent(this.showCreateNewRoutineView);
-
-  @override
-  List<Object?> get props => [showCreateNewRoutineView];
-}

lib/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_state.dart

@@ -1,26 +0,0 @@
-part of 'switch_tabs_bloc.dart';
-
-sealed class SwitchTabsState extends Equatable {
-  const SwitchTabsState();
-}
-
-final class SwitchTabsInitial extends SwitchTabsState {
-  @override
-  List<Object> get props => [];
-}
-
-class SelectedTabState extends SwitchTabsState {
-  final bool selectedTab;
-  const SelectedTabState(this.selectedTab);
-
-  @override
-  List<Object?> get props => [selectedTab];
-}
-
-class ShowCreateRoutineState extends SwitchTabsState {
-  final bool showCreateRoutine;
-  const ShowCreateRoutineState(this.showCreateRoutine);
-
-  @override
-  List<Object?> get props => [showCreateRoutine];
-}

lib/pages/device_managment/all_devices/view/device_managment_page.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_managment_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routiens/view/routines_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@@ -18,10 +18,6 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
       providers: [
-        BlocProvider(
-          create: (context) =>
-              SwitchTabsBloc()..add(const TriggerSwitchTabsEvent(false)),
-        ),
         BlocProvider(
           create: (context) => DeviceManagementBloc()..add(FetchDevices()),
         ),
@@ -33,8 +29,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
             style: Theme.of(context).textTheme.headlineLarge,
           ),
         ),
-        centerBody: BlocBuilder<SwitchTabsBloc, SwitchTabsState>(
+        centerBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
-            builder: (context, state) {
           return Row(
             mainAxisSize: MainAxisSize.min,
             children: [
@@ -44,20 +39,14 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 ),
                 onPressed: () {
                   context
-                      .read<SwitchTabsBloc>()
+                      .read<RoutineBloc>()
-                      .add(const TriggerSwitchTabsEvent(false));
+                      .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
                 },
                 child: Text(
                   'Devices',
                   style: context.textTheme.titleMedium?.copyWith(
-                    color:
+                    color: !state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
-                        state is SelectedTabState && state.selectedTab == false
+                    fontWeight: !state.routineTab ? FontWeight.w700 : FontWeight.w400,
-                            ? ColorsManager.whiteColors
-                            : ColorsManager.grayColor,
-                    fontWeight: (state is SelectedTabState) &&
-                            state.selectedTab == false
-                        ? FontWeight.w700
-                        : FontWeight.w400,
                   ),
                 ),
               ),
@@ -66,21 +55,13 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   backgroundColor: null,
                 ),
                 onPressed: () {
-                  context
+                  context.read<RoutineBloc>().add(const TriggerSwitchTabsEvent(isRoutineTab: true));
-                      .read<SwitchTabsBloc>()
-                      .add(const TriggerSwitchTabsEvent(true));
                 },
                 child: Text(
                   'Routines',
                   style: context.textTheme.titleMedium?.copyWith(
-                    color:
+                    color: state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
-                        (state is SelectedTabState) && state.selectedTab == true
+                    fontWeight: state.routineTab ? FontWeight.w700 : FontWeight.w400,
-                            ? ColorsManager.whiteColors
-                            : ColorsManager.grayColor,
-                    fontWeight:
-                        (state is SelectedTabState) && state.selectedTab == true
-                            ? FontWeight.w700
-                            : FontWeight.w400,
                   ),
                 ),
               ),
@@ -88,12 +69,11 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
           );
         }),
         rightBody: const NavigateHomeGridView(),
-        scaffoldBody: BlocBuilder<SwitchTabsBloc, SwitchTabsState>(
+        scaffoldBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
-            builder: (context, state) {
+          if (state.routineTab) {
-          if (state is SelectedTabState && state.selectedTab) {
             return const RoutinesView();
           }
-          if (state is ShowCreateRoutineState && state.showCreateRoutine) {
+          if (state.createRoutineView) {
             return CreateNewRoutineView();
           }
 
@@ -104,8 +84,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
               } else if (deviceState is DeviceManagementLoaded) {
                 return DeviceManagementBody(devices: deviceState.devices);
               } else if (deviceState is DeviceManagementFiltered) {
-                return DeviceManagementBody(
+                return DeviceManagementBody(devices: deviceState.filteredDevices);
-                    devices: deviceState.filteredDevices);
               } else {
                 return const Center(child: Text('Error fetching Devices'));
               }

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<CeilingSensorBloc>().add(

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
+class CurtainBatchStatusView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   const CurtainBatchStatusView({super.key, required this.devicesIds});
 
   final List<String> devicesIds;
@@ -18,8 +17,8 @@ class CurtainBatchStatusView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => CurtainBloc(deviceId: devicesIds.first)
+      create: (context) =>
-        ..add(CurtainFetchBatchStatus(devicesIds)),
+          CurtainBloc(deviceId: devicesIds.first)..add(CurtainFetchBatchStatus(devicesIds)),
       child: BlocBuilder<CurtainBloc, CurtainState>(
         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<CurtainBloc>().add(

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
+class DoorLockBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   const DoorLockBatchControlView({super.key, required this.devicesIds});
 
   final List<String> devicesIds;
@@ -18,17 +17,17 @@ class DoorLockBatchControlView extends StatelessWidget
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        SizedBox(
+        // SizedBox(
-          width: 170,
+        //   width: 170,
-          height: 140,
+        //   height: 140,
-          child: FirmwareUpdateWidget(
+        //   child: FirmwareUpdateWidget(
-            deviceId: devicesIds.first,
+        //     deviceId: devicesIds.first,
-            version: 12,
+        //     version: 12,
-          ),
+        //   ),
-        ),
+        // ),
-        const SizedBox(
+        // const SizedBox(
-          width: 12,
+        //   width: 12,
-        ),
+        // ),
         SizedBox(
           width: 170,
           height: 140,

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
+class GarageDoorBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final List<String> deviceIds;
 
-  const GarageDoorBatchControlView({Key? key, required this.deviceIds})
+  const GarageDoorBatchControlView({Key? key, required this.deviceIds}) : super(key: key);
-      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -39,8 +37,7 @@ class GarageDoorBatchControlView extends StatelessWidget
     );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, GarageDoorStatusModel status) {
-      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(
+        // FirmwareUpdateWidget(
-          deviceId: deviceIds.first,
+        //   deviceId: deviceIds.first,
-          version: 12,
+        //   version: 12,
-        ),
+        // ),
         FactoryResetWidget(
           callFactoryReset: () {
             context.read<GarageDoorBloc>().add(

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
+class GatewayBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   const GatewayBatchControlView({super.key, required this.gatewayIds});
 
   final List<String> gatewayIds;
@@ -24,14 +23,13 @@ class GatewayBatchControlView extends StatelessWidget
             return Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                SizedBox(
+                // SizedBox(
-                    width: 170,
+                //     width: 170,
-                    height: 140,
+                //     height: 140,
-                    child: FirmwareUpdateWidget(
+                //     child: FirmwareUpdateWidget(deviceId: gatewayIds.first, version: 2)),
-                        deviceId: gatewayIds.first, version: 2)),
+                // const SizedBox(
-                const SizedBox(
+                //   width: 12,
-                  width: 12,
+                // ),
-                ),
                 SizedBox(
                   width: 170,
                   height: 140,
@@ -40,8 +38,7 @@ class GatewayBatchControlView extends StatelessWidget
                       context.read<GateWayBloc>().add(
                             GateWayFactoryReset(
                               deviceId: gatewayIds.first,
-                              factoryReset:
+                              factoryReset: FactoryResetModel(devicesUuid: gatewayIds),
-                                  FactoryResetModel(devicesUuid: gatewayIds),
                             ),
                           );
                     },

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(
+        // SizedBox(
-          width: 170,
+        //   width: 170,
-          height: 140,
+        //   height: 140,
-          child: FirmwareUpdateWidget(
+        //   child: FirmwareUpdateWidget(
-            deviceId: devicesIds.first,
+        //     deviceId: devicesIds.first,
-            version: 12,
+        //     version: 12,
-          ),
+        //   ),
-        ),
+        // ),
-        const SizedBox(
+        // const SizedBox(
-          width: 12,
+        //   width: 12,
-        ),
+        // ),
         SizedBox(
           width: 170,
           height: 140,

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
+class OneGangGlassSwitchBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final List<String> deviceIds;
 
-  const OneGangGlassSwitchBatchControlView(
+  const OneGangGlassSwitchBatchControlView({required this.deviceIds, super.key});
-      {required this.deviceIds, super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -36,8 +34,7 @@ class OneGangGlassSwitchBatchControlView extends StatelessWidget
     );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, OneGangGlassStatusModel status) {
-      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(
+        // FirmwareUpdateWidget(
-          deviceId: deviceIds.first,
+        //   deviceId: deviceIds.first,
-          version: 12,
+        //   version: 12,
-        ),
+        // ),
         FactoryResetWidget(
           callFactoryReset: () {
             context.read<OneGangGlassSwitchBloc>().add(

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
+class WallLightBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   const WallLightBatchControlView({super.key, required this.deviceIds});
 
   final List<String> 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 ||
+          } else if (state is WallLightSwitchError || state is WallLightSwitchControlError) {
-              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(
+  Widget _buildStatusControls(BuildContext context, WallLightStatusModel status) {
-      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(
+          // FirmwareUpdateWidget(
-            deviceId: deviceIds.first,
+          //   deviceId: deviceIds.first,
-            version: 12,
+          //   version: 12,
-          ),
+          // ),
           FactoryResetWidget(
             callFactoryReset: () {
               context.read<WallLightSwitchBloc>().add(WallLightFactoryReset(
-                  deviceId: status.uuid,
+                  deviceId: status.uuid, factoryReset: FactoryResetModel(devicesUuid: deviceIds)));
-                  factoryReset: FactoryResetModel(devicesUuid: deviceIds)));
             },
           ),
         ],

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
+class PowerClampBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final List<String> deviceIds;
 
-  const PowerClampBatchControlView({Key? key, required this.deviceIds})
+  const PowerClampBatchControlView({Key? key, required this.deviceIds}) : super(key: key);
-      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => SmartPowerBloc(deviceId: deviceIds.first)
+      create: (context) =>
-        ..add(SmartPowerFetchBatchEvent(deviceIds)),
+          SmartPowerBloc(deviceId: deviceIds.first)..add(SmartPowerFetchBatchEvent(deviceIds)),
       child: BlocBuilder<SmartPowerBloc, SmartPowerState>(
         builder: (context, state) {
           if (state is SmartPowerLoading) {
@@ -37,18 +35,17 @@ class PowerClampBatchControlView extends StatelessWidget
     );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, PowerClampBatchModel status) {
-      BuildContext context, PowerClampBatchModel status) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        SizedBox(
+        // SizedBox(
-            width: 170,
+        //     width: 170,
-            // height: 140,
+        //     // height: 140,
-            child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)),
+        //     child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)),
-        const SizedBox(
+        // const SizedBox(
-          width: 12,
+        //   width: 12,
-        ),
+        // ),
         SizedBox(
           width: 170,
           height: 140,

lib/pages/device_managment/shared/batch_control/firmware_update.dart

@@ -1,128 +1,128 @@
-import 'package:flutter/material.dart';
+// import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
+// import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.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/pages/device_managment/shared/device_controls_container.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
+// import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
+// import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
+// import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
-class FirmwareUpdateWidget extends StatefulWidget {
+// class FirmwareUpdateWidget extends StatefulWidget {
-  const FirmwareUpdateWidget({super.key, required this.deviceId, required this.version});
+//   const FirmwareUpdateWidget({super.key, required this.deviceId, required this.version});
 
-  final String deviceId;
+//   final String deviceId;
-  final int version;
+//   final int version;
 
-  @override
+//   @override
-  State<FirmwareUpdateWidget> createState() => _FirmwareUpdateWidgetState();
+//   State<FirmwareUpdateWidget> createState() => _FirmwareUpdateWidgetState();
-}
+// }
 
-class _FirmwareUpdateWidgetState extends State<FirmwareUpdateWidget> {
+// class _FirmwareUpdateWidgetState extends State<FirmwareUpdateWidget> {
-  bool _showConfirmation = false;
+//   bool _showConfirmation = false;
 
-  void _toggleConfirmation() {
+//   void _toggleConfirmation() {
-    setState(() {
+//     setState(() {
-      _showConfirmation = !_showConfirmation;
+//       _showConfirmation = !_showConfirmation;
-    });
+//     });
-  }
+//   }
 
-  @override
+//   @override
-  Widget build(BuildContext context) {
+//   Widget build(BuildContext context) {
-    return DeviceControlsContainer(
+//     return DeviceControlsContainer(
-      child: _showConfirmation
+//       child: _showConfirmation
-          ? Column(
+//           ? Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
+//               crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+//               mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
+//               children: [
-                Column(
+//                 Column(
-                  children: [
+//                   children: [
-                    Text(
+//                     Text(
-                      'Firmware Update',
+//                       'Firmware Update',
-                      style: context.textTheme.titleMedium!.copyWith(
+//                       style: context.textTheme.titleMedium!.copyWith(
-                        fontWeight: FontWeight.bold,
+//                         fontWeight: FontWeight.bold,
-                        color: ColorsManager.blackColor,
+//                         color: ColorsManager.blackColor,
-                      ),
+//                       ),
-                    ),
+//                     ),
-                    Text(
+//                     Text(
-                      'Are you sure?',
+//                       'Are you sure?',
-                      style: context.textTheme.bodySmall!.copyWith(
+//                       style: context.textTheme.bodySmall!.copyWith(
-                        color: ColorsManager.grayColor,
+//                         color: ColorsManager.grayColor,
-                      ),
+//                       ),
-                    ),
+//                     ),
-                  ],
+//                   ],
-                ),
+//                 ),
-                Row(
+//                 Row(
-                  children: [
+//                   children: [
-                    Flexible(
+//                     Flexible(
-                      child: DefaultButton(
+//                       child: DefaultButton(
-                        height: 20,
+//                         height: 20,
-                        elevation: 0,
+//                         elevation: 0,
-                        padding: 0,
+//                         padding: 0,
-                        onPressed: _toggleConfirmation,
+//                         onPressed: _toggleConfirmation,
-                        backgroundColor: ColorsManager.greyColor,
+//                         backgroundColor: ColorsManager.greyColor,
-                        child: Text(
+//                         child: Text(
-                          'Cancel',
+//                           'Cancel',
-                          style: context.textTheme.bodyMedium!.copyWith(
+//                           style: context.textTheme.bodyMedium!.copyWith(
-                            color: ColorsManager.blackColor,
+//                             color: ColorsManager.blackColor,
-                            fontWeight: FontWeight.w400,
+//                             fontWeight: FontWeight.w400,
-                            fontSize: 12,
+//                             fontSize: 12,
-                          ),
+//                           ),
-                        ),
+//                         ),
-                      ),
+//                       ),
-                    ),
+//                     ),
-                    const SizedBox(width: 8),
+//                     const SizedBox(width: 8),
-                    Flexible(
+//                     Flexible(
-                      child: DefaultButton(
+//                       child: DefaultButton(
-                        height: 20,
+//                         height: 20,
-                        elevation: 0,
+//                         elevation: 0,
-                        padding: 0,
+//                         padding: 0,
-                        onPressed: () {
+//                         onPressed: () {
-                          _toggleConfirmation();
+//                           _toggleConfirmation();
-                        },
+//                         },
-                        backgroundColor: ColorsManager.primaryColor,
+//                         backgroundColor: ColorsManager.primaryColor,
-                        child: Text(
+//                         child: Text(
-                          'Update',
+//                           'Update',
-                          style: context.textTheme.bodyMedium!.copyWith(
+//                           style: context.textTheme.bodyMedium!.copyWith(
-                            color: ColorsManager.whiteColors,
+//                             color: ColorsManager.whiteColors,
-                            fontWeight: FontWeight.w400,
+//                             fontWeight: FontWeight.w400,
-                            fontSize: 12,
+//                             fontSize: 12,
-                          ),
+//                           ),
-                        ),
+//                         ),
-                      ),
+//                       ),
-                    ),
+//                     ),
-                  ],
+//                   ],
-                ),
+//                 ),
-              ],
+//               ],
-            )
+//             )
-          : GestureDetector(
+//           : GestureDetector(
-              onTap: _toggleConfirmation,
+//               onTap: _toggleConfirmation,
-              child: Column(
+//               child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+//                 crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+//                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
+//                 children: [
-                  ClipOval(
+//                   ClipOval(
-                    child: Container(
+//                     child: Container(
-                      color: ColorsManager.whiteColors,
+//                       color: ColorsManager.whiteColors,
-                      height: 60,
+//                       height: 60,
-                      width: 60,
+//                       width: 60,
-                      child: Padding(
+//                       child: Padding(
-                        padding: const EdgeInsets.all(12.0),
+//                         padding: const EdgeInsets.all(12.0),
-                        child: SvgPicture.asset(
+//                         child: SvgPicture.asset(
-                          Assets.firmware,
+//                           Assets.firmware,
-                          fit: BoxFit.cover,
+//                           fit: BoxFit.cover,
-                        ),
+//                         ),
-                      ),
+//                       ),
-                    ),
+//                     ),
-                  ),
+//                   ),
-                  Text(
+//                   Text(
-                    'Firmware Update',
+//                     'Firmware Update',
-                    style: context.textTheme.titleMedium!.copyWith(
+//                     style: context.textTheme.titleMedium!.copyWith(
-                      fontWeight: FontWeight.w400,
+//                       fontWeight: FontWeight.w400,
-                      color: ColorsManager.blackColor,
+//                       color: ColorsManager.blackColor,
-                    ),
+//                     ),
-                  ),
+//                   ),
-                ],
+//                 ],
-              ),
+//               ),
-            ),
+//             ),
-    );
+//     );
-  }
+//   }
-}
+// }

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(
+        // SizedBox(
-            width: 170,
+        //     width: 170,
-            // height: 140,
+        //     // height: 140,
-            child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)),
+        //     child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)),
-        const SizedBox(
+        // const SizedBox(
-          width: 12,
+        //   width: 12,
-        ),
+        // ),
         SizedBox(
           width: 170,
           height: 140,
           child: FactoryResetWidget(
             callFactoryReset: () {
-              context.read<SosDeviceBloc>().add(
+              context.read<SosDeviceBloc>().add(SosFactoryReset(
-                  SosFactoryReset(deviceId: deviceIds.first, factoryReset: FactoryResetModel(devicesUuid: deviceIds)));
+                  deviceId: deviceIds.first,
+                  factoryReset: FactoryResetModel(devicesUuid: deviceIds)));
             },
           ),
         ),

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(
+        // FirmwareUpdateWidget(
-          deviceId: deviceIds.first,
+        //   deviceId: deviceIds.first,
-          version: 12, // adjust the version according to your requirement
+        //   version: 12, // adjust the version according to your requirement
-        ),
+        // ),
         FactoryResetWidget(
           callFactoryReset: () {
             context.read<ThreeGangGlassSwitchBloc>().add(

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
+class LivingRoomBatchControlsView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   const LivingRoomBatchControlsView({super.key, required this.deviceIds});
 
   final List<String> deviceIds;
@@ -17,16 +16,15 @@ class LivingRoomBatchControlsView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => LivingRoomBloc(deviceId: deviceIds.first)
+      create: (context) =>
-        ..add(LivingRoomFetchBatchEvent(deviceIds)),
+          LivingRoomBloc(deviceId: deviceIds.first)..add(LivingRoomFetchBatchEvent(deviceIds)),
       child: BlocBuilder<LivingRoomBloc, LivingRoomState>(
         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 ||
+          } else if (state is LivingRoomDeviceManagementError || state is LivingRoomControlError) {
-              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(
+  Widget _buildStatusControls(BuildContext context, LivingRoomStatusModel status) {
-      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(
+          // FirmwareUpdateWidget(
-            deviceId: deviceIds.first,
+          //   deviceId: deviceIds.first,
-            version: 12,
+          //   version: 12,
-          ),
+          // ),
           FactoryResetWidget(callFactoryReset: () {
             context.read<LivingRoomBloc>().add(
                   LivingRoomFactoryResetEvent(

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) =>
+      create: (context) => TwoGangGlassSwitchBloc(deviceId: deviceIds.first)
-          TwoGangGlassSwitchBloc(deviceId: deviceIds.first)..add(TwoGangGlassSwitchFetchBatchStatusEvent(deviceIds)),
+        ..add(TwoGangGlassSwitchFetchBatchStatusEvent(deviceIds)),
       child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
         builder: (context, state) {
           if (state is TwoGangGlassSwitchLoading) {
@@ -83,10 +83,10 @@ class TwoGangGlassSwitchBatchControlView extends StatelessWidget with HelperResp
                 );
           },
         ),
-        FirmwareUpdateWidget(
+        // FirmwareUpdateWidget(
-          deviceId: deviceIds.first,
+        //   deviceId: deviceIds.first,
-          version: 12, // adjust the version according to your requirement
+        //   version: 12, // adjust the version according to your requirement
-        ),
+        // ),
         FactoryResetWidget(
           callFactoryReset: () {
             context.read<TwoGangGlassSwitchBloc>().add(

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
+class TwoGangBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   const TwoGangBatchControlView({super.key, required this.deviceIds});
 
   final List<String> 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 ||
+          } else if (state is TwoGangSwitchError || state is TwoGangSwitchControlError) {
-              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(
+          // FirmwareUpdateWidget(
-            deviceId: deviceIds.first,
+          //   deviceId: deviceIds.first,
-            version: 12,
+          //   version: 12,
-          ),
+          // ),
           FactoryResetWidget(callFactoryReset: () {
             context.read<TwoGangSwitchBloc>().add(
                   TwoGangFactoryReset(

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<WallSensorBloc>().add(

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
+class WaterHEaterBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   const WaterHEaterBatchControlView({super.key, required this.deviceIds});
 
   final List<String> deviceIds;
@@ -18,8 +17,8 @@ class WaterHEaterBatchControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => WaterHeaterBloc()
+      create: (context) =>
-        ..add(FetchWaterHeaterBatchStatusEvent(devicesUuid: deviceIds)),
+          WaterHeaterBloc()..add(FetchWaterHeaterBatchStatusEvent(devicesUuid: deviceIds)),
       child: BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
         builder: (context, state) {
           if (state is WaterHeaterLoadingState) {
@@ -36,8 +35,7 @@ class WaterHEaterBatchControlView extends StatelessWidget
     );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, WaterHeaterStatusModel status) {
-      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(
+          // FirmwareUpdateWidget(
-            deviceId: deviceIds.first,
+          //   deviceId: deviceIds.first,
-            version: 12,
+          //   version: 12,
-          ),
+          // ),
           FactoryResetWidget(
             callFactoryReset: () {},
           ),

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
+class WaterLeakBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final List<String> deviceIds;
 
-  const WaterLeakBatchControlView({Key? key, required this.deviceIds})
+  const WaterLeakBatchControlView({Key? key, required this.deviceIds}) : super(key: key);
-      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => WaterLeakBloc(deviceIds.first)
+      create: (context) =>
-        ..add(FetchWaterLeakBatchStatusEvent(deviceIds)),
+          WaterLeakBloc(deviceIds.first)..add(FetchWaterLeakBatchStatusEvent(deviceIds)),
       child: BlocBuilder<WaterLeakBloc, WaterLeakState>(
         builder: (context, state) {
           if (state is WaterLeakLoadingState) {
@@ -38,18 +36,17 @@ class WaterLeakBatchControlView extends StatelessWidget
     );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, WaterLeakStatusModel status) {
-      BuildContext context, WaterLeakStatusModel status) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        SizedBox(
+        // SizedBox(
-            width: 170,
+        //     width: 170,
-            height: 140,
+        //     height: 140,
-            child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)),
+        //     child: FirmwareUpdateWidget(deviceId: deviceIds.first, version: 2)),
-        const SizedBox(
+        // const SizedBox(
-          width: 12,
+        //   width: 12,
-        ),
+        // ),
         SizedBox(
           width: 170,
           height: 140,

lib/pages/home/bloc/home_bloc.dart

@@ -6,6 +6,7 @@ import 'package:syncrow_web/pages/auth/model/user_model.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/home_model/home_item_model.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/services/home_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -41,8 +42,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
     try {
-      var uuid =
+      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
       emit(HomeInitial());
     } catch (e) {
@@ -84,44 +84,46 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       icon: Assets.devicesIcon,
       active: true,
       onPress: (context) {
+        BlocProvider.of<RoutineBloc>(context)
+            .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
         context.go(RoutesConst.deviceManagementPage);
       },
       color: ColorsManager.primaryColor,
     ),
-    HomeItemModel(
+    // HomeItemModel(
-      title: 'Move in',
+    //   title: 'Move in',
-      icon: Assets.moveinIcon,
+    //   icon: Assets.moveinIcon,
-      active: false,
+    //   active: false,
-      onPress: (context) {},
+    //   onPress: (context) {},
-      color: ColorsManager.primaryColor,
+    //   color: ColorsManager.primaryColor,
-    ),
+    // ),
-    HomeItemModel(
+    // HomeItemModel(
-      title: 'Construction',
+    //   title: 'Construction',
-      icon: Assets.constructionIcon,
+    //   icon: Assets.constructionIcon,
-      active: false,
+    //   active: false,
-      onPress: (context) {},
+    //   onPress: (context) {},
-      color: ColorsManager.primaryColor,
+    //   color: ColorsManager.primaryColor,
-    ),
+    // ),
-    HomeItemModel(
+    // HomeItemModel(
-      title: 'Energy',
+    //   title: 'Energy',
-      icon: Assets.energyIcon,
+    //   icon: Assets.energyIcon,
-      active: false,
+    //   active: false,
-      onPress: (context) {},
+    //   onPress: (context) {},
-      color: ColorsManager.slidingBlueColor.withOpacity(0.2),
+    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    ),
+    // ),
-    HomeItemModel(
+    // HomeItemModel(
-      title: 'Integrations',
+    //   title: 'Integrations',
-      icon: Assets.integrationsIcon,
+    //   icon: Assets.integrationsIcon,
-      active: false,
+    //   active: false,
-      onPress: (context) {},
+    //   onPress: (context) {},
-      color: ColorsManager.slidingBlueColor.withOpacity(0.2),
+    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    ),
+    // ),
-    HomeItemModel(
+    // HomeItemModel(
-      title: 'Asset',
+    //   title: 'Asset',
-      icon: Assets.assetIcon,
+    //   icon: Assets.assetIcon,
-      active: false,
+    //   active: false,
-      onPress: (context) {},
+    //   onPress: (context) {},
-      color: ColorsManager.slidingBlueColor.withOpacity(0.2),
+    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    ),
+    // ),
   ];
 }

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,

lib/pages/routiens/bloc/routine_bloc/routine_event.dart

@@ -187,8 +187,24 @@ class SetAutomationActionExecutor extends RoutineEvent {
   List<Object> get props => [automationActionExecutor];
 }
 
+class TriggerSwitchTabsEvent extends RoutineEvent {
+  final bool isRoutineTab;
+  const TriggerSwitchTabsEvent({required this.isRoutineTab});
+  @override
+  List<Object> get props => [isRoutineTab];
+}
+
+class CreateNewRoutineViewEvent extends RoutineEvent {
+  final bool createRoutineView;
+  const CreateNewRoutineViewEvent({required this.createRoutineView});
+  @override
+  List<Object> get props => [createRoutineView];
+}
+
 class FetchDevicesInRoutine extends RoutineEvent {}
 
 class ResetRoutineState extends RoutineEvent {}
 
 class ClearFunctions extends RoutineEvent {}
+
+class ResetErrorMessage extends RoutineEvent {}

lib/pages/routiens/bloc/routine_bloc/routine_state.dart

@@ -22,10 +22,12 @@ class RoutineState extends Equatable {
   final String? automationId;
   final bool? isUpdate;
   final List<AllDevicesModel> devices;
-  final String? automationActionExecutor;
+  // final String? automationActionExecutor;
+  final bool routineTab;
+  final bool createRoutineView;
 
-  const RoutineState({
+  const RoutineState(
-    this.ifItems = const [],
+      {this.ifItems = const [],
       this.thenItems = const [],
       this.availableCards = const [],
       this.scenes = const [],
@@ -46,8 +48,9 @@ class RoutineState extends Equatable {
       this.automationId,
       this.isUpdate,
       this.devices = const [],
-    this.automationActionExecutor,
+      //  this.automationActionExecutor,
-  });
+      this.routineTab = false,
+      this.createRoutineView = false});
 
   RoutineState copyWith({
     List<Map<String, dynamic>>? ifItems,
@@ -70,7 +73,10 @@ class RoutineState extends Equatable {
     String? automationId,
     bool? isUpdate,
     List<AllDevicesModel>? devices,
-    String? automationActionExecutor,
+    //  String? automationActionExecutor,
+    TextEditingController? nameController,
+    bool? routineTab,
+    bool? createRoutineView,
   }) {
     return RoutineState(
         ifItems: ifItems ?? this.ifItems,
@@ -96,9 +102,9 @@ class RoutineState extends Equatable {
         automationId: automationId ?? this.automationId,
         isUpdate: isUpdate ?? this.isUpdate,
         devices: devices ?? this.devices,
-      automationActionExecutor:
+        //  automationActionExecutor: automationActionExecutor ?? this.automationActionExecutor,
-          automationActionExecutor ?? this.automationActionExecutor,
+        routineTab: routineTab ?? this.routineTab,
-    );
+        createRoutineView: createRoutineView ?? this.createRoutineView);
   }
 
   @override
@@ -123,6 +129,8 @@ class RoutineState extends Equatable {
         automationId,
         isUpdate,
         devices,
-        automationActionExecutor,
+        //   automationActionExecutor,
+        routineTab,
+        createRoutineView
       ];
 }

lib/pages/routiens/helper/save_routine_helper.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -6,10 +8,11 @@ import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 import 'package:syncrow_web/pages/routiens/widgets/dialog_footer.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 SaveRoutineHelper {
-  static Future<bool?> showSaveRoutineDialog(BuildContext context) async {
+  static Future<void> showSaveRoutineDialog(BuildContext context) async {
-    return showDialog<bool?>(
+    return showDialog<void>(
       context: context,
       builder: (BuildContext context) {
         return BlocBuilder<RoutineBloc, RoutineState>(
@@ -54,27 +57,23 @@ class SaveRoutineHelper {
                                   ),
                                 if (state.isAutomation)
                                   ...state.ifItems.map((item) {
-                                    final functions = state.selectedFunctions[
+                                    final functions =
-                                            item['uniqueCustomId']] ??
+                                        state.selectedFunctions[item['uniqueCustomId']] ?? [];
-                                        [];
                                     return ListTile(
                                       leading: SvgPicture.asset(
                                         item['imagePath'],
                                         width: 22,
                                         height: 22,
                                       ),
-                                      title: Text(item['title'],
+                                      title:
-                                          style: const TextStyle(fontSize: 14)),
+                                          Text(item['title'], style: const TextStyle(fontSize: 14)),
                                       subtitle: Wrap(
                                         children: functions
                                             .map((f) => Text(
                                                   '${f.operationName}: ${f.value}, ',
                                                   style: const TextStyle(
-                                                      color: ColorsManager
+                                                      color: ColorsManager.grayColor, fontSize: 8),
-                                                          .grayColor,
+                                                  overflow: TextOverflow.ellipsis,
-                                                      fontSize: 8),
-                                                  overflow:
-                                                      TextOverflow.ellipsis,
                                                   maxLines: 3,
                                                 ))
                                             .toList(),
@@ -99,25 +98,33 @@ class SaveRoutineHelper {
                                 ),
                                 const SizedBox(height: 8),
                                 ...state.thenItems.map((item) {
-                                  final functions = state.selectedFunctions[
+                                  final functions =
-                                          item['uniqueCustomId']] ??
+                                      state.selectedFunctions[item['uniqueCustomId']] ?? [];
-                                      [];
                                   return ListTile(
-                                    leading: SvgPicture.asset(
+                                    leading: item['type'] == 'tap_to_run' || item['type'] == 'scene'
+                                        ? Image.memory(
+                                            base64Decode(item['icon']),
+                                            width: 22,
+                                            height: 22,
+                                          )
+                                        : SvgPicture.asset(
                                             item['imagePath'],
                                             width: 22,
                                             height: 22,
                                           ),
-                                    title: Text(item['title'],
+                                    title: Text(
-                                        style: const TextStyle(fontSize: 14)),
+                                      item['title'],
+                                      style: context.textTheme.bodySmall?.copyWith(
+                                        fontSize: 14,
+                                        color: ColorsManager.grayColor,
+                                      ),
+                                    ),
                                     subtitle: Wrap(
                                       children: functions
                                           .map((f) => Text(
                                                 '${f.operationName}: ${f.value}, ',
-                                                style: const TextStyle(
+                                                style: context.textTheme.bodySmall?.copyWith(
-                                                    color:
+                                                    color: ColorsManager.grayColor, fontSize: 8),
-                                                        ColorsManager.grayColor,
-                                                    fontSize: 8),
                                                 overflow: TextOverflow.ellipsis,
                                                 maxLines: 3,
                                               ))
@@ -131,42 +138,33 @@ class SaveRoutineHelper {
                         ],
                       ),
                     ),
-                    if (state.errorMessage != null)
+                    // if (state.errorMessage != null || state.errorMessage!.isNotEmpty)
-                      Padding(
+                    //   Padding(
-                        padding: const EdgeInsets.all(8.0),
+                    //     padding: const EdgeInsets.all(8.0),
-                        child: Text(
+                    //     child: Text(
-                          state.errorMessage!,
+                    //       state.errorMessage!,
-                          style: const TextStyle(color: Colors.red),
+                    //       style: const TextStyle(color: Colors.red),
-                        ),
+                    //     ),
-                      ),
+                    //   ),
                     DialogFooter(
-                      onCancel: () => Navigator.pop(context, false),
+                      onCancel: () => Navigator.pop(context),
-                      onConfirm: () {
+                      onConfirm: () async {
                         if (state.isAutomation) {
-                          if (state.automationId != null) {
+                          if (state.isUpdate ?? false) {
-                            context
+                            context.read<RoutineBloc>().add(const UpdateAutomation());
-                                .read<RoutineBloc>()
-                                .add(const UpdateAutomation());
                           } else {
-                            context
+                            context.read<RoutineBloc>().add(const CreateAutomationEvent());
-                                .read<RoutineBloc>()
-                                .add(const CreateAutomationEvent());
                           }
                         } else {
-                          if (state.sceneId != null) {
+                          if (state.isUpdate ?? false) {
-                            context
+                            context.read<RoutineBloc>().add(const UpdateScene());
-                                .read<RoutineBloc>()
-                                .add(const UpdateScene());
                           } else {
-                            context
+                            context.read<RoutineBloc>().add(const CreateSceneEvent());
-                                .read<RoutineBloc>()
-                                .add(const CreateSceneEvent());
-                          }
-                          if (context.read<RoutineBloc>().state.errorMessage ==
-                              null) {
-                            Navigator.pop(context, true);
                           }
                         }
+                        // if (state.errorMessage == null || state.errorMessage!.isEmpty) {
+                        Navigator.pop(context);
+                        // }
                       },
                       isConfirmEnabled: true,
                     ),

lib/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart

@@ -92,7 +92,7 @@ class Condition {
     return {
       'code': code,
       'entityId': entityId,
-      'entityType': entityType,
+      'entityType': 'device_report',
       'expr': expr.toMap(),
     };
   }
@@ -137,11 +137,13 @@ class ConditionExpr {
 
 class AutomationAction {
   String entityId;
+  String? actionType;
   String actionExecutor;
   ExecutorProperty? executorProperty;
 
   AutomationAction({
     required this.entityId,
+    this.actionType,
     required this.actionExecutor,
     this.executorProperty,
   });
@@ -150,12 +152,15 @@ class AutomationAction {
     return {
       'entityId': entityId,
       'actionExecutor': actionExecutor,
+      if (executorProperty != null)
         'executorProperty': executorProperty?.toMap(),
+      'actionType': actionType
     };
   }
 
   factory AutomationAction.fromMap(Map<String, dynamic> map) {
     return AutomationAction(
+      actionType: map['actionType'],
       entityId: map['entityId'] ?? '',
       actionExecutor: map['actionExecutor'] ?? '',
       executorProperty: map['executorProperty'] != null

lib/pages/routiens/models/create_scene_and_autoamtion/create_scene_model.dart

@@ -95,10 +95,12 @@ class CreateSceneModel {
 
 class CreateSceneAction {
   String entityId;
+  String? actionType;
   String actionExecutor;
   CreateSceneExecutorProperty? executorProperty;
 
   CreateSceneAction({
+    this.actionType,
     required this.entityId,
     required this.actionExecutor,
     required this.executorProperty,
@@ -110,6 +112,7 @@ class CreateSceneAction {
     CreateSceneExecutorProperty? executorProperty,
   }) {
     return CreateSceneAction(
+      actionType: actionType ?? this.actionType,
       entityId: entityId ?? this.entityId,
       actionExecutor: actionExecutor ?? this.actionExecutor,
       executorProperty: executorProperty ?? this.executorProperty,
@@ -125,6 +128,7 @@ class CreateSceneAction {
       };
     } else {
       return {
+        "actionType": actionType,
         'entityId': entityId,
         'actionExecutor': actionExecutor,
       };
@@ -133,6 +137,7 @@ class CreateSceneAction {
 
   factory CreateSceneAction.fromMap(Map<String, dynamic> map) {
     return CreateSceneAction(
+      actionType: map['actionType'],
       entityId: map['entityId'] ?? '',
       actionExecutor: map['actionExecutor'] ?? '',
       executorProperty:

lib/pages/routiens/models/routine_details_model.dart

@@ -48,8 +48,7 @@ class RoutineDetailsModel {
       spaceUuid: spaceUuid,
       automationName: name,
       decisionExpr: decisionExpr,
-      effectiveTime:
+      effectiveTime: effectiveTime ?? EffectiveTime(start: '', end: '', loops: ''),
-          effectiveTime ?? EffectiveTime(start: '', end: '', loops: ''),
       conditions: conditions?.map((c) => c.toCondition()).toList() ?? [],
       actions: actions.map((a) => a.toAutomationAction()).toList(),
     );
@@ -64,8 +63,7 @@ class RoutineDetailsModel {
       if (iconId != null) 'iconUuid': iconId,
       if (showInDevice != null) 'showInDevice': showInDevice,
       if (effectiveTime != null) 'effectiveTime': effectiveTime!.toMap(),
-      if (conditions != null)
+      if (conditions != null) 'conditions': conditions!.map((x) => x.toMap()).toList(),
-        'conditions': conditions!.map((x) => x.toMap()).toList(),
       if (type != null) 'type': type,
       if (sceneId != null) 'sceneId': sceneId,
       if (automationId != null) 'automationId': automationId,
@@ -82,12 +80,10 @@ class RoutineDetailsModel {
       ),
       iconId: map['iconUuid'],
       showInDevice: map['showInDevice'],
-      effectiveTime: map['effectiveTime'] != null
+      effectiveTime:
-          ? EffectiveTime.fromMap(map['effectiveTime'])
+          map['effectiveTime'] != null ? EffectiveTime.fromMap(map['effectiveTime']) : null,
-          : null,
       conditions: map['conditions'] != null
-          ? List<RoutineCondition>.from(
+          ? List<RoutineCondition>.from(map['conditions'].map((x) => RoutineCondition.fromMap(x)))
-              map['conditions'].map((x) => RoutineCondition.fromMap(x)))
           : null,
       type: map['type'],
       sceneId: map['sceneId'],
@@ -108,15 +104,16 @@ class RoutineAction {
   final RoutineExecutorProperty? executorProperty;
   final String productType;
   final String? type;
+  final String? icon;
 
-  RoutineAction({
+  RoutineAction(
-    required this.entityId,
+      {required this.entityId,
       required this.actionExecutor,
       required this.productType,
       this.executorProperty,
       this.name,
       this.type,
-  });
+      this.icon});
 
   CreateSceneAction toCreateSceneAction() {
     return CreateSceneAction(
@@ -140,8 +137,7 @@ class RoutineAction {
       'actionExecutor': actionExecutor,
       if (type != null) 'type': type,
       if (name != null) 'name': name,
-      if (executorProperty != null)
+      if (executorProperty != null) 'executorProperty': executorProperty!.toMap(),
-        'executorProperty': executorProperty!.toMap(),
     };
   }
 
@@ -155,7 +151,7 @@ class RoutineAction {
         executorProperty: map['executorProperty'] != null
             ? RoutineExecutorProperty.fromMap(map['executorProperty'])
             : null,
-    );
+        icon: map['icon']);
   }
 }
 

lib/pages/routiens/view/routines_view.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routiens/widgets/main_routine_view/fetch_routine_scenes_automation.dart';
@@ -23,12 +22,10 @@ class _RoutinesViewState extends State<RoutinesView> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<SwitchTabsBloc, SwitchTabsState>(
+    return BlocBuilder<RoutineBloc, RoutineState>(
       builder: (context, state) {
-        if (state is ShowCreateRoutineState && state.showCreateRoutine) {
+        if (state.createRoutineView) {
-          return const CreateNewRoutineView(
+          return const CreateNewRoutineView();
-           
-          );
         }
         return Padding(
           padding: const EdgeInsets.all(16),
@@ -49,12 +46,12 @@ class _RoutinesViewState extends State<RoutinesView> {
               ),
               RoutineViewCard(
                 onTap: () {
-                  BlocProvider.of<SwitchTabsBloc>(context).add(
-                    const CreateNewRoutineViewEvent(true),
-                  );
                   context.read<RoutineBloc>().add(
                         (ResetRoutineState()),
                       );
+                  BlocProvider.of<RoutineBloc>(context).add(
+                    const CreateNewRoutineViewEvent(createRoutineView: true),
+                  );
                 },
                 icon: Icons.add,
                 textString: '',

lib/pages/routiens/widgets/delete_scene.dart

@@ -33,31 +33,24 @@ class DeleteSceneWidget extends StatelessWidget {
                           alignment: AlignmentDirectional.center,
                           child: Text(
                             'Cancel',
-                            style: Theme.of(context)
+                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                .textTheme
-                                .bodyMedium!
-                                .copyWith(
                                   color: ColorsManager.textGray,
                                 ),
                           ),
                         ),
                       ),
-                      Container(
+                      Container(width: 1, height: 50, color: ColorsManager.greyColor),
-                          width: 1, height: 50, color: ColorsManager.greyColor),
                       InkWell(
                         onTap: () {
                           context.read<RoutineBloc>().add(const DeleteScene());
                           Navigator.of(context).pop();
-                          Navigator.of(context).pop(true);
+                          Navigator.of(context).pop();
                         },
                         child: Container(
                           alignment: AlignmentDirectional.center,
                           child: Text(
                             'Confirm',
-                            style: Theme.of(context)
+                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                .textTheme
-                                .bodyMedium!
-                                .copyWith(
                                   color: ColorsManager.primaryColorWithOpacity,
                                 ),
                           ),

lib/pages/routiens/widgets/dragable_card.dart

@@ -32,15 +32,27 @@ class DraggableCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
       builder: (context, state) {
-        final deviceFunctions =
+        final deviceFunctions = state.selectedFunctions[deviceData['uniqueCustomId']] ?? [];
-            state.selectedFunctions[deviceData['uniqueCustomId']] ?? [];
+
+        int index = state.thenItems
+            .indexWhere((item) => item['uniqueCustomId'] == deviceData['uniqueCustomId']);
+
+        if (index != -1) {
+          return _buildCardContent(context, deviceFunctions, padding: padding);
+        }
+
+        int ifIndex = state.ifItems
+            .indexWhere((item) => item['uniqueCustomId'] == deviceData['uniqueCustomId']);
+
+        if (ifIndex != -1) {
+          return _buildCardContent(context, deviceFunctions, padding: padding);
+        }
 
         return Draggable<Map<String, dynamic>>(
           data: deviceData,
           feedback: Transform.rotate(
             angle: -0.1,
-            child:
+            child: _buildCardContent(context, deviceFunctions, padding: padding),
-                _buildCardContent(context, deviceFunctions, padding: padding),
           ),
           childWhenDragging: _buildGreyContainer(),
           child: _buildCardContent(context, deviceFunctions, padding: padding),
@@ -49,8 +61,7 @@ class DraggableCard extends StatelessWidget {
     );
   }
 
-  Widget _buildCardContent(
+  Widget _buildCardContent(BuildContext context, List<DeviceFunctionData> deviceFunctions,
-      BuildContext context, List<DeviceFunctionData> deviceFunctions,
       {EdgeInsetsGeometry? padding}) {
     return Stack(
       children: [
@@ -79,16 +90,12 @@ class DraggableCard extends StatelessWidget {
                         ),
                       ),
                       padding: const EdgeInsets.all(8),
-                      child: imagePath.contains('.svg')
+                      child: deviceData['type'] == 'tap_to_run' || deviceData['type'] == 'scene'
-                          ? SvgPicture.asset(
+                          ? Image.memory(
-                              imagePath,
+                              base64Decode(deviceData['icon']),
                             )
-                          : imagePath.contains('.png')
+                          : SvgPicture.asset(
-                              ? Image.asset(
                               imagePath,
-                                )
-                              : Image.memory(
-                                  base64Decode(imagePath),
                             ),
                     ),
                     const SizedBox(height: 8),
@@ -152,8 +159,7 @@ class DraggableCard extends StatelessWidget {
   }
 
   String _formatFunctionValue(DeviceFunctionData function) {
-    if (function.functionCode == 'temp_set' ||
+    if (function.functionCode == 'temp_set' || function.functionCode == 'temp_current') {
-        function.functionCode == 'temp_current') {
       return '${(function.value / 10).toStringAsFixed(0)}°C';
     } else if (function.functionCode.contains('countdown')) {
       final seconds = function.value.toInt();

lib/pages/routiens/widgets/main_routine_view/fetch_routine_scenes_automation.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/widgets/main_routine_view/routine_view_card.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@@ -69,8 +68,8 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                               ),
                               child: RoutineViewCard(
                                 onTap: () {
-                                  BlocProvider.of<SwitchTabsBloc>(context).add(
+                                  BlocProvider.of<RoutineBloc>(context).add(
-                                    const CreateNewRoutineViewEvent(true),
+                                    const CreateNewRoutineViewEvent(createRoutineView: true),
                                   );
                                   context.read<RoutineBloc>().add(
                                         GetSceneDetails(
@@ -118,8 +117,8 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                               ),
                               child: RoutineViewCard(
                                 onTap: () {
-                                  BlocProvider.of<SwitchTabsBloc>(context).add(
+                                  BlocProvider.of<RoutineBloc>(context).add(
-                                    const CreateNewRoutineViewEvent(true),
+                                    const CreateNewRoutineViewEvent(createRoutineView: true),
                                   );
                                   context.read<RoutineBloc>().add(
                                         GetAutomationDetails(

lib/pages/routiens/widgets/routine_dialogs/automation_dialog.dart

@@ -7,98 +7,106 @@ import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 import 'package:syncrow_web/pages/routiens/widgets/dialog_footer.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-class AutomationDialog extends StatelessWidget {
+class AutomationDialog extends StatefulWidget {
   final String automationName;
   final String automationId;
   final String uniqueCustomId;
+  final String? passedAutomationActionExecutor;
 
   const AutomationDialog({
     super.key,
     required this.automationName,
     required this.automationId,
     required this.uniqueCustomId,
+    this.passedAutomationActionExecutor,
   });
 
   @override
-  Widget build(BuildContext context) {
+  State<AutomationDialog> createState() => _AutomationDialogState();
-    return BlocBuilder<RoutineBloc, RoutineState>(
+}
-      builder: (context, state) {
-        final isEnabled = state.automationActionExecutor == 'rule_enable';
 
+class _AutomationDialogState extends State<AutomationDialog> {
+  String? selectedAutomationActionExecutor;
+
+  @override
+  void initState() {
+    super.initState();
+    List<DeviceFunctionData>? functions = context
+        .read<RoutineBloc>()
+        .state
+        .selectedFunctions[widget.uniqueCustomId];
+    for (DeviceFunctionData data in functions ?? []) {
+      if (data.entityId == widget.automationId) {
+        selectedAutomationActionExecutor = data.value;
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
     return Dialog(
-          shape:
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
-              RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
       child: Container(
         width: 400,
         padding: const EdgeInsets.all(16),
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-                DialogHeader(automationName),
+            DialogHeader(widget.automationName),
             const SizedBox(height: 16),
             ListTile(
-                  leading:
+              leading: SvgPicture.asset(Assets.acPower, width: 24, height: 24),
-                      SvgPicture.asset(Assets.acPower, width: 24, height: 24),
               title: const Text('Enable'),
-                  trailing: Radio<bool>(
+              trailing: Radio<String?>(
-                    value: true,
+                  value: 'rule_enable',
-                    groupValue: isEnabled,
+                  groupValue: selectedAutomationActionExecutor,
-                    onChanged: (bool? value) {
+                  onChanged: (String? value) {
-                      if (value == true) {
+                    setState(() {
-                        context.read<RoutineBloc>().add(
+                      selectedAutomationActionExecutor = 'rule_enable';
-                              const SetAutomationActionExecutor(
+                    });
-                                automationActionExecutor: 'rule_enable',
+                  }),
-                              ),
-                            );
-                      }
-                    },
-                  ),
             ),
             ListTile(
-                  leading: SvgPicture.asset(Assets.acPowerOff,
+              leading:
-                      width: 24, height: 24),
+                  SvgPicture.asset(Assets.acPowerOff, width: 24, height: 24),
               title: const Text('Disable'),
-                  trailing: Radio<bool>(
+              trailing: Radio<String?>(
-                    value: false,
+                value: 'rule_disable',
-                    groupValue: isEnabled,
+                groupValue: selectedAutomationActionExecutor,
-                    onChanged: (bool? value) {
+                onChanged: (String? value) {
-                      if (value == false) {
+                  setState(() {
-                        context.read<RoutineBloc>().add(
+                    selectedAutomationActionExecutor = 'rule_disable';
-                              const SetAutomationActionExecutor(
+                  });
-                                automationActionExecutor: 'rule_disable',
-                              ),
-                            );
-                      }
                 },
               ),
             ),
             const SizedBox(height: 16),
             DialogFooter(
               onConfirm: () {
+                if (selectedAutomationActionExecutor != null) {
                   context.read<RoutineBloc>().add(
                         AddFunctionToRoutine(
                           [
                             DeviceFunctionData(
-                                entityId: automationId,
+                              entityId: widget.automationId,
                               functionCode: 'automation',
-                                value: state.automationActionExecutor,
+                              value: selectedAutomationActionExecutor,
                               operationName: 'Automation',
                             ),
                           ],
-                            uniqueCustomId,
+                          widget.uniqueCustomId,
                         ),
                       );
+                }
                 Navigator.of(context).pop(true);
               },
-                  onCancel: () => Navigator.of(context).pop(false),
+              onCancel: () => Navigator.of(context).pop(),
-                  isConfirmEnabled: true,
+              isConfirmEnabled: selectedAutomationActionExecutor != null,
               dialogWidth: 400,
             ),
           ],
         ),
       ),
     );
-      },
-    );
   }
 }

lib/pages/routiens/widgets/routine_dialogs/discard_dialog.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -49,11 +48,11 @@ class DiscardDialog {
         onConfirm: () {
           context.read<RoutineBloc>().add(ResetRoutineState());
           Navigator.pop(context);
-          BlocProvider.of<SwitchTabsBloc>(context).add(
+          BlocProvider.of<RoutineBloc>(context).add(
-            const CreateNewRoutineViewEvent(false),
+            const CreateNewRoutineViewEvent(createRoutineView: false),
           );
-          BlocProvider.of<SwitchTabsBloc>(context).add(
+          BlocProvider.of<RoutineBloc>(context).add(
-            const TriggerSwitchTabsEvent(true),
+            const TriggerSwitchTabsEvent(isRoutineTab: true),
           );
         });
   }

lib/pages/routiens/widgets/routine_search_and_buttons.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/helper/save_routine_helper.dart';
 import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/discard_dialog.dart';
@@ -16,8 +15,7 @@ class RoutineSearchAndButtons extends StatefulWidget {
   });
 
   @override
-  State<RoutineSearchAndButtons> createState() =>
+  State<RoutineSearchAndButtons> createState() => _RoutineSearchAndButtonsState();
-      _RoutineSearchAndButtonsState();
 }
 
 class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
@@ -37,20 +35,21 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocConsumer<RoutineBloc, RoutineState>(
+    return BlocBuilder<RoutineBloc, RoutineState>(
-      listenWhen: (previous, current) =>
-          previous.routineName != current.routineName,
-      listener: (context, state) {
-        if (state.routineName != _nameController.text) {
-          _nameController.text = state.routineName ?? '';
-        }
-      },
       builder: (context, state) {
+        _nameController.text = state.routineName ?? '';
         return LayoutBuilder(
           builder: (BuildContext context, BoxConstraints constraints) {
             return Wrap(
               runSpacing: 16,
               children: [
+                Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Text(
+                    state.errorMessage ?? '',
+                    style: const TextStyle(color: Colors.red),
+                  ),
+                ),
                 Row(
                   crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
@@ -62,9 +61,8 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                         children: [
                           ConstrainedBox(
                             constraints: BoxConstraints(
-                                maxWidth: constraints.maxWidth > 700
+                                maxWidth:
-                                    ? 450
+                                    constraints.maxWidth > 700 ? 450 : constraints.maxWidth - 32),
-                                    : constraints.maxWidth - 32),
                             child: Column(
                               mainAxisAlignment: MainAxisAlignment.start,
                               crossAxisAlignment: CrossAxisAlignment.start,
@@ -73,13 +71,10 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                                   children: [
                                     Text('* ',
                                         style: context.textTheme.bodyMedium!
-                                            .copyWith(
+                                            .copyWith(color: ColorsManager.red, fontSize: 13)),
-                                                color: ColorsManager.red,
-                                                fontSize: 13)),
                                     Text(
                                       'Routine Name',
-                                      style: context.textTheme.bodyMedium!
+                                      style: context.textTheme.bodyMedium!.copyWith(
-                                          .copyWith(
                                         fontSize: 13,
                                         fontWeight: FontWeight.w600,
                                         color: ColorsManager.blackColor,
@@ -93,24 +88,20 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                                   decoration: containerWhiteDecoration,
                                   child: TextFormField(
                                     style: context.textTheme.bodyMedium!
-                                        .copyWith(
+                                        .copyWith(color: ColorsManager.blackColor),
-                                            color: ColorsManager.blackColor),
                                     controller: _nameController,
                                     decoration: InputDecoration(
                                       hintText: 'Please enter the name',
                                       hintStyle: context.textTheme.bodyMedium!
-                                          .copyWith(
+                                          .copyWith(fontSize: 12, color: ColorsManager.grayColor),
-                                              fontSize: 12,
-                                              color: ColorsManager.grayColor),
                                       contentPadding:
-                                          const EdgeInsets.symmetric(
+                                          const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
-                                              horizontal: 12, vertical: 10),
                                       border: InputBorder.none,
                                     ),
-                                    onChanged: (value) {
+                                    onTapOutside: (_) {
                                       context
                                           .read<RoutineBloc>()
-                                          .add(SetRoutineName(value));
+                                          .add(SetRoutineName(_nameController.text));
                                     },
                                     validator: (value) {
                                       if (value == null || value.isEmpty) {
@@ -130,18 +121,16 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                                   width: 200,
                                   child: Center(
                                     child: DefaultButton(
-                                      onPressed: state.isAutomation ||
+                                      onPressed: state.isAutomation || state.isTabToRun
-                                              state.isTabToRun
                                           ? () async {
-                                              final result = await SettingHelper
+                                              final result = await SettingHelper.showSettingDialog(
-                                                  .showSettingDialog(
                                                 context: context,
-                                                iconId:
+                                                iconId: state.selectedIcon ?? '',
-                                                    state.selectedIcon ?? '',
                                               );
                                               if (result != null) {
-                                                context.read<RoutineBloc>().add(
+                                                context
-                                                    AddSelectedIcon(result));
+                                                    .read<RoutineBloc>()
+                                                    .add(AddSelectedIcon(result));
                                               }
                                             }
                                           : null,
@@ -197,12 +186,10 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                             child: Center(
                               child: DefaultButton(
                                 onPressed: () async {
-                                  if (state.routineName == null ||
+                                  if (state.routineName == null || state.routineName!.isEmpty) {
-                                      state.routineName!.isEmpty) {
                                     ScaffoldMessenger.of(context).showSnackBar(
                                       SnackBar(
-                                        content: const Text(
+                                        content: const Text('Please enter the routine name'),
-                                            'Please enter the routine name'),
                                         duration: const Duration(seconds: 2),
                                         backgroundColor: ColorsManager.red,
                                         action: SnackBarAction(
@@ -216,12 +203,10 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                                     return;
                                   }
 
-                                  if (state.ifItems.isEmpty ||
+                                  if (state.ifItems.isEmpty || state.thenItems.isEmpty) {
-                                      state.thenItems.isEmpty) {
                                     ScaffoldMessenger.of(context).showSnackBar(
                                       SnackBar(
-                                        content: const Text(
+                                        content: const Text('Please add if and then condition'),
-                                            'Please add if and then condition'),
                                         duration: const Duration(seconds: 2),
                                         backgroundColor: ColorsManager.red,
                                         action: SnackBarAction(
@@ -234,18 +219,18 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                                     );
                                     return;
                                   }
-                                  final result = await SaveRoutineHelper
+                                  // final result =
-                                      .showSaveRoutineDialog(context);
+                                  // await
-                                  if (result != null && result) {
+                                  BlocProvider.of<RoutineBloc>(context).add(ResetErrorMessage());
-                                    BlocProvider.of<SwitchTabsBloc>(context)
+                                  SaveRoutineHelper.showSaveRoutineDialog(context);
-                                        .add(
+                                  // if (result != null && result) {
-                                      const CreateNewRoutineViewEvent(false),
+                                  //   BlocProvider.of<RoutineBloc>(context).add(
-                                    );
+                                  //     const CreateNewRoutineViewEvent(createRoutineView: false),
-                                    BlocProvider.of<SwitchTabsBloc>(context)
+                                  //   );
-                                        .add(
+                                  //   BlocProvider.of<RoutineBloc>(context).add(
-                                      const TriggerSwitchTabsEvent(true),
+                                  //     const TriggerSwitchTabsEvent(isRoutineTab: true),
-                                    );
+                                  //   );
-                                  }
+                                  // }
                                 },
                                 borderRadius: 15,
                                 elevation: 0,
@@ -276,14 +261,10 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                           child: DefaultButton(
                             onPressed: state.isAutomation || state.isTabToRun
                                 ? () async {
-                                    final result =
+                                    final result = await SettingHelper.showSettingDialog(
-                                        await SettingHelper.showSettingDialog(
+                                        context: context, iconId: state.selectedIcon ?? '');
-                                            context: context,
-                                            iconId: state.selectedIcon ?? '');
                                     if (result != null) {
-                                      context
+                                      context.read<RoutineBloc>().add(AddSelectedIcon(result));
-                                          .read<RoutineBloc>()
-                                          .add(AddSelectedIcon(result));
                                     }
                                   }
                                 : null,
@@ -333,12 +314,10 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                         child: Center(
                           child: DefaultButton(
                             onPressed: () async {
-                              if (state.routineName == null ||
+                              if (state.routineName == null || state.routineName!.isEmpty) {
-                                  state.routineName!.isEmpty) {
                                 ScaffoldMessenger.of(context).showSnackBar(
                                   SnackBar(
-                                    content: const Text(
+                                    content: const Text('Please enter the routine name'),
-                                        'Please enter the routine name'),
                                     duration: const Duration(seconds: 2),
                                     backgroundColor: ColorsManager.red,
                                     action: SnackBarAction(
@@ -352,12 +331,10 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                                 return;
                               }
 
-                              if (state.ifItems.isEmpty ||
+                              if (state.ifItems.isEmpty || state.thenItems.isEmpty) {
-                                  state.thenItems.isEmpty) {
                                 ScaffoldMessenger.of(context).showSnackBar(
                                   SnackBar(
-                                    content: const Text(
+                                    content: const Text('Please add if and then condition'),
-                                        'Please add if and then condition'),
                                     duration: const Duration(seconds: 2),
                                     backgroundColor: ColorsManager.red,
                                     action: SnackBarAction(
@@ -370,17 +347,18 @@ class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
                                 );
                                 return;
                               }
-                              final result =
+                              // final result =
-                                  await SaveRoutineHelper.showSaveRoutineDialog(
+                              // await
-                                      context);
+                              BlocProvider.of<RoutineBloc>(context).add(ResetErrorMessage());
-                              if (result != null && result) {
+                              SaveRoutineHelper.showSaveRoutineDialog(context);
-                                BlocProvider.of<SwitchTabsBloc>(context).add(
+                              // if (result != null && result) {
-                                  const CreateNewRoutineViewEvent(false),
+                              //   BlocProvider.of<RoutineBloc>(context).add(
-                                );
+                              //     const CreateNewRoutineViewEvent(createRoutineView: false),
-                                BlocProvider.of<SwitchTabsBloc>(context).add(
+                              //   );
-                                  const TriggerSwitchTabsEvent(true),
+                              //   BlocProvider.of<RoutineBloc>(context).add(
-                                );
+                              //     const TriggerSwitchTabsEvent(isRoutineTab: true),
-                              }
+                              //   );
+                              // }
                             },
                             borderRadius: 15,
                             elevation: 0,

lib/pages/routiens/widgets/then_container.dart

@@ -26,9 +26,7 @@ class ThenContainer extends StatelessWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    const Text('THEN',
+                    const Text('THEN', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
-                        style: TextStyle(
-                            fontSize: 18, fontWeight: FontWeight.bold)),
                     const SizedBox(height: 16),
                     state.isLoading && state.isUpdate == true
                         ? const Center(
@@ -41,17 +39,12 @@ class ThenContainer extends StatelessWidget {
                                 state.thenItems.length,
                                 (index) => GestureDetector(
                                       onTap: () async {
-                                        if (state.thenItems[index]
+                                        if (state.thenItems[index]['deviceId'] == 'delay') {
-                                                ['deviceId'] ==
+                                          final result = await DelayHelper.showDelayPickerDialog(
-                                            'delay') {
+                                              context, state.thenItems[index]);
-                                          final result = await DelayHelper
-                                              .showDelayPickerDialog(context,
-                                                  state.thenItems[index]);
 
                                           if (result != null) {
-                                            context
+                                            context.read<RoutineBloc>().add(AddToThenContainer({
-                                                .read<RoutineBloc>()
-                                                .add(AddToThenContainer({
                                                   ...state.thenItems[index],
                                                   'imagePath': Assets.delay,
                                                   'title': 'Delay',
@@ -60,76 +53,58 @@ class ThenContainer extends StatelessWidget {
                                           return;
                                         }
 
-                                        if (state.thenItems[index]['type'] ==
+                                        if (state.thenItems[index]['type'] == 'automation') {
-                                            'automation') {
                                           final result = await showDialog<bool>(
                                             context: context,
-                                            builder: (BuildContext context) =>
+                                            builder: (BuildContext context) => AutomationDialog(
-                                                AutomationDialog(
                                               automationName:
-                                                  state.thenItems[index]
+                                                  state.thenItems[index]['name'] ?? 'Automation',
-                                                          ['name'] ??
-                                                      'Automation',
                                               automationId:
-                                                  state.thenItems[index]
+                                                  state.thenItems[index]['deviceId'] ?? '',
-                                                          ['deviceId'] ??
+                                              uniqueCustomId: state.thenItems[index]
-                                                      '',
-                                              uniqueCustomId:
-                                                  state.thenItems[index]
                                                   ['uniqueCustomId'],
                                             ),
                                           );
 
                                           if (result != null) {
-                                            context
+                                            context.read<RoutineBloc>().add(AddToThenContainer({
-                                                .read<RoutineBloc>()
-                                                .add(AddToThenContainer({
                                                   ...state.thenItems[index],
-                                                  'imagePath':
+                                                  'imagePath': Assets.automation,
-                                                      Assets.automation,
+                                                  'title': state.thenItems[index]['name'] ??
-                                                  'title': state
+                                                      state.thenItems[index]['title'],
-                                                      .thenItems[index]['name'],
                                                 }));
                                           }
                                           return;
                                         }
 
-                                        final result = await DeviceDialogHelper
+                                        final result = await DeviceDialogHelper.showDeviceDialog(
-                                            .showDeviceDialog(
                                             context, state.thenItems[index],
                                             removeComparetors: true);
 
                                         if (result != null) {
-                                          context.read<RoutineBloc>().add(
+                                          context
-                                              AddToThenContainer(
+                                              .read<RoutineBloc>()
-                                                  state.thenItems[index]));
+                                              .add(AddToThenContainer(state.thenItems[index]));
                                         } else if (!['AC', '1G', '2G', '3G']
-                                            .contains(state.thenItems[index]
+                                            .contains(state.thenItems[index]['productType'])) {
-                                                ['productType'])) {
+                                          context
-                                          context.read<RoutineBloc>().add(
+                                              .read<RoutineBloc>()
-                                              AddToThenContainer(
+                                              .add(AddToThenContainer(state.thenItems[index]));
-                                                  state.thenItems[index]));
                                         }
                                       },
                                       child: DraggableCard(
-                                        imagePath: state.thenItems[index]
+                                        imagePath: state.thenItems[index]['imagePath'] ?? '',
-                                                ['imagePath'] ??
+                                        title: state.thenItems[index]['title'] ?? '',
-                                            '',
-                                        title: state.thenItems[index]
-                                                ['title'] ??
-                                            '',
                                         deviceData: state.thenItems[index],
-                                        padding: const EdgeInsets.symmetric(
+                                        padding:
-                                            horizontal: 4, vertical: 8),
+                                            const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
                                         isFromThen: true,
                                         isFromIf: false,
                                         onRemove: () {
-                                          context.read<RoutineBloc>().add(
+                                          context.read<RoutineBloc>().add(RemoveDragCard(
-                                              RemoveDragCard(
                                               index: index,
                                               isFromThen: true,
-                                                  key: state.thenItems[index]
+                                              key: state.thenItems[index]['uniqueCustomId']));
-                                                      ['uniqueCustomId']));
                                         },
                                       ),
                                     ))),
@@ -148,7 +123,18 @@ class ThenContainer extends StatelessWidget {
               return;
             }
 
+            if (state.automationId == mutableData['deviceId'] ||
+                state.sceneId == mutableData['deviceId']) {
+              return;
+            }
+
             if (mutableData['type'] == 'automation') {
+              int index =
+                  state.thenItems.indexWhere((item) => item['deviceId'] == mutableData['deviceId']);
+              if (index != -1) {
+                return;
+              }
+
               final result = await showDialog<bool>(
                 context: context,
                 builder: (BuildContext context) => AutomationDialog(
@@ -169,9 +155,14 @@ class ThenContainer extends StatelessWidget {
             }
 
             if (mutableData['type'] == 'tap_to_run' && state.isAutomation) {
+              int index =
+                  state.thenItems.indexWhere((item) => item['deviceId'] == mutableData['deviceId']);
+              if (index != -1) {
+                return;
+              }
               context.read<RoutineBloc>().add(AddToThenContainer({
                     ...mutableData,
-                    'imagePath': Assets.logo,
+                    'imagePath': mutableData['imagePath'] ?? Assets.logo,
                     'title': mutableData['name'],
                   }));
 
@@ -183,8 +174,7 @@ class ThenContainer extends StatelessWidget {
             }
 
             if (mutableData['deviceId'] == 'delay') {
-              final result =
+              final result = await DelayHelper.showDelayPickerDialog(context, mutableData);
-                  await DelayHelper.showDelayPickerDialog(context, mutableData);
 
               if (result != null) {
                 context.read<RoutineBloc>().add(AddToThenContainer({
@@ -196,13 +186,11 @@ class ThenContainer extends StatelessWidget {
               return;
             }
 
-            final result = await DeviceDialogHelper.showDeviceDialog(
+            final result = await DeviceDialogHelper.showDeviceDialog(context, mutableData,
-                context, mutableData,
                 removeComparetors: true);
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
-            } else if (!['AC', '1G', '2G', '3G']
+            } else if (!['AC', '1G', '2G', '3G'].contains(mutableData['productType'])) {
-                .contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }
           },

lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart

@@ -1,9 +1,9 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_state.dart';
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 

lib/pages/spaces_management/all_spaces/bloc/space_management_event.dart

@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart'; // Import for Offset
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart'; // Import for Offset
 
 abstract class SpaceManagementEvent extends Equatable {
   const SpaceManagementEvent();

lib/pages/spaces_management/all_spaces/bloc/space_management_state.dart

@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 abstract class SpaceManagementState extends Equatable {
   const SpaceManagementState();

lib/pages/spaces_management/all_spaces/model/community_model.dart

@@ -1,5 +1,5 @@
 import 'package:syncrow_web/pages/auth/model/region_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 class CommunityModel {
   final String uuid;

lib/pages/spaces_management/all_spaces/model/connection_model.dart

@@ -1,4 +1,4 @@
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 class Connection {
   final SpaceModel startSpace;

lib/pages/spaces_management/all_spaces/model/space_model.dart

@@ -1,7 +1,7 @@
 import 'dart:ui';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/connection_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:uuid/uuid.dart';
 

lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_state.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/loaded_space_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart';
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';

lib/pages/spaces_management/all_spaces/widgets/add_device_type_widget.dart

@@ -1,9 +1,9 @@
 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/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/counter_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/counter_widget.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';

lib/pages/spaces_management/all_spaces/widgets/blank_community_widget.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/dialogs/create_community_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class BlankCommunityWidget extends StatefulWidget {
@@ -72,7 +72,8 @@ class _BlankCommunityWidgetState extends State<BlankCommunityWidget> {
     showDialog(
       context: parentContext,
       builder: (context) => CreateCommunityDialog(
-        communities: widget.communities,
+        isEditMode: false,
+        existingCommunityNames:  widget.communities.map((community) => community.name).toList(),
         onCreateCommunity: (String communityName, String description) {
           parentContext.read<SpaceManagementBloc>().add(
                 CreateCommunityEvent(
@@ -84,4 +85,5 @@ class _BlankCommunityWidgetState extends State<BlankCommunityWidget> {
       ),
     );
   }
+
 }

lib/pages/spaces_management/all_spaces/widgets/community_structure_header_widget.dart

@@ -1,10 +1,12 @@
 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/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-class CommunityStructureHeader extends StatelessWidget {
+class CommunityStructureHeader extends StatefulWidget {
   final String? communityName;
   final bool isEditingName;
   final bool isSave;
@@ -13,9 +15,11 @@ class CommunityStructureHeader extends StatelessWidget {
   final VoidCallback onDelete;
   final VoidCallback onEditName;
   final ValueChanged<String> onNameSubmitted;
+  final List<CommunityModel> communities;
+  final CommunityModel? community;
 
-  const CommunityStructureHeader({
+  const CommunityStructureHeader(
-    Key? key,
+      {super.key,
       required this.communityName,
       required this.isSave,
       required this.isEditingName,
@@ -24,8 +28,15 @@ class CommunityStructureHeader extends StatelessWidget {
       required this.onDelete,
       required this.onEditName,
       required this.onNameSubmitted,
-  }) : super(key: key);
+      this.community,
+      required this.communities});
 
+  @override
+  State<CommunityStructureHeader> createState() =>
+      _CommunityStructureHeaderState();
+}
+
+class _CommunityStructureHeaderState extends State<CommunityStructureHeader> {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -60,47 +71,63 @@ class CommunityStructureHeader extends StatelessWidget {
     );
   }
 
+  void _showCreateCommunityDialog(BuildContext parentContext) {
+    showDialog(
+      context: parentContext,
+      builder: (context) => CreateCommunityDialog(
+        isEditMode: true,
+        existingCommunityNames:
+            widget.communities.map((community) => community.name).toList(),
+        initialName: widget.community?.name ?? '',
+        onCreateCommunity: (String communityName, String description) {
+          widget.onNameSubmitted(communityName);
+        },
+      ),
+    );
+  }
+
   Widget _buildCommunityInfo(ThemeData theme, double screenWidth) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text(
           'Community Structure',
-          style: theme.textTheme.headlineLarge?.copyWith(color: ColorsManager.blackColor),
+          style: theme.textTheme.headlineLarge
+              ?.copyWith(color: ColorsManager.blackColor),
         ),
-        if (communityName != null)
+        if (widget.communityName != null)
           Row(
             children: [
               Expanded(
                 child: Row(
                   children: [
-                    if (!isEditingName)
+                    if (!widget.isEditingName)
                       Flexible(
                         child: Text(
-                          communityName!,
+                          widget.communityName!,
-                          style:
+                          style: theme.textTheme.bodyLarge
-                              theme.textTheme.bodyLarge?.copyWith(color: ColorsManager.blackColor),
+                              ?.copyWith(color: ColorsManager.blackColor),
                           overflow: TextOverflow.ellipsis,
                           maxLines: 1,
                         ),
                       ),
-                    if (isEditingName)
+                    if (widget.isEditingName)
                       SizedBox(
                         width: screenWidth * 0.1,
                         child: TextField(
-                          controller: nameController,
+                          controller: widget.nameController,
                           decoration: const InputDecoration(
                             border: InputBorder.none,
                             isDense: true,
                           ),
-                          style:
+                          style: theme.textTheme.bodyLarge
-                              theme.textTheme.bodyLarge?.copyWith(color: ColorsManager.blackColor),
+                              ?.copyWith(color: ColorsManager.blackColor),
-                          onSubmitted: onNameSubmitted,
+                          onSubmitted: widget.onNameSubmitted,
                         ),
                       ),
                     const SizedBox(width: 2),
                     GestureDetector(
-                      onTap: onEditName,
+                      onTap: () => _showCreateCommunityDialog(context),
                       child: SvgPicture.asset(
                         Assets.iconEdit,
                         width: 16,
@@ -110,7 +137,7 @@ class CommunityStructureHeader extends StatelessWidget {
                   ],
                 ),
               ),
-              if (isSave) ...[
+              if (widget.isSave) ...[
                 const SizedBox(width: 8),
                 _buildActionButtons(theme),
               ],
@@ -127,8 +154,9 @@ class CommunityStructureHeader extends StatelessWidget {
       children: [
         _buildButton(
             label: "Save",
-            icon: const Icon(Icons.save, size: 18, color: ColorsManager.spaceColor),
+            icon: const Icon(Icons.save,
-            onPressed: onSave,
+                size: 18, color: ColorsManager.spaceColor),
+            onPressed: widget.onSave,
             theme: theme),
       ],
     );
@@ -159,7 +187,8 @@ class CommunityStructureHeader extends StatelessWidget {
             Flexible(
               child: Text(
                 label,
-                style: theme.textTheme.bodySmall?.copyWith(color: ColorsManager.blackColor),
+                style: theme.textTheme.bodySmall
+                    ?.copyWith(color: ColorsManager.blackColor),
                 overflow: TextOverflow.ellipsis,
                 maxLines: 1,
               ),

lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart

@@ -4,19 +4,19 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 
 // Syncrow project imports
 import 'package:syncrow_web/pages/common/buttons/add_space_button.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/connection_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/blank_community_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/blank_community_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/community_structure_header_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_header_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/dialogs/create_space_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/curved_line_painter.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_line_painter.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/space_card_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_card_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/space_container_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_container_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CommunityStructureArea extends StatefulWidget {
@@ -119,7 +119,9 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             CommunityStructureHeader(
+              communities: widget.communities,
               communityName: widget.selectedCommunity?.name,
+              community: widget.selectedCommunity,
               isSave: isSave(spaces),
               isEditingName: isEditingName,
               nameController: _nameController,

lib/pages/spaces_management/all_spaces/widgets/curved_line_painter.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/connection_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CurvedLinePainter extends CustomPainter {

lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/add_device_type_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/add_device_type_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/dialogs/icon_selection_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/icon_selection_dialog.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/hoverable_button.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/hoverable_button.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/space_icon_const.dart';

lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/community_structure_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/gradient_canvas_border_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/gradient_canvas_border_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/sidebar_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart';
 
 class LoadedSpaceView extends StatefulWidget {
   final List<CommunityModel> communities;

lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/common/search_bar.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/community_tile.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_tile.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/space_tile_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/style.dart';

lib/pages/spaces_management/create_community/bloc/community_dialog_bloc.dart

@@ -0,0 +1,21 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'community_dialog_event.dart';
+import 'community_dialog_state.dart';
+
+class CommunityDialogBloc extends Bloc<CommunityDialogEvent, CommunityDialogState> {
+  final List<String> existingCommunityNames;
+
+  CommunityDialogBloc(this.existingCommunityNames)
+      : super(CommunityDialogInitial()) {
+    on<ValidateCommunityNameEvent>((event, emit) {
+      final trimmedName = event.name.trim();
+      final isNameValid = !existingCommunityNames.contains(trimmedName);
+      final isNameEmpty = trimmedName.isEmpty;
+
+      emit(CommunityNameValidationState(
+        isNameValid: isNameValid,
+        isNameEmpty: isNameEmpty,
+      ));
+    });
+  }
+}

lib/pages/spaces_management/create_community/bloc/community_dialog_event.dart

@@ -0,0 +1,15 @@
+import 'package:equatable/equatable.dart';
+
+abstract class CommunityDialogEvent extends Equatable {
+  @override
+  List<Object?> get props => [];
+}
+
+class ValidateCommunityNameEvent extends CommunityDialogEvent {
+  final String name;
+
+  ValidateCommunityNameEvent(this.name);
+
+  @override
+  List<Object?> get props => [name];
+}

lib/pages/spaces_management/create_community/bloc/community_dialog_state.dart

@@ -0,0 +1,21 @@
+import 'package:equatable/equatable.dart';
+
+abstract class CommunityDialogState extends Equatable {
+  @override
+  List<Object?> get props => [];
+}
+
+class CommunityDialogInitial extends CommunityDialogState {}
+
+class CommunityNameValidationState extends CommunityDialogState {
+  final bool isNameValid;
+  final bool isNameEmpty;
+
+  CommunityNameValidationState({
+    required this.isNameValid,
+    required this.isNameEmpty,
+  });
+
+  @override
+  List<Object?> get props => [isNameValid, isNameEmpty];
+}

lib/pages/spaces_management/create_community/view/create_community_dialog.dart

@@ -0,0 +1,170 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/bloc/community_dialog_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/bloc/community_dialog_event.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/bloc/community_dialog_state.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
+import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+
+class CreateCommunityDialog extends StatelessWidget {
+  final Function(String name, String description) onCreateCommunity;
+  final List<String> existingCommunityNames;
+  final bool isEditMode;
+  final String? initialName;
+
+  const CreateCommunityDialog({
+    super.key,
+    required this.onCreateCommunity,
+    required this.existingCommunityNames,
+    required this.isEditMode,
+    this.initialName,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final nameController =
+        TextEditingController(text: isEditMode ? initialName : '');
+
+    return BlocProvider(
+      create: (_) => CommunityDialogBloc(existingCommunityNames),
+      child: Dialog(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
+        backgroundColor: ColorsManager.transparentColor,
+        child: Stack(
+          children: [
+            Container(
+              width: MediaQuery.of(context).size.width * 0.3,
+              padding: const EdgeInsets.all(20),
+              decoration: BoxDecoration(
+                color: ColorsManager.whiteColors,
+                borderRadius: BorderRadius.circular(20),
+                boxShadow: [
+                  BoxShadow(
+                    color: ColorsManager.blackColor.withOpacity(0.25),
+                    blurRadius: 20,
+                    spreadRadius: 5,
+                    offset: const Offset(0, 5),
+                  ),
+                ],
+              ),
+              child: SingleChildScrollView(
+                child: BlocBuilder<CommunityDialogBloc, CommunityDialogState>(
+                  builder: (context, state) {
+                    bool isNameValid = true;
+                    bool isNameEmpty = false;
+
+                    if (state is CommunityNameValidationState) {
+                      isNameValid = state.isNameValid;
+                      isNameEmpty = state.isNameEmpty;
+                    }
+
+                    return Column(
+                      mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          isEditMode ? 'Edit Community Name' : 'Community Name',
+                          style: Theme.of(context).textTheme.headlineMedium,
+                        ),
+                        const SizedBox(height: 18),
+                        TextField(
+                          controller: nameController,
+                          onChanged: (value) {
+                            context
+                                .read<CommunityDialogBloc>()
+                                .add(ValidateCommunityNameEvent(value));
+                          },
+                          style: const TextStyle(
+                            color: ColorsManager.blackColor,
+                          ),
+                          decoration: InputDecoration(
+                            hintText: 'Please enter the community name',
+                            filled: true,
+                            fillColor: ColorsManager.boxColor,
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: isNameValid && !isNameEmpty
+                                    ? ColorsManager.boxColor
+                                    : ColorsManager.red,
+                                width: 1,
+                              ),
+                              borderRadius: BorderRadius.circular(10),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(10),
+                              borderSide: const BorderSide(
+                                color: ColorsManager.boxColor,
+                                width: 1.5,
+                              ),
+                            ),
+                          ),
+                        ),
+                        if (!isNameValid)
+                          Padding(
+                            padding: const EdgeInsets.only(top: 8.0),
+                            child: Text(
+                              '*Name already exists.',
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodySmall
+                                  ?.copyWith(color: ColorsManager.red),
+                            ),
+                          ),
+                        if (isNameEmpty)
+                          Padding(
+                            padding: const EdgeInsets.only(top: 8.0),
+                            child: Text(
+                              '*Name should not be empty.',
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodySmall
+                                  ?.copyWith(color: ColorsManager.red),
+                            ),
+                          ),
+                        const SizedBox(height: 24),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Expanded(
+                              child: CancelButton(
+                                label: 'Cancel',
+                                onPressed: () => Navigator.of(context).pop(),
+                              ),
+                            ),
+                            const SizedBox(width: 16),
+                            Expanded(
+                              child: DefaultButton(
+                                onPressed: () {
+                                  if (isNameValid && !isNameEmpty) {
+                                    onCreateCommunity(
+                                      nameController.text.trim(),
+                                      "",
+                                    );
+                                    Navigator.of(context).pop();
+                                  }
+                                },
+                                backgroundColor: isNameValid && !isNameEmpty
+                                    ? ColorsManager.secondaryColor
+                                    : ColorsManager.lightGrayColor,
+                                borderRadius: 10,
+                                foregroundColor: ColorsManager.whiteColors,
+                                child: const Text('OK'),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ],
+                    );
+                  },
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/spaces_management/widgets/dialogs/create_community_dialog.dart

@@ -1,177 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class CreateCommunityDialog extends StatefulWidget {
-  final Function(String name, String description) onCreateCommunity;
-  final List<CommunityModel> communities;
-
-  const CreateCommunityDialog(
-      {super.key, required this.onCreateCommunity, required this.communities});
-
-  @override
-  CreateCommunityDialogState createState() => CreateCommunityDialogState();
-}
-
-class CreateCommunityDialogState extends State<CreateCommunityDialog> {
-  String enteredName = '';
-  bool isNameFieldExist = false;
-  bool isNameEmpty = false;
-
-  @override
-  Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
-
-    return Dialog(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      backgroundColor:
-          ColorsManager.transparentColor, // Transparent for shadow effect
-      child: Stack(
-        children: [
-          // Background container with shadow and rounded corners
-          Container(
-            width: screenWidth * 0.3,
-            padding: const EdgeInsets.all(20),
-            decoration: BoxDecoration(
-              color: ColorsManager.whiteColors,
-              borderRadius: BorderRadius.circular(20),
-              boxShadow: [
-                BoxShadow(
-                  color: ColorsManager.blackColor.withOpacity(0.25),
-                  blurRadius: 20,
-                  spreadRadius: 5,
-                  offset: const Offset(0, 5),
-                ),
-              ],
-            ),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const Text(
-                  'Community Name',
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 16),
-                // Input field for the community name
-                TextField(
-                  onChanged: (value) {
-                    setState(() {
-                      enteredName = value.trim();
-                      isNameFieldExist = widget.communities.any(
-                        (community) => community.name == enteredName,
-                      );
-                      if (value.isEmpty) {
-                        isNameEmpty = true;
-                      } else {
-                        isNameEmpty = false;
-                      }
-                    });
-                  },
-                  style: const TextStyle(
-                    color: ColorsManager.blackColor,
-                  ),
-                  decoration: InputDecoration(
-                    hintText: 'Please enter the community name',
-                    filled: true,
-                    fillColor: ColorsManager.boxColor,
-                    hintStyle: const TextStyle(
-                      fontSize: 14,
-                      color: ColorsManager.grayBorder,
-                      fontWeight: FontWeight.w400,
-                    ),
-                    border: OutlineInputBorder(
-                      borderSide: BorderSide(
-                          color: isNameFieldExist || isNameEmpty
-                              ? ColorsManager.red
-                              : ColorsManager.boxColor,
-                          width: 1),
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                    enabledBorder: OutlineInputBorder(
-                      borderSide: BorderSide(
-                          color: isNameFieldExist || isNameEmpty
-                              ? ColorsManager.red
-                              : ColorsManager.boxColor, width: 1),
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                    focusedBorder: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(10),
-                      borderSide: BorderSide(
-                          color: isNameFieldExist || isNameEmpty
-                              ? ColorsManager.red
-                              : ColorsManager.boxColor,
-                          width: 1),
-                    ),
-                  ),
-                ),
-                if (isNameFieldExist)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    child: Text(
-                      '*Name already exists.',
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall
-                          ?.copyWith(color: ColorsManager.red),
-                    ),
-                  ),
-                if (isNameEmpty)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    child: Text(
-                      '*Name should not be empty.',
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall
-                          ?.copyWith(color: ColorsManager.red),
-                    ),
-                  ),
-                const SizedBox(height: 24),
-                // Action buttons
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Expanded(
-                      child: CancelButton(
-                        label: 'Cancel',
-                        onPressed: () => Navigator.of(context).pop(),
-                      ),
-                    ),
-                    const SizedBox(width: 16),
-                    Expanded(
-                      child: DefaultButton(
-                        onPressed: () {
-                          if (enteredName.isNotEmpty && !isNameFieldExist) {
-                            widget.onCreateCommunity(
-                              enteredName,
-                              "",
-                            );
-                            Navigator.of(context).pop();
-                          }
-                        },
-                        backgroundColor: isNameFieldExist || isNameEmpty
-                            ? ColorsManager.lightGrayColor
-                            : ColorsManager.secondaryColor,
-                        borderRadius: 10,
-                        foregroundColor: ColorsManager.whiteColors,
-                        child: const Text('OK'),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

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<int?> sendOtp({required String email, required String regionUuid}) async {
+  static Future<int?> 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'];

lib/services/product_api.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 

lib/services/routines_api.dart

@@ -6,6 +6,7 @@ import 'package:syncrow_web/pages/routiens/models/routine_details_model.dart';
 import 'package:syncrow_web/pages/routiens/models/routine_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
 
 class SceneApi {
   static final HTTPService _httpService = HTTPService();
@@ -76,7 +77,8 @@ class SceneApi {
       final response = await _httpService.get(
         path: ApiEndpoints.getUnitScenes
             .replaceAll('{spaceUuid}', unitId)
-            .replaceAll('{communityUuid}', communityId),
+            .replaceAll('{communityUuid}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         queryParameters: {'showInHomePage': showInDevice},
         showServerMessage: false,
         expectedResponseModel: (json) {

lib/services/space_mana_api.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_response_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_response_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
 
 class CommunitySpaceManagementApi {
   // Community Management APIs
@@ -15,7 +16,8 @@ class CommunitySpaceManagementApi {
 
       while (hasNext) {
         await HTTPService().get(
-          path: ApiEndpoints.getCommunityList,
+          path: ApiEndpoints.getCommunityList
+              .replaceAll('{projectId}', TempConst.projectId),
           queryParameters: {'page': page},
           expectedResponseModel: (json) {
             List<dynamic> jsonData = json['data'];
@@ -59,7 +61,8 @@ class CommunitySpaceManagementApi {
       String name, String description) async {
     try {
       final response = await HTTPService().post(
-        path: ApiEndpoints.createCommunity,
+        path: ApiEndpoints.createCommunity
+            .replaceAll('{projectId}', TempConst.projectId),
         body: {
           'name': name,
           'description': description,
@@ -79,7 +82,8 @@ class CommunitySpaceManagementApi {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateCommunity
-            .replaceAll('{communityId}', communityId),
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         body: {
           'name': name,
         },
@@ -98,7 +102,8 @@ class CommunitySpaceManagementApi {
     try {
       final response = await HTTPService().delete(
         path: ApiEndpoints.deleteCommunity
-            .replaceAll('{communityId}', communityId),
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           return json['success'] ?? false;
         },
@@ -113,7 +118,9 @@ class CommunitySpaceManagementApi {
   Future<SpacesResponse> fetchSpaces(String communityId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.listSpaces.replaceAll('{communityId}', communityId),
+        path: ApiEndpoints.listSpaces
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           return SpacesResponse.fromJson(json);
         },
@@ -139,7 +146,8 @@ class CommunitySpaceManagementApi {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpace
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{spaceId}', spaceId),
+            .replaceAll('{spaceId}', spaceId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           return SpaceModel.fromJson(json);
         },
@@ -175,7 +183,9 @@ class CommunitySpaceManagementApi {
         body['parentUuid'] = parentId;
       }
       final response = await HTTPService().post(
-        path: ApiEndpoints.createSpace.replaceAll('{communityId}', communityId),
+        path: ApiEndpoints.createSpace
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         body: body,
         expectedResponseModel: (json) {
           return SpaceModel.fromJson(json['data']);
@@ -216,7 +226,8 @@ class CommunitySpaceManagementApi {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateSpace
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{spaceId}', spaceId),
+            .replaceAll('{spaceId}', spaceId)
+            .replaceAll('{projectId}', TempConst.projectId),
         body: body,
         expectedResponseModel: (json) {
           return SpaceModel.fromJson(json['data']);
@@ -234,7 +245,8 @@ class CommunitySpaceManagementApi {
       final response = await HTTPService().delete(
         path: ApiEndpoints.deleteSpace
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{spaceId}', spaceId),
+            .replaceAll('{spaceId}', spaceId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           return json['success'] ?? false;
         },
@@ -250,7 +262,8 @@ class CommunitySpaceManagementApi {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpaceHierarchy
-            .replaceAll('{communityId}', communityId),
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           final spaceModels = (json['data'] as List)
               .map((spaceJson) => SpaceModel.fromJson(spaceJson))

lib/utils/app_routes.dart

@@ -3,7 +3,7 @@ import 'package:syncrow_web/pages/access_management/view/access_management.dart'
 import 'package:syncrow_web/pages/auth/view/login_page.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/view/device_managment_page.dart';
 import 'package:syncrow_web/pages/home/view/home_page.dart';
-import 'package:syncrow_web/pages/spaces_management/view/spaces_management_page.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/view/spaces_management_page.dart';
 import 'package:syncrow_web/pages/visitor_password/view/visitor_password_dialog.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
 
@@ -32,7 +32,7 @@ class AppRoutes {
       ),
       GoRoute(
           path: RoutesConst.spacesManagementPage,
-          builder: (context, state) =>  SpaceManagementPage()),
+          builder: (context, state) =>  const SpaceManagementPage()),
     ];
   }
 }

lib/utils/constants/api_const.dart

@@ -36,21 +36,21 @@ abstract class ApiEndpoints {
   static const String getDeviceLogs = '/device/report-logs/{uuid}?code={code}';
 
 // Space Module
-  static const String createSpace = '/communities/{communityId}/spaces';
+  static const String createSpace = '/projects/{projectId}/communities/{communityId}/spaces';
-  static const String listSpaces = '/communities/{communityId}/spaces';
+  static const String listSpaces = '/projects/{projectId}/communities/{communityId}/spaces';
-  static const String deleteSpace = '/communities/{communityId}/spaces/{spaceId}';
+  static const String deleteSpace = '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
-  static const String updateSpace = '/communities/{communityId}/spaces/{spaceId}';
+  static const String updateSpace = '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
-  static const String getSpace = '/communities/{communityId}/spaces/{spaceId}';
+  static const String getSpace = '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
-  static const String getSpaceHierarchy = '/communities/{communityId}/spaces';
+  static const String getSpaceHierarchy = '/projects/{projectId}/communities/{communityId}/spaces';
 
 // Community Module
-  static const String createCommunity = '/communities';
+  static const String createCommunity = '/projects/{projectId}/communities';
-  static const String getCommunityList = '/communities';
+  static const String getCommunityList = '/projects/{projectId}/communities';
-  static const String getCommunityById = '/communities/{communityId}';
+  static const String getCommunityById = '/projects/{projectId}/communities/{communityId}';
-  static const String updateCommunity = '/communities/{communityId}';
+  static const String updateCommunity = '/projects/{projectId}/communities/{communityId}';
-  static const String deleteCommunity = '/communities/{communityId}';
+  static const String deleteCommunity = '/projects/{projectId}communities/{communityId}';
-  static const String getUserCommunities = '/communities/user/{userUuid}';
+  static const String getUserCommunities = '/projects/{projectId}/communities/user/{userUuid}';
-  static const String createUserCommunity = '/communities/user';
+  static const String createUserCommunity = '/projects/{projectId}/communities/user';
   static const String getDeviceLogsByDate =
       '/device/report-logs/{uuid}?code={code}&startTime={startTime}&endTime={endTime}';
 
@@ -68,7 +68,7 @@ abstract class ApiEndpoints {
   static const String getIconScene = '/scene/icon';
   static const String createScene = '/scene/tap-to-run';
   static const String createAutomation = '/automation';
-  static const String getUnitScenes = '/communities/{communityUuid}/spaces/{spaceUuid}/scenes';
+  static const String getUnitScenes = '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/scenes';
   static const String getAutomationDetails = '/automation/details/{automationId}';
   static const String getScene = '/scene/tap-to-run/{sceneId}';
   static const String deleteScene = '/scene/tap-to-run/{sceneId}';

lib/utils/constants/temp_const.dart

@@ -0,0 +1,3 @@
+class TempConst {
+  static const projectId = '0e62577c-06fa-41b9-8a92-99a21fbaf51c';
+}

lib/utils/snack_bar.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/navigation_service.dart';
 
 class CustomSnackBar {
@@ -11,6 +12,35 @@ class CustomSnackBar {
     }
   }
 
+  static redSnackBar(String message) {
+    final key = NavigationService.snackbarKey;
+    BuildContext? currentContext = key?.currentContext;
+    if (key != null && currentContext != null) {
+      final snackBar = SnackBar(
+        padding: const EdgeInsets.all(16),
+        backgroundColor: ColorsManager.red,
+        content: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+          const Icon(
+            Icons.check_circle,
+            color: ColorsManager.whiteColors,
+            size: 32,
+          ),
+          const SizedBox(
+            width: 8,
+          ),
+          Text(
+            message,
+            style: Theme.of(currentContext)
+                .textTheme
+                .bodySmall!
+                .copyWith(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.green),
+          )
+        ]),
+      );
+      key.currentState?.showSnackBar(snackBar);
+    }
+  }
+
   static greenSnackBar(String message) {
     final key = NavigationService.snackbarKey;
     BuildContext? currentContext = key?.currentContext;
@@ -29,8 +59,10 @@ class CustomSnackBar {
           ),
           Text(
             message,
-            style: Theme.of(currentContext).textTheme.bodySmall!.copyWith(
+            style: Theme.of(currentContext)
-                fontSize: 14, fontWeight: FontWeight.w500, color: Colors.green),
+                .textTheme
+                .bodySmall!
+                .copyWith(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.green),
           )
         ]),
       );

lib/utils/user_drop_down_menu.dart

@@ -75,26 +75,26 @@ class _UserDropdownMenuState extends State<UserDropdownMenu> {
         ),
       ),
       items: <PopupMenuEntry>[
-        PopupMenuItem(
+        // PopupMenuItem(
-          onTap: () {},
+        //   onTap: () {},
-          child: ListTile(
+        //   child: ListTile(
-            leading: SvgPicture.asset(Assets.accountSetting),
+        //     leading: SvgPicture.asset(Assets.accountSetting),
-            title: Text(
+        //     title: Text(
-              "Account Settings",
+        //       "Account Settings",
-              style: context.textTheme.bodyMedium,
+        //       style: context.textTheme.bodyMedium,
-            ),
+        //     ),
-          ),
+        //   ),
-        ),
+        // ),
-        PopupMenuItem(
+        // PopupMenuItem(
-          onTap: () {},
+        //   onTap: () {},
-          child: ListTile(
+        //   child: ListTile(
-            leading: SvgPicture.asset(Assets.settings),
+        //     leading: SvgPicture.asset(Assets.settings),
-            title: Text(
+        //     title: Text(
-              "Settings",
+        //       "Settings",
-              style: context.textTheme.bodyMedium,
+        //       style: context.textTheme.bodyMedium,
-            ),
+        //     ),
-          ),
+        //   ),
-        ),
+        // ),
         PopupMenuItem(
           onTap: () {
             showDialog(
@@ -211,8 +211,10 @@ class _UserDropdownMenuState extends State<UserDropdownMenu> {
                             elevation: 1,
                             child: Text(
                               'Logout',
-                              style:
+                              style: Theme.of(context)
-                                  Theme.of(context).textTheme.bodyMedium!.copyWith(fontSize: 12, color: Colors.white),
+                                  .textTheme
+                                  .bodyMedium!
+                                  .copyWith(fontSize: 12, color: Colors.white),
                             ),
                           ),
                         ),