removed print

lib/common/search_bar.dart

@@ -46,13 +46,14 @@ class CustomSearchBar extends StatelessWidget {
             filled: true,
             fillColor: ColorsManager.textFieldGreyColor,
             hintText: hintText,
-            hintStyle: Theme.of(context).textTheme.bodyLarge!.copyWith(
+            hintStyle: TextStyle(
-                  color: ColorsManager.lightGrayColor,
+              color: Color(0xB2999999),
-                  fontSize: 12,
+              fontSize: 12,
-                  fontWeight: FontWeight.w400,
+              fontFamily: 'Aftika',
-                  height: 0,
+              fontWeight: FontWeight.w400,
-                  letterSpacing: -0.24,
+              height: 0,
-                ),
+              letterSpacing: -0.24,
+            ),
             suffixIcon: Padding(
               padding: const EdgeInsets.only(right: 16),
               child: SvgPicture.asset(

lib/common/widgets/spaces_side_tree.dart

@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-
-class SpacesSideTree extends StatefulWidget {
-  final List<CommunityModel> communities;
-  final String? selectedSpaceUuid;
-  const SpacesSideTree({
-    super.key,
-    required this.communities,
-    this.selectedSpaceUuid,
-  });
-
-  @override
-  State<SpacesSideTree> createState() => _SpacesSideTreeState();
-}
-
-class _SpacesSideTreeState extends State<SpacesSideTree> {
-  String _searchQuery = '';
-  String? _selectedSpaceUuid;
-  String? _selectedId;
-  @override
-  Widget build(BuildContext context) {
-    return const Placeholder();
-  }
-}

lib/main.dart

@@ -6,9 +6,7 @@ import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
@@ -17,7 +15,8 @@ import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'development');
+    const environment =
+        String.fromEnvironment('FLAVOR', defaultValue: 'development');
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     initialSetup();
@@ -49,16 +48,14 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(
+              create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
           BlocProvider<RoutineBloc>(
             create: (context) => RoutineBloc(),
           ),
-          BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
-          ),
         ],
         child: MaterialApp.router(
           debugShowCheckedModeBanner: false,

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,8 +48,7 @@ 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(
@@ -87,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));
       }
     });
   }
@@ -98,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(
@@ -115,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());
     }
@@ -130,9 +125,7 @@ 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  /////////////////////////////////////
@@ -168,23 +161,15 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
             password: event.password,
           ),
         );
-      } on DioException catch (e) {
+      } catch (failure) {
-        final errorData = e.response!.data;
+        validate = 'Invalid Credentials!';
-        String errorMessage = errorData['error']['message'];
-        if (errorMessage == "Access denied for web platform") {
-          validate = errorMessage;
-        } else {
-          validate = 'Invalid Credentials!';
-        }
         emit(LoginInitial());
         return;
       }
 
-
       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());
@@ -342,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';
@@ -402,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(':');

lib/pages/auth/model/login_with_email_model.dart

@@ -21,9 +21,7 @@ class LoginWithEmailModel {
     return {
       'email': email,
       'password': password,
-      "platform": "web"
       // 'regionUuid': regionUuid,
     };
   }
 }
-//tst@tst.com

lib/pages/auth/model/user_model.dart

@@ -10,10 +10,6 @@ class UserModel {
   final String? phoneNumber;
   final bool? isEmailVerified;
   final bool? isAgreementAccepted;
-  final bool? hasAcceptedWebAgreement;
-  final DateTime? webAgreementAcceptedAt;
-  final UserRole? role;
-
   UserModel({
     required this.uuid,
     required this.email,
@@ -23,9 +19,6 @@ class UserModel {
     required this.phoneNumber,
     required this.isEmailVerified,
     required this.isAgreementAccepted,
-    required this.hasAcceptedWebAgreement,
-    required this.webAgreementAcceptedAt,
-    required this.role,
   });
 
   factory UserModel.fromJson(Map<String, dynamic> json) {
@@ -38,11 +31,6 @@ class UserModel {
       phoneNumber: json['phoneNumber'],
       isEmailVerified: json['isEmailVerified'],
       isAgreementAccepted: json['isAgreementAccepted'],
-      hasAcceptedWebAgreement: json['hasAcceptedWebAgreement'],
-      webAgreementAcceptedAt: json['webAgreementAcceptedAt'] != null
-          ? DateTime.parse(json['webAgreementAcceptedAt'])
-          : null,
-      role: json['role'] != null ? UserRole.fromJson(json['role']) : null,
     );
   }
 
@@ -53,9 +41,6 @@ class UserModel {
     Map<String, dynamic> tempJson = Token.decodeToken(token.accessToken);
 
     return UserModel(
-      hasAcceptedWebAgreement: null,
-      role: null,
-      webAgreementAcceptedAt: null,
       uuid: tempJson['uuid'].toString(),
       email: tempJson['email'],
       firstName: null,
@@ -80,26 +65,3 @@ class UserModel {
     };
   }
 }
-
-class UserRole {
-  final String uuid;
-  final DateTime createdAt;
-  final DateTime updatedAt;
-  final String type;
-
-  UserRole({
-    required this.uuid,
-    required this.createdAt,
-    required this.updatedAt,
-    required this.type,
-  });
-
-  factory UserRole.fromJson(Map<String, dynamic> json) {
-    return UserRole(
-      uuid: json['uuid'],
-      createdAt: DateTime.parse(json['createdAt']),
-      updatedAt: DateTime.parse(json['updatedAt']),
-      type: json['type'],
-    );
-  }
-}

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart

@@ -6,7 +6,8 @@ import 'package:syncrow_web/services/devices_mang_api.dart';
 part 'device_managment_event.dart';
 part 'device_managment_state.dart';
 
-class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementState> {
+class DeviceManagementBloc
+    extends Bloc<DeviceManagementEvent, DeviceManagementState> {
   int _selectedIndex = 0;
   List<AllDevicesModel> _devices = [];
   int _onlineCount = 0;
@@ -29,10 +30,11 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     on<UpdateSelection>(_onUpdateSelection);
   }
 
-  Future<void> _onFetchDevices(FetchDevices event, Emitter<DeviceManagementState> emit) async {
+  Future<void> _onFetchDevices(
+      FetchDevices event, Emitter<DeviceManagementState> emit) async {
     emit(DeviceManagementLoading());
     try {
-      final devices = await DevicesManagementApi().fetchDevices(event.communityId, event.spaceId);
+      final devices = await DevicesManagementApi().fetchDevices();
       _selectedDevices.clear();
       _devices = devices;
       _filteredDevices = devices;
@@ -51,7 +53,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onFilterDevices(FilterDevices event, Emitter<DeviceManagementState> emit) async {
+  void _onFilterDevices(
+      FilterDevices event, Emitter<DeviceManagementState> emit) async {
     if (_devices.isNotEmpty) {
       _filteredDevices = List.from(_devices.where((device) {
         switch (event.filter) {
@@ -82,7 +85,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  Future<void> _onResetFilters(ResetFilters event, Emitter<DeviceManagementState> emit) async {
+  Future<void> _onResetFilters(
+      ResetFilters event, Emitter<DeviceManagementState> emit) async {
     currentProductName = '';
     _selectedDevices.clear();
     _filteredDevices = List.from(_devices);
@@ -98,7 +102,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     ));
   }
 
-  void _onResetSelectedDevices(ResetSelectedDevices event, Emitter<DeviceManagementState> emit) {
+  void _onResetSelectedDevices(
+      ResetSelectedDevices event, Emitter<DeviceManagementState> emit) {
     _selectedDevices.clear();
 
     if (state is DeviceManagementLoaded) {
@@ -124,12 +129,14 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onSelectedFilterChanged(SelectedFilterChanged event, Emitter<DeviceManagementState> emit) {
+  void _onSelectedFilterChanged(
+      SelectedFilterChanged event, Emitter<DeviceManagementState> emit) {
     _selectedIndex = event.selectedIndex;
     add(FilterDevices(_getFilterFromIndex(_selectedIndex)));
   }
 
-  void _onSelectDevice(SelectDevice event, Emitter<DeviceManagementState> emit) {
+  void _onSelectDevice(
+      SelectDevice event, Emitter<DeviceManagementState> emit) {
     final selectedUuid = event.selectedDevice.uuid;
 
     if (_selectedDevices.any((device) => device.uuid == selectedUuid)) {
@@ -140,7 +147,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
 
     List<AllDevicesModel> clonedSelectedDevices = List.from(_selectedDevices);
 
-    bool isControlButtonEnabled = _checkIfControlButtonEnabled(clonedSelectedDevices);
+    bool isControlButtonEnabled =
+        _checkIfControlButtonEnabled(clonedSelectedDevices);
 
     if (state is DeviceManagementLoaded) {
       emit(DeviceManagementLoaded(
@@ -149,7 +157,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
         onlineCount: _onlineCount,
         offlineCount: _offlineCount,
         lowBatteryCount: _lowBatteryCount,
-        selectedDevice: clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
+        selectedDevice:
+            clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
         isControlButtonEnabled: isControlButtonEnabled,
       ));
     } else if (state is DeviceManagementFiltered) {
@@ -159,13 +168,15 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
         onlineCount: _onlineCount,
         offlineCount: _offlineCount,
         lowBatteryCount: _lowBatteryCount,
-        selectedDevice: clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
+        selectedDevice:
+            clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
         isControlButtonEnabled: isControlButtonEnabled,
       ));
     }
   }
 
-  void _onUpdateSelection(UpdateSelection event, Emitter<DeviceManagementState> emit) {
+  void _onUpdateSelection(
+      UpdateSelection event, Emitter<DeviceManagementState> emit) {
     List<AllDevicesModel> selectedDevices = [];
     List<AllDevicesModel> devicesToSelectFrom = [];
 
@@ -208,7 +219,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
 
   bool _checkIfControlButtonEnabled(List<AllDevicesModel> selectedDevices) {
     if (selectedDevices.length > 1) {
-      final productTypes = selectedDevices.map((device) => device.productType).toSet();
+      final productTypes =
+          selectedDevices.map((device) => device.productType).toSet();
       return productTypes.length == 1;
     } else if (selectedDevices.length == 1) {
       return true;
@@ -219,8 +231,10 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
   void _calculateDeviceCounts() {
     _onlineCount = _devices.where((device) => device.online == true).length;
     _offlineCount = _devices.where((device) => device.online == false).length;
-    _lowBatteryCount =
+    _lowBatteryCount = _devices
-        _devices.where((device) => device.batteryLevel != null && device.batteryLevel! < 20).length;
+        .where((device) =>
+            device.batteryLevel != null && device.batteryLevel! < 20)
+        .length;
   }
 
   String _getFilterFromIndex(int index) {
@@ -236,7 +250,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onSearchDevices(SearchDevices event, Emitter<DeviceManagementState> emit) {
+  void _onSearchDevices(
+      SearchDevices event, Emitter<DeviceManagementState> emit) {
     if ((event.community == null || event.community!.isEmpty) &&
         (event.unitName == null || event.unitName!.isEmpty) &&
         (event.productName == null || event.productName!.isEmpty)) {
@@ -265,22 +280,33 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
       final filteredDevices = devicesToSearch.where((device) {
         final matchesCommunity = event.community == null ||
             event.community!.isEmpty ||
-            (device.community?.name?.toLowerCase().contains(event.community!.toLowerCase()) ??
+            (device.community?.name
+                    ?.toLowerCase()
+                    .contains(event.community!.toLowerCase()) ??
                 false);
         final matchesUnit = event.unitName == null ||
             event.unitName!.isEmpty ||
             (device.spaces != null &&
                 device.spaces!.isNotEmpty &&
-                device.spaces![0].spaceName!.toLowerCase().contains(event.unitName!.toLowerCase()));
+                device.spaces![0].spaceName
+                    !.toLowerCase()
+                    .contains(event.unitName!.toLowerCase()));
         final matchesProductName = event.productName == null ||
             event.productName!.isEmpty ||
-            (device.name?.toLowerCase().contains(event.productName!.toLowerCase()) ?? false);
+            (device.name
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
+                false);
         final matchesDeviceName = event.productName == null ||
             event.productName!.isEmpty ||
-            (device.categoryName?.toLowerCase().contains(event.productName!.toLowerCase()) ??
+            (device.categoryName
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
                 false);
 
-        return matchesCommunity && matchesUnit && (matchesProductName || matchesDeviceName);
+        return matchesCommunity &&
+            matchesUnit &&
+            (matchesProductName || matchesDeviceName);
       }).toList();
 
       emit(DeviceManagementFiltered(

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_event.dart

@@ -7,14 +7,7 @@ abstract class DeviceManagementEvent extends Equatable {
   List<Object?> get props => [];
 }
 
-class FetchDevices extends DeviceManagementEvent {
+class FetchDevices extends DeviceManagementEvent {}
-  final String communityId;
-  final String spaceId;
-
-  const FetchDevices(this.communityId, this.spaceId);
-  @override
-  List<Object?> get props => [communityId, spaceId];
-}
 
 class FilterDevices extends DeviceManagementEvent {
   final String filter;

lib/pages/device_managment/all_devices/models/devices_model.dart

@@ -3,11 +3,11 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/device_spa
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_subspace.model.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/room.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/unit.dart';
-import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
+import 'package:syncrow_web/pages/routiens/models/ac/ac_function.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/one_gang_switch/one_gang_switch.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/three_gang_switch/three_gang_switch.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/two_gang_switch/two_gang_switch.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/two_gang_switch/two_gang_switch.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/enum/device_types.dart';
 
@@ -148,7 +148,9 @@ class AllDevicesModel {
 
     productName = json['productName']?.toString();
     if (json['spaces'] != null && json['spaces'] is List) {
-      spaces = (json['spaces'] as List).map((space) => DeviceSpaceModel.fromJson(space)).toList();
+      spaces = (json['spaces'] as List)
+          .map((space) => DeviceSpaceModel.fromJson(space))
+          .toList();
     }
   }
 
@@ -196,7 +198,8 @@ SOS
     String tempIcon = '';
     if (type == DeviceType.LightBulb) {
       tempIcon = Assets.lightBulb;
-    } else if (type == DeviceType.CeilingSensor || type == DeviceType.WallSensor) {
+    } else if (type == DeviceType.CeilingSensor ||
+        type == DeviceType.WallSensor) {
       tempIcon = Assets.sensors;
     } else if (type == DeviceType.AC) {
       tempIcon = Assets.ac;
@@ -251,25 +254,34 @@ SOS
       case '1G':
         return [
           OneGangSwitchFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          OneGangCountdownFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          OneGangCountdownFunction(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
 
       case '2G':
         return [
           TwoGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
           TwoGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TwoGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown1Function(
-          TwoGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown2Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
 
       case '3G':
         return [
-          ThreeGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangSwitch1Function(
-          ThreeGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
-          ThreeGangSwitch3Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangSwitch2Function(
-          ThreeGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
-          ThreeGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangSwitch3Function(
-          ThreeGangCountdown3Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangCountdown1Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangCountdown2Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangCountdown3Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
 
       default:

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

@@ -3,9 +3,9 @@ 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/widgets/device_managment_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
+import 'package:syncrow_web/pages/routiens/view/create_new_routine_view.dart';
-import 'package:syncrow_web/pages/routines/view/routines_view.dart';
+import 'package:syncrow_web/pages/routiens/view/routines_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -19,7 +19,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (context) => DeviceManagementBloc()..add(const FetchDevices('', '')),
+          create: (context) => DeviceManagementBloc()..add(FetchDevices()),
         ),
       ],
       child: WebScaffold(
@@ -80,7 +80,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
           return BlocBuilder<DeviceManagementBloc, DeviceManagementState>(
             builder: (context, deviceState) {
               if (deviceState is DeviceManagementLoading) {
-                return const DeviceManagementBody(devices: []);
+                return const Center(child: CircularProgressIndicator());
               } else if (deviceState is DeviceManagementLoaded) {
                 return DeviceManagementBody(devices: deviceState.devices);
               } else if (deviceState is DeviceManagementFiltered) {

lib/pages/device_managment/all_devices/widgets/device_managment_body.dart

@@ -8,7 +8,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_search_filters.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_batch_control_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_control_dialog.dart';
-import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/utils/format_date_time.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 import 'package:syncrow_web/utils/style.dart';
@@ -60,154 +59,118 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
 
         final buttonLabel = (selectedDevices.length > 1) ? 'Batch Control' : 'Control';
 
-        return Row(
+        return Column(
           children: [
-            const Expanded(
+            Container(
-                child: SpaceTreeView(
+              padding: isLargeScreenSize(context) ? const EdgeInsets.all(30) : const EdgeInsets.all(15),
-                    // onSelectAction: (String communityId, String spaceId) {
+              child: Column(
-                    //   context.read<DeviceManagementBloc>().add(FetchDevices(communityId, spaceId));
+                crossAxisAlignment: CrossAxisAlignment.start,
-                    // },
+                children: [
-                    )),
+                  FilterWidget(
-            Expanded(
+                    size: MediaQuery.of(context).size,
-              flex: 3,
+                    tabs: tabs,
-              child: state is DeviceManagementLoading
+                    selectedIndex: selectedIndex,
-                  ? const Center(child: CircularProgressIndicator())
+                    onTabChanged: (index) {
-                  : Column(
+                      context.read<DeviceManagementBloc>().add(SelectedFilterChanged(index));
-                      children: [
+                    },
-                        Container(
+                  ),
-                          padding: isLargeScreenSize(context)
+                  const SizedBox(height: 20),
-                              ? const EdgeInsets.all(30)
+                  const DeviceSearchFilters(),
-                              : const EdgeInsets.all(15),
+                  const SizedBox(height: 12),
-                          child: Column(
+                  Container(
-                            crossAxisAlignment: CrossAxisAlignment.start,
+                    height: 45,
-                            children: [
+                    width: 125,
-                              FilterWidget(
+                    decoration: containerDecoration,
-                                size: MediaQuery.of(context).size,
+                    child: Center(
-                                tabs: tabs,
+                      child: DefaultButton(
-                                selectedIndex: selectedIndex,
+                        onPressed: isControlButtonEnabled
-                                onTabChanged: (index) {
+                            ? () {
-                                  context
+                                if (selectedDevices.length == 1) {
-                                      .read<DeviceManagementBloc>()
+                                  showDialog(
-                                      .add(SelectedFilterChanged(index));
+                                    context: context,
-                                },
+                                    builder: (context) => DeviceControlDialog(
-                              ),
+                                      device: selectedDevices.first,
-                              const SizedBox(height: 20),
-                              const DeviceSearchFilters(),
-                              const SizedBox(height: 12),
-                              Container(
-                                height: 45,
-                                width: 125,
-                                decoration: containerDecoration,
-                                child: Center(
-                                  child: DefaultButton(
-                                    onPressed: isControlButtonEnabled
-                                        ? () {
-                                            if (selectedDevices.length == 1) {
-                                              showDialog(
-                                                context: context,
-                                                builder: (context) => DeviceControlDialog(
-                                                  device: selectedDevices.first,
-                                                ),
-                                              );
-                                            } else if (selectedDevices.length > 1) {
-                                              final productTypes = selectedDevices
-                                                  .map((device) => device.productType)
-                                                  .toSet();
-                                              if (productTypes.length == 1) {
-                                                showDialog(
-                                                  context: context,
-                                                  builder: (context) => DeviceBatchControlDialog(
-                                                    devices: selectedDevices,
-                                                  ),
-                                                );
-                                              }
-                                            }
-                                          }
-                                        : null,
-                                    borderRadius: 9,
-                                    child: Text(
-                                      buttonLabel,
-                                      textAlign: TextAlign.center,
-                                      style: TextStyle(
-                                        fontSize: 12,
-                                        color: isControlButtonEnabled ? Colors.white : Colors.grey,
-                                      ),
                                     ),
-                                  ),
+                                  );
-                                ),
+                                } else if (selectedDevices.length > 1) {
-                              ),
+                                  final productTypes = selectedDevices.map((device) => device.productType).toSet();
-                            ],
+                                  if (productTypes.length == 1) {
+                                    showDialog(
+                                      context: context,
+                                      builder: (context) => DeviceBatchControlDialog(
+                                        devices: selectedDevices,
+                                      ),
+                                    );
+                                  }
+                                }
+                              }
+                            : null,
+                        borderRadius: 9,
+                        child: Text(
+                          buttonLabel,
+                          textAlign: TextAlign.center,
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: isControlButtonEnabled ? Colors.white : Colors.grey,
                           ),
                         ),
-                        Expanded(
+                      ),
-                          child: Padding(
-                            padding: isLargeScreenSize(context)
-                                ? const EdgeInsets.all(30)
-                                : const EdgeInsets.all(15),
-                            child: DynamicTable(
-                              withSelectAll: true,
-                              cellDecoration: containerDecoration,
-                              onRowSelected: (index, isSelected, row) {
-                                final selectedDevice = devicesToShow[index];
-                                context
-                                    .read<DeviceManagementBloc>()
-                                    .add(SelectDevice(selectedDevice));
-                              },
-                              withCheckBox: true,
-                              size: MediaQuery.of(context).size,
-                              uuidIndex: 2,
-                              headers: const [
-                                'Device Name',
-                                'Product Name',
-                                'Device ID',
-                                'Space Name',
-                                'location',
-                                'Battery Level',
-                                'Installation Date and Time',
-                                'Status',
-                                'Last Offline Date and Time',
-                              ],
-                              data: devicesToShow.map((device) {
-                                final combinedSpaceNames = device.spaces != null
-                                    ? device.spaces!.map((space) => space.spaceName).join(' > ') +
-                                        (device.community != null
-                                            ? ' > ${device.community!.name}'
-                                            : '')
-                                    : (device.community != null ? device.community!.name : '');
-
-                                return [
-                                  device.name ?? '',
-                                  device.productName ?? '',
-                                  device.uuid ?? '',
-                                  (device.spaces != null && device.spaces!.isNotEmpty)
-                                      ? device.spaces![0].spaceName
-                                      : '',
-                                  combinedSpaceNames,
-                                  device.batteryLevel != null ? '${device.batteryLevel}%' : '-',
-                                  formatDateTime(DateTime.fromMillisecondsSinceEpoch(
-                                      (device.createTime ?? 0) * 1000)),
-                                  device.online == true ? 'Online' : 'Offline',
-                                  formatDateTime(DateTime.fromMillisecondsSinceEpoch(
-                                      (device.updateTime ?? 0) * 1000)),
-                                ];
-                              }).toList(),
-                              onSelectionChanged: (selectedRows) {
-                                context
-                                    .read<DeviceManagementBloc>()
-                                    .add(UpdateSelection(selectedRows));
-                              },
-                              initialSelectedIds: context
-                                  .read<DeviceManagementBloc>()
-                                  .selectedDevices
-                                  .map((device) => device.uuid!)
-                                  .toList(),
-                              isEmpty: devicesToShow.isEmpty,
-                            ),
-                          ),
-                        )
-                      ],
                     ),
+                  ),
+                ],
+              ),
             ),
+            Expanded(
+              child: Padding(
+                padding: isLargeScreenSize(context) ? const EdgeInsets.all(30) : const EdgeInsets.all(15),
+                child: DynamicTable(
+                  withSelectAll: true,
+                  cellDecoration: containerDecoration,
+                  onRowSelected: (index, isSelected, row) {
+                    final selectedDevice = devicesToShow[index];
+                    context.read<DeviceManagementBloc>().add(SelectDevice(selectedDevice));
+                  },
+                  withCheckBox: true,
+                  size: MediaQuery.of(context).size,
+                  uuidIndex: 2,
+                  headers: const [
+                    'Device Name',
+                    'Product Name',
+                    'Device ID',
+                    'Space Name',
+                    'location',
+                    'Battery Level',
+                    'Installation Date and Time',
+                    'Status',
+                    'Last Offline Date and Time',
+                  ],
+                  data: devicesToShow.map((device) {
+                    final combinedSpaceNames = device.spaces != null
+                        ? device.spaces!.map((space) => space.spaceName).join(' > ') +
+                            (device.community != null ? ' > ${device.community!.name}' : '')
+                        : (device.community != null ? device.community!.name : '');
+
+                    return [
+                      device.name ?? '',
+                      device.productName ?? '',
+                      device.uuid ?? '',
+                      (device.spaces != null && device.spaces!.isNotEmpty) ? device.spaces![0].spaceName : '',
+                      combinedSpaceNames,
+                      device.batteryLevel != null ? '${device.batteryLevel}%' : '-',
+                      formatDateTime(DateTime.fromMillisecondsSinceEpoch((device.createTime ?? 0) * 1000)),
+                      device.online == true ? 'Online' : 'Offline',
+                      formatDateTime(DateTime.fromMillisecondsSinceEpoch((device.updateTime ?? 0) * 1000)),
+                    ];
+                  }).toList(),
+                  onSelectionChanged: (selectedRows) {
+                    context.read<DeviceManagementBloc>().add(UpdateSelection(selectedRows));
+                  },
+                  initialSelectedIds:
+                      context.read<DeviceManagementBloc>().selectedDevices.map((device) => device.uuid!).toList(),
+                  isEmpty: devicesToShow.isEmpty,
+                ),
+              ),
+            )
           ],
         );
       },

lib/pages/device_managment/all_devices/widgets/device_search_filters.dart

@@ -12,7 +12,8 @@ class DeviceSearchFilters extends StatefulWidget {
   State<DeviceSearchFilters> createState() => _DeviceSearchFiltersState();
 }
 
-class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperResponsiveLayout {
+class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
+    with HelperResponsiveLayout {
   final TextEditingController communityController = TextEditingController();
   final TextEditingController unitNameController = TextEditingController();
   final TextEditingController productNameController = TextEditingController();
@@ -26,7 +27,8 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
               const SizedBox(width: 20),
               _buildSearchField("Space Name", unitNameController, 200),
               const SizedBox(width: 20),
-              _buildSearchField("Device Name / Product Name", productNameController, 300),
+              _buildSearchField(
+                  "Device Name / Product Name", productNameController, 300),
               const SizedBox(width: 20),
               _buildSearchResetButtons(),
             ],
@@ -51,7 +53,8 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
           );
   }
 
-  Widget _buildSearchField(String title, TextEditingController controller, double width) {
+  Widget _buildSearchField(
+      String title, TextEditingController controller, double width) {
     return Container(
       child: StatefulTextField(
         title: title,
@@ -85,7 +88,7 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
         productNameController.clear();
         context.read<DeviceManagementBloc>()
           ..add(ResetFilters())
-          ..add(const FetchDevices('', ''));
+          ..add(FetchDevices());
       },
     );
   }

lib/pages/home/bloc/home_bloc.dart

@@ -1,96 +1,56 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
-// import 'package:graphview/GraphView.dart';
+import 'package:graphview/GraphView.dart';
 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/routines/bloc/routine_bloc/routine_bloc.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';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
-  // final Graph graph = Graph()..isTree = true;
+  final Graph graph = Graph()..isTree = true;
-  // final BuchheimWalkerConfiguration builder = BuchheimWalkerConfiguration();
+  final BuchheimWalkerConfiguration builder = BuchheimWalkerConfiguration();
-  // List<Node> sourcesList = [];
+  List<Node> sourcesList = [];
-  // List<Node> destinationsList = [];
+  List<Node> destinationsList = [];
   UserModel? user;
-  String terms = '';
-  String policy = '';
 
   HomeBloc() : super((HomeInitial())) {
-    // on<CreateNewNode>(_createNode);
+    on<CreateNewNode>(_createNode);
     on<FetchUserInfo>(_fetchUserInfo);
-    on<FetchTermEvent>(_fetchTerms);
-    on<FetchPolicyEvent>(_fetchPolicy);
-    on<ConfirmUserAgreementEvent>(_confirmUserAgreement);
   }
 
-  // void _createNode(CreateNewNode event, Emitter<HomeState> emit) async {
+  void _createNode(CreateNewNode event, Emitter<HomeState> emit) async {
-  //   emit(HomeInitial());
+    emit(HomeInitial());
-  //   sourcesList.add(event.sourceNode);
+    sourcesList.add(event.sourceNode);
-  //   destinationsList.add(event.destinationNode);
+    destinationsList.add(event.destinationNode);
-  //   for (int i = 0; i < sourcesList.length; i++) {
+    for (int i = 0; i < sourcesList.length; i++) {
-  //     graph.addEdge(sourcesList[i], destinationsList[i]);
+      graph.addEdge(sourcesList[i], destinationsList[i]);
-  //   }
+    }
 
-  //   builder
+    builder
-  //     ..siblingSeparation = (100)
+      ..siblingSeparation = (100)
-  //     ..levelSeparation = (150)
+      ..levelSeparation = (150)
-  //     ..subtreeSeparation = (150)
+      ..subtreeSeparation = (150)
-  //     ..orientation = (BuchheimWalkerConfiguration.ORIENTATION_TOP_BOTTOM);
+      ..orientation = (BuchheimWalkerConfiguration.ORIENTATION_TOP_BOTTOM);
-  //   emit(HomeUpdateTree(graph: graph, builder: builder));
+    emit(HomeUpdateTree(graph: graph, builder: builder));
-  // }
+  }
 
   Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
     try {
       var uuid =
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
-      add(FetchTermEvent());
       emit(HomeInitial());
     } catch (e) {
       return;
     }
   }
 
-  Future _fetchTerms(FetchTermEvent event, Emitter<HomeState> emit) async {
-    try {
-      emit(LoadingHome());
-      terms = await HomeApi().fetchTerms();
-      add(FetchPolicyEvent());
-      emit(PolicyAgreement());
-    } catch (e) {
-      return;
-    }
-  }
-
-  Future _fetchPolicy(FetchPolicyEvent event, Emitter<HomeState> emit) async {
-    try {
-      emit(LoadingHome());
-      policy = await HomeApi().fetchPolicy();
-      emit(PolicyAgreement());
-    } catch (e) {
-      return;
-    }
-  }
-
-  Future _confirmUserAgreement(
-      ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
-    try {
-      emit(LoadingHome());
-      var uuid =
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
-      policy = await HomeApi().confirmUserAgreements(uuid);
-      emit(PolicyAgreement());
-    } catch (e) {
-      return;
-    }
-  }
-
 //  static  Future fetchUserInfo() async {
 //     try {
 //       var uuid =

lib/pages/home/bloc/home_event.dart

@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-// import 'package:graphview/GraphView.dart';
+import 'package:graphview/GraphView.dart';
 
 abstract class HomeEvent extends Equatable {
   const HomeEvent();
@@ -8,22 +8,16 @@ abstract class HomeEvent extends Equatable {
   List<Object> get props => [];
 }
 
-// class CreateNewNode extends HomeEvent {
+class CreateNewNode extends HomeEvent {
-//   final Node sourceNode;
+  final Node sourceNode;
-//   final Node destinationNode;
+  final Node destinationNode;
-//   const CreateNewNode(
+  const CreateNewNode(
-//       {required this.sourceNode, required this.destinationNode});
+      {required this.sourceNode, required this.destinationNode});
 
-//   @override
+  @override
-//   List<Object> get props => [sourceNode, destinationNode];
+  List<Object> get props => [sourceNode, destinationNode];
-// }
+}
 
 class FetchUserInfo extends HomeEvent {
   const FetchUserInfo();
-}
+}
-
-class FetchTermEvent extends HomeEvent {}
-
-class FetchPolicyEvent extends HomeEvent {}
-
-class ConfirmUserAgreementEvent extends HomeEvent {}

lib/pages/home/bloc/home_state.dart

@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-// import 'package:graphview/GraphView.dart';
+import 'package:graphview/GraphView.dart';
 
 abstract class HomeState extends Equatable {
   const HomeState();
@@ -8,25 +8,19 @@ abstract class HomeState extends Equatable {
   List<Object> get props => [];
 }
 
-class LoadingHome extends HomeState {}
-
 class HomeInitial extends HomeState {}
 
-class TermsAgreement extends HomeState {}
+class HomeCounterState extends HomeState {
+  final int counter;
+  const HomeCounterState(this.counter);
+}
 
-class PolicyAgreement extends HomeState {}
+class HomeUpdateTree extends HomeState {
+  final Graph graph;
+  final BuchheimWalkerConfiguration builder;
 
-// class HomeCounterState extends HomeState {
+  const HomeUpdateTree({required this.graph, required this.builder});
-//   final int counter;
-//   const HomeCounterState(this.counter);
-// }
 
-// class HomeUpdateTree extends HomeState {
+  @override
-//   final Graph graph;
+  List<Object> get props => [graph, builder];
-//   final BuchheimWalkerConfiguration builder;
+}
-
-//   const HomeUpdateTree({required this.graph, required this.builder});
-
-//   @override
-//   List<Object> get props => [graph, builder];
-// }

lib/pages/home/view/agreement_and_privacy_dialog.dart

@@ -1,178 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
-import 'package:go_router/go_router.dart';
-import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/routes_const.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class AgreementAndPrivacyDialog extends StatefulWidget {
-  final String terms;
-  final String policy;
-
-  const AgreementAndPrivacyDialog({
-    super.key,
-    required this.terms,
-    required this.policy,
-  });
-
-  @override
-  _AgreementAndPrivacyDialogState createState() =>
-      _AgreementAndPrivacyDialogState();
-}
-
-class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
-  final ScrollController _scrollController = ScrollController();
-  bool _isAtEnd = false;
-  int _currentPage = 1;
-
-  @override
-  void initState() {
-    super.initState();
-    _scrollController.addListener(_onScroll);
-    WidgetsBinding.instance
-        .addPostFrameCallback((_) => _checkScrollRequirement());
-  }
-
-  void _checkScrollRequirement() {
-    final scrollPosition = _scrollController.position;
-    if (scrollPosition.maxScrollExtent <= 0) {
-      setState(() {
-        _isAtEnd = true;
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    _scrollController.removeListener(_onScroll);
-    _scrollController.dispose();
-    super.dispose();
-  }
-
-  void _onScroll() {
-    if (_scrollController.position.atEdge) {
-      final isAtBottom = _scrollController.position.pixels ==
-          _scrollController.position.maxScrollExtent;
-      if (isAtBottom && !_isAtEnd) {
-        setState(() {
-          _isAtEnd = true;
-        });
-      }
-    }
-  }
-
-  String get _dialogTitle =>
-      _currentPage == 1 ? 'User Agreement' : 'Privacy Policy';
-
-  String get _dialogContent => _currentPage == 1 ? widget.terms : widget.policy;
-  final String staticText =
-      '<h5 style="color: #FF5722;">If you cancel you will be logged out.</h5>';
-
-  Widget _buildScrollableContent() {
-    return Container(
-      padding: const EdgeInsets.all(40),
-      width: MediaQuery.of(context).size.width * 0.8,
-      height: MediaQuery.of(context).size.height * 0.75,
-      decoration: BoxDecoration(
-        color: Colors.grey[200],
-        borderRadius: const BorderRadius.all(Radius.circular(20)),
-      ),
-      child: Scrollbar(
-        thumbVisibility: true,
-        trackVisibility: true,
-        interactive: true,
-        controller: _scrollController,
-        child: SingleChildScrollView(
-          controller: _scrollController,
-          padding: const EdgeInsets.all(25),
-          child: Html(
-            data: "$_dialogContent $staticText",
-            onLinkTap: (url, attributes, element) async {
-              if (url != null) {
-                final uri = Uri.parse(url);
-                await launchUrl(uri, mode: LaunchMode.externalApplication);
-              }
-            },
-            style: {
-              "body": Style(
-                fontSize: FontSize(14),
-                color: Colors.black87,
-                lineHeight: LineHeight(1.5),
-              ),
-            },
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildActionButton() {
-    final String buttonText = _currentPage == 2 ? "I Agree" : "Next";
-
-    return InkWell(
-      onTap: _isAtEnd
-          ? () {
-              if (_currentPage == 1) {
-                setState(() {
-                  _currentPage = 2;
-                  _isAtEnd = false;
-                  _scrollController.jumpTo(0);
-                  WidgetsBinding.instance
-                      .addPostFrameCallback((_) => _checkScrollRequirement());
-                });
-              } else {
-                Navigator.of(context).pop(true);
-              }
-            }
-          : null,
-      child: Text(
-        buttonText,
-        style: TextStyle(
-          color: _isAtEnd ? ColorsManager.secondaryColor : Colors.grey,
-        ),
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Dialog(
-      child: Column(
-        children: [
-          Padding(
-            padding: const EdgeInsets.all(16.0),
-            child: Text(
-              _dialogTitle,
-              textAlign: TextAlign.center,
-              style: const TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w700,
-                color: ColorsManager.secondaryColor,
-              ),
-            ),
-          ),
-          const Divider(),
-          _buildScrollableContent(),
-          const Divider(),
-          Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceAround,
-              children: [
-                InkWell(
-                  onTap: () {
-                    AuthBloc.logout();
-                    context.go(RoutesConst.auth);
-                  },
-                  child: const Text("Cancel"),
-                ),
-                _buildActionButton(),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/pages/home/view/home_page_mobile.dart

@@ -41,7 +41,8 @@ class HomeMobilePage extends StatelessWidget {
                     SizedBox(height: size.height * 0.05),
                     const Text(
                       'ACCESS YOUR APPS',
-                      style: TextStyle(fontSize: 20, fontWeight: FontWeight.w700),
+                      style:
+                          TextStyle(fontSize: 20, fontWeight: FontWeight.w700),
                     ),
                     const SizedBox(height: 30),
                     Expanded(
@@ -50,8 +51,9 @@ class HomeMobilePage extends StatelessWidget {
                         height: size.height * 0.6,
                         width: size.width * 0.68,
                         child: GridView.builder(
-                          itemCount: 3,
+                          itemCount: 8,
-                          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                          gridDelegate:
+                              const SliverGridDelegateWithFixedCrossAxisCount(
                             crossAxisCount: 2,
                             crossAxisSpacing: 20.0,
                             mainAxisSpacing: 20.0,
@@ -63,7 +65,8 @@ class HomeMobilePage extends StatelessWidget {
                               active: homeItems[index]['active'],
                               name: homeItems[index]['title'],
                               img: homeItems[index]['icon'],
-                              onTap: () => homeBloc.homeItems[index].onPress(context),
+                              onTap: () =>
+                                  homeBloc.homeItems[index].onPress(context),
                             );
                           },
                         ),
@@ -94,33 +97,33 @@ class HomeMobilePage extends StatelessWidget {
       'icon': Assets.devicesIcon,
       'active': true,
     },
-    // {
+    {
-    //   'title': 'Move in',
+      'title': 'Move in',
-    //   'icon': Assets.moveinIcon,
+      'icon': Assets.moveinIcon,
-    //   'active': false,
+      'active': false,
-    // },
+    },
-    // {
+    {
-    //   'title': 'Construction',
+      'title': 'Construction',
-    //   'icon': Assets.constructionIcon,
+      'icon': Assets.constructionIcon,
-    //   'active': false,
+      'active': false,
-    // },
+    },
-    // {
+    {
-    //   'title': 'Energy',
+      'title': 'Energy',
-    //   'icon': Assets.energyIcon,
+      'icon': Assets.energyIcon,
-    //   'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
+      'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
-    //   'active': false,
+      'active': false,
-    // },
+    },
-    // {
+    {
-    //   'title': 'Integrations',
+      'title': 'Integrations',
-    //   'icon': Assets.integrationsIcon,
+      'icon': Assets.integrationsIcon,
-    //   'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
+      'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
-    //   'active': false,
+      'active': false,
-    // },
+    },
-    // {
+    {
-    //   'title': 'Asset',
+      'title': 'Asset',
-    //   'icon': Assets.assetIcon,
+      'icon': Assets.assetIcon,
-    //   'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
+      'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
-    //   'active': false,
+      'active': false,
-    // },
+    },
   ];
 }

lib/pages/home/view/home_page_web.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/home/bloc/home_event.dart';
-import 'package:syncrow_web/pages/home/view/agreement_and_privacy_dialog.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/view/home_card.dart';
@@ -11,40 +9,16 @@ import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
 class HomeWebPage extends StatelessWidget {
   const HomeWebPage({super.key});
-
   @override
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
-    final homeBloc = BlocProvider.of<HomeBloc>(context);
-
     return PopScope(
         canPop: false,
         onPopInvoked: (didPop) => false,
         child: BlocConsumer<HomeBloc, HomeState>(
-          listener: (BuildContext context, state) {
+          listener: (BuildContext context, state) {},
-            if (state is HomeInitial) {
-              if (homeBloc.user!.hasAcceptedWebAgreement == false) {
-                Future.delayed(const Duration(seconds: 2), () {
-                  showDialog(
-                    context: context,
-                    barrierDismissible: false,
-                    builder: (BuildContext context) {
-                      return AgreementAndPrivacyDialog(
-                        terms: homeBloc.terms,
-                        policy: homeBloc.policy,
-                      );
-                    },
-                  ).then((v) {
-                    if (v != null) {
-                      homeBloc.add(ConfirmUserAgreementEvent());
-                      homeBloc.add(const FetchUserInfo());
-                    }
-                  });
-                });
-              }
-            }
-          },
           builder: (context, state) {
+            final homeBloc = BlocProvider.of<HomeBloc>(context);
             return WebScaffold(
               enableMenuSidebar: false,
               appBarTitle: Row(
@@ -58,48 +32,43 @@ class HomeWebPage extends StatelessWidget {
               scaffoldBody: SizedBox(
                 height: size.height,
                 width: size.width,
-                child: Row(
+                child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
-                    Column(
+                    SizedBox(height: size.height * 0.1),
-                      mainAxisAlignment: MainAxisAlignment.center,
+                    Text(
-                      crossAxisAlignment: CrossAxisAlignment.center,
+                      'ACCESS YOUR APPS',
-                      children: [
+                      style: Theme.of(context)
-                        SizedBox(height: size.height * 0.1),
+                          .textTheme
-                        Text(
+                          .headlineLarge!
-                          'ACCESS YOUR APPS',
+                          .copyWith(color: Colors.black, fontSize: 40),
-                          style: Theme.of(context)
+                    ),
-                              .textTheme
+                    const SizedBox(height: 30),
-                              .headlineLarge!
+                    Expanded(
-                              .copyWith(color: Colors.black, fontSize: 40),
+                      flex: 4,
-                        ),
+                      child: SizedBox(
-                        const SizedBox(height: 30),
+                        height: size.height * 0.6,
-                        Expanded(
+                        width: size.width * 0.68,
-                          flex: 4,
+                        child: GridView.builder(
-                          child: SizedBox(
+                          itemCount: 3, //8
-                            height: size.height * 0.6,
+                          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                            width: size.width * 0.68,
+                            crossAxisCount: 4,
-                            child: GridView.builder(
+                            crossAxisSpacing: 20.0,
-                              itemCount: 3, //8
+                            mainAxisSpacing: 20.0,
-                              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                            childAspectRatio: 1.5,
-                                crossAxisCount: 3, //4
-                                crossAxisSpacing: 20.0,
-                                mainAxisSpacing: 20.0,
-                                childAspectRatio: 1.5,
-                              ),
-                              itemBuilder: (context, index) {
-                                return HomeCard(
-                                  index: index,
-                                  active: homeBloc.homeItems[index].active!,
-                                  name: homeBloc.homeItems[index].title!,
-                                  img: homeBloc.homeItems[index].icon!,
-                                  onTap: () => homeBloc.homeItems[index].onPress(context),
-                                );
-                              },
-                            ),
                           ),
+                          itemBuilder: (context, index) {
+                            return HomeCard(
+                              index: index,
+                              active: homeBloc.homeItems[index].active!,
+                              name: homeBloc.homeItems[index].title!,
+                              img: homeBloc.homeItems[index].icon!,
+                              onTap: () => homeBloc.homeItems[index].onPress(context),
+                            );
+                          },
                         ),
-                      ],
+                      ),
                     ),
                   ],
                 ),

lib/pages/home/view/tree_page.dart

@@ -1,185 +1,185 @@
-// import 'package:flutter/material.dart';
+import 'package:flutter/material.dart';
-// import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
-// import 'package:graphview/GraphView.dart';
+import 'package:graphview/GraphView.dart';
-// import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
-// import 'package:syncrow_web/pages/home/bloc/home_event.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/bloc/home_state.dart';
 
-// class TreeWidget extends StatelessWidget {
+class TreeWidget extends StatelessWidget {
-//   const TreeWidget({super.key});
+  const TreeWidget({super.key});
 
-//   @override
+  @override
-//   Widget build(BuildContext context) {
+  Widget build(BuildContext context) {
-//     // final HomeBloc homeBloc = BlocProvider.of<HomeBloc>(context);
+    // final HomeBloc homeBloc = BlocProvider.of<HomeBloc>(context);
-//     String firstNodeName = '';
+    String firstNodeName = '';
-//     String secondNodeName = '';
+    String secondNodeName = '';
 
-//     return SafeArea(
+    return SafeArea(
-//       child: Container(
+      child: Container(
-//         padding: const EdgeInsets.all(24),
+        padding: const EdgeInsets.all(24),
-//         width: MediaQuery.sizeOf(context).width,
+        width: MediaQuery.sizeOf(context).width,
-//         height: MediaQuery.sizeOf(context).height,
+        height: MediaQuery.sizeOf(context).height,
-//         alignment: AlignmentDirectional.center,
+        alignment: AlignmentDirectional.center,
-//         child: Column(
+        child: Column(
-//           mainAxisSize: MainAxisSize.max,
+          mainAxisSize: MainAxisSize.max,
-//           crossAxisAlignment: CrossAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.center,
-//           mainAxisAlignment: MainAxisAlignment.center,
+          mainAxisAlignment: MainAxisAlignment.center,
-//           children: [
+          children: [
-//             BlocBuilder<HomeBloc, HomeState>(builder: (context, state) {
+            BlocBuilder<HomeBloc, HomeState>(builder: (context, state) {
-//               if (state is HomeInitial) {
+              if (state is HomeInitial) {
-//                 return Wrap(
+                return Wrap(
-//                   children: [
+                  children: [
-//                     SizedBox(
+                    SizedBox(
-//                       width: 100,
+                      width: 100,
-//                       child: TextFormField(
+                      child: TextFormField(
-//                         decoration: const InputDecoration(
+                        decoration: const InputDecoration(
-//                             labelText: "Subtree separation"),
+                            labelText: "Subtree separation"),
-//                         onChanged: (text) {
+                        onChanged: (text) {
-//                           firstNodeName = text;
+                          firstNodeName = text;
-//                         },
+                        },
-//                       ),
+                      ),
-//                     ),
+                    ),
-//                     const SizedBox(
+                    const SizedBox(
-//                       width: 8,
+                      width: 8,
-//                     ),
+                    ),
-//                     Container(
+                    Container(
-//                       width: 100,
+                      width: 100,
-//                       child: TextFormField(
+                      child: TextFormField(
-//                         decoration: InputDecoration(labelText: "Node Name"),
+                        decoration: InputDecoration(labelText: "Node Name"),
-//                         onChanged: (text) {
+                        onChanged: (text) {
-//                           secondNodeName = text;
+                          secondNodeName = text;
-//                         },
+                        },
-//                       ),
+                      ),
-//                     ),
+                    ),
-//                     ElevatedButton(
+                    ElevatedButton(
-//                       onPressed: () {
+                      onPressed: () {
-//                         final node1 = Node.Id(firstNodeName);
+                        final node1 = Node.Id(firstNodeName);
-//                         final node2 = Node.Id(secondNodeName);
+                        final node2 = Node.Id(secondNodeName);
-//                         context.read<HomeBloc>().add(CreateNewNode(
+                        context.read<HomeBloc>().add(CreateNewNode(
-//                             sourceNode: node1, destinationNode: node2));
+                            sourceNode: node1, destinationNode: node2));
-//                       },
+                      },
-//                       child: Text("Add"),
+                      child: Text("Add"),
-//                     )
+                    )
-//                   ],
+                  ],
-//                 );
+                );
-//               }
+              }
-//               if (state is HomeUpdateTree) {
+              if (state is HomeUpdateTree) {
-//                 return Expanded(
+                return Expanded(
-//                   child: InteractiveViewer(
+                  child: InteractiveViewer(
-//                       constrained: false,
+                      constrained: false,
-//                       boundaryMargin: const EdgeInsets.all(100),
+                      boundaryMargin: const EdgeInsets.all(100),
-//                       minScale: 0.01,
+                      minScale: 0.01,
-//                       maxScale: 5.6,
+                      maxScale: 5.6,
-//                       child: GraphView(
+                      child: GraphView(
-//                         graph: state.graph,
+                        graph: state.graph,
-//                         algorithm: BuchheimWalkerAlgorithm(
+                        algorithm: BuchheimWalkerAlgorithm(
-//                             state.builder, TreeEdgeRenderer(state.builder)),
+                            state.builder, TreeEdgeRenderer(state.builder)),
-//                         paint: Paint()
+                        paint: Paint()
-//                           ..color = Colors.green
+                          ..color = Colors.green
-//                           ..strokeWidth = 1
+                          ..strokeWidth = 1
-//                           ..style = PaintingStyle.stroke,
+                          ..style = PaintingStyle.stroke,
-//                         builder: (Node node) {
+                        builder: (Node node) {
-//                           // I can decide what widget should be shown here based on the id
+                          // I can decide what widget should be shown here based on the id
-//                           var nodeName = node.key!.value;
+                          var nodeName = node.key!.value;
-//                           return rectangleWidget(nodeName, node, context);
+                          return rectangleWidget(nodeName, node, context);
-//                         },
+                        },
-//                       )),
+                      )),
-//                 );
+                );
-//               } else {
+              } else {
-//                 return Container();
+                return Container();
-//               }
+              }
-//             })
+            })
-//           ],
+          ],
-//         ),
+        ),
-//       ),
+      ),
-//     );
+    );
-//   }
+  }
-// }
+}
 
-// Widget rectangleWidget(String text, Node node, BuildContext blocContext) {
+Widget rectangleWidget(String text, Node node, BuildContext blocContext) {
-//   String nodeName = '';
+  String nodeName = '';
-//   return InkWell(
+  return InkWell(
-//     onTap: () {
+    onTap: () {
-//       showDialog(
+      showDialog(
-//         context: blocContext,
+        context: blocContext,
-//         builder: (BuildContext context) {
+        builder: (BuildContext context) {
-//           return AlertDialog(
+          return AlertDialog(
-//             title: const Text('Add a child'),
+            title: const Text('Add a child'),
-//             content: TextField(
+            content: TextField(
-//               decoration:
+              decoration:
-//                   const InputDecoration(hintText: 'Enter your text here'),
+                  const InputDecoration(hintText: 'Enter your text here'),
-//               onChanged: (value) {
+              onChanged: (value) {
-//                 nodeName = value;
+                nodeName = value;
-//               },
+              },
-//             ),
+            ),
-//             actions: <Widget>[
+            actions: <Widget>[
-//               TextButton(
+              TextButton(
-//                 onPressed: () {
+                onPressed: () {
-//                   Navigator.of(context).pop();
+                  Navigator.of(context).pop();
-//                 },
+                },
-//                 child: Text('Close'),
+                child: Text('Close'),
-//               ),
+              ),
-//               TextButton(
+              TextButton(
-//                 onPressed: () {
+                onPressed: () {
-//                   if (nodeName.isNotEmpty) {
+                  if (nodeName.isNotEmpty) {
-//                     final newNode = Node.Id(nodeName);
+                    final newNode = Node.Id(nodeName);
-//                     blocContext.read<HomeBloc>().add(CreateNewNode(
+                    blocContext.read<HomeBloc>().add(CreateNewNode(
-//                         sourceNode: node, destinationNode: newNode));
+                        sourceNode: node, destinationNode: newNode));
-//                   }
+                  }
-//                   Navigator.of(context).pop();
+                  Navigator.of(context).pop();
-//                 },
+                },
-//                 child: Text('Add'),
+                child: Text('Add'),
-//               ),
+              ),
-//             ],
+            ],
-//           );
+          );
-//         },
+        },
-//       );
+      );
-//     },
+    },
-//     child: Container(
+    child: Container(
-//       width: MediaQuery.of(blocContext).size.width * 0.2,
+      width: MediaQuery.of(blocContext).size.width * 0.2,
-//       margin: EdgeInsets.symmetric(vertical: 10.0, horizontal: 20.0),
+      margin: EdgeInsets.symmetric(vertical: 10.0, horizontal: 20.0),
-//       padding: EdgeInsets.all(20.0),
+      padding: EdgeInsets.all(20.0),
-//       decoration: BoxDecoration(
+      decoration: BoxDecoration(
-//         color: Colors.white,
+        color: Colors.white,
-//         borderRadius: BorderRadius.circular(10.0),
+        borderRadius: BorderRadius.circular(10.0),
-//         boxShadow: [
+        boxShadow: [
-//           BoxShadow(
+          BoxShadow(
-//             color: Colors.grey.withOpacity(0.5),
+            color: Colors.grey.withOpacity(0.5),
-//             spreadRadius: 2,
+            spreadRadius: 2,
-//             blurRadius: 5,
+            blurRadius: 5,
-//             offset: Offset(0, 3), // changes position of shadow
+            offset: Offset(0, 3), // changes position of shadow
-//           ),
+          ),
-//         ],
+        ],
-//       ),
+      ),
-//       child: Row(
+      child: Row(
-//         children: [
+        children: [
-//           const SizedBox(
+          const SizedBox(
-//             child: Icon(
+            child: Icon(
-//               Icons.location_on,
+              Icons.location_on,
-//               color: Colors.blue,
+              color: Colors.blue,
-//               size: 40.0,
+              size: 40.0,
-//             ),
+            ),
-//           ),
+          ),
-//           const SizedBox(width: 10.0),
+          const SizedBox(width: 10.0),
-//           SizedBox(
+          SizedBox(
-//             child: Text(
+            child: Text(
-//               text,
+              text,
-//               style: const TextStyle(
+              style: const TextStyle(
-//                 fontSize: 24.0,
+                fontSize: 24.0,
-//                 fontWeight: FontWeight.bold,
+                fontWeight: FontWeight.bold,
-//               ),
+              ),
-//             ),
+            ),
-//           ),
+          ),
-//           const Spacer(),
+          const Spacer(),
-//           Container(
+          Container(
-//             child: const Icon(
+            child: const Icon(
-//               Icons.add_circle_outline,
+              Icons.add_circle_outline,
-//               color: Colors.grey,
+              color: Colors.grey,
-//               size: 24.0,
+              size: 24.0,
-//             ),
+            ),
-//           ),
+          ),
-//         ],
+        ],
-//       ),
+      ),
-//     ),
+    ),
-//   );
+  );
-// }
+}

lib/pages/roles_and_permission/model/roles_user_model.dart

@@ -42,9 +42,7 @@ class RolesUserModel {
       invitedBy:
           json['invitedBy'].toString().toLowerCase().replaceAll("_", " "),
       phoneNumber: json['phoneNumber'],
-      jobTitle: json['jobTitle'] == null || json['jobTitle'] == " "
+      jobTitle: json['jobTitle'] ?? "-",
-          ? "_"
-          : json['jobTitle'],
       createdDate: json['createdDate'],
       createdTime: json['createdTime'],
     );

lib/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart

@@ -79,14 +79,13 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   List<TreeNode> updatedCommunities = [];
   List<TreeNode> spacesNodes = [];
-  List<String> communityIds = []; 
+
   _onLoadCommunityAndSpaces(
       LoadCommunityAndSpacesEvent event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
       List<CommunityModel> communities =
           await CommunitySpaceManagementApi().fetchCommunities();
-      communityIds = communities.map((community) => community.uuid).toList();
       updatedCommunities = await Future.wait(
         communities.map((community) async {
           List<SpaceModel> spaces =
@@ -103,6 +102,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
         }).toList(),
       );
       emit(const SpacesLoadedState());
+      return updatedCommunities;
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
     }
@@ -177,6 +177,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     try {
       emit(UsersLoadingState());
       roles = await UserPermissionApi().fetchRoles();
+      //  add(PermissionEvent(roleUuid: roles.first.uuid));
       emit(RolePermissionInitial());
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
@@ -207,13 +208,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     return anyMatch;
   }
 
-  void _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
+  _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities)
+      List<String> selectedIds = getSelectedIds(updatedCommunities);
-          .where((id) => !communityIds.contains(id))
-          .toList();
-
       bool res = await UserPermissionApi().sendInviteUser(
         email: emailController.text,
         firstName: firstNameController.text,
@@ -221,10 +219,9 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
         lastName: lastNameController.text,
         phoneNumber: phoneController.text,
         roleUuid: roleSelected,
-        spaceUuids: selectedIds, 
+        spaceUuids: selectedIds,
       );
-
+      if (res == true) {
-      if (res) {
         showCustomDialog(
           barrierDismissible: false,
           context: event.context,
@@ -251,14 +248,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
   }
 
-
   _editInviteUser(EditInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities)
+      List<String> selectedIds = getSelectedIds(updatedCommunities);
-          .where((id) => !communityIds.contains(id)) 
-          .toList();
-
       bool res = await UserPermissionApi().editInviteUser(
         userId: event.userId,
         firstName: firstNameController.text,

lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart

@@ -218,7 +218,7 @@ class BasicsView extends StatelessWidget {
                       if (_blocRole.checkEmailValid != "Valid email") {
                         return _blocRole.checkEmailValid;
                       }
-                      // return null;
+                      return null;
                     },
                   ),
                 ),

lib/pages/roles_and_permission/users_page/add_user_dialog/view/popup_menu_filter.dart

@@ -81,7 +81,7 @@ Future<void> showPopUpFilterMenu({
                 ),
                 const Divider(),
                 const Text(
-                  "Filter by ",
+                  "Filter by Status",
                   style: TextStyle(fontWeight: FontWeight.bold),
                 ),
                 Container(

lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart

@@ -40,7 +40,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       roleTypes.clear();
       jobTitle.clear();
       createdBy.clear();
+      // deActivate.clear();
       users = await UserPermissionApi().fetchUsers();
+
       users.sort((a, b) {
         final dateA = _parseDateTime(a.createdDate);
         final dateB = _parseDateTime(b.createdDate);
@@ -55,12 +57,15 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       for (var user in users) {
         createdBy.add(user.invitedBy.toString());
       }
+      // for (var user in users) {
+      //   deActivate.add(user.status.toString());
+      // }
       initialUsers = List.from(users);
       roleTypes = roleTypes.toSet().toList();
       jobTitle = jobTitle.toSet().toList();
       createdBy = createdBy.toSet().toList();
+      // deActivate = deActivate.toSet().toList();
       _handlePageChange(ChangePage(1), emit);
-      add(ChangePage(currentPage));
       emit(UsersLoadedState(users: users));
     } catch (e) {
       emit(ErrorState(e.toString()));
@@ -120,10 +125,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
   void _toggleSortUsersByNameAsc(
       SortUsersByNameAsc event, Emitter<UserTableState> emit) {
-    selectedRoles.clear();
-    selectedJobTitles.clear();
-    selectedCreatedBy.clear();
-    selectedStatuses.clear();
     if (currentSortOrder == "Asc") {
       emit(UsersLoadingState());
       currentSortOrder = "";
@@ -142,16 +143,13 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
   void _toggleSortUsersByNameDesc(
       SortUsersByNameDesc event, Emitter<UserTableState> emit) {
-    selectedRoles.clear();
-    selectedJobTitles.clear();
-    selectedCreatedBy.clear();
-    selectedStatuses.clear();
     if (currentSortOrder == "Desc") {
       emit(UsersLoadingState());
       currentSortOrder = "";
-      users = List.from(initialUsers);
+      users = List.from(initialUsers); // Reset to saved initial state
       emit(UsersLoadedState(users: users));
     } else {
+      // Sort descending
       emit(UsersLoadingState());
       currentSortOrder = "Desc";
       users.sort((a, b) => b.firstName!.compareTo(a.firstName!));
@@ -161,10 +159,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
   void _toggleSortUsersByDateNewestToOldest(
       DateNewestToOldestEvent event, Emitter<UserTableState> emit) {
-    selectedRoles.clear();
-    selectedJobTitles.clear();
-    selectedCreatedBy.clear();
-    selectedStatuses.clear();
     if (currentSortOrderDate == "NewestToOldest") {
       emit(UsersLoadingState());
       currentSortOrder = "";
@@ -185,10 +179,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
   void _toggleSortUsersByDateOldestToNewest(
       DateOldestToNewestEvent event, Emitter<UserTableState> emit) {
-    selectedRoles.clear();
-    selectedJobTitles.clear();
-    selectedCreatedBy.clear();
-    selectedStatuses.clear();
     if (currentSortOrderDate == "OldestToNewest") {
       emit(UsersLoadingState());
       currentSortOrder = "";
@@ -347,20 +337,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
     final filteredUsers = initialUsers.where((user) {
       if (selectedStatuses.isEmpty) return true;
-
+      return selectedStatuses.contains(user.status);
-      return selectedStatuses.any((status) {
-        final userStatus = user.status?.toLowerCase() ?? '';
-        switch (status.toLowerCase()) {
-          case 'active':
-            return user.isEnabled == true && userStatus != 'invited';
-          case 'disabled':
-            return user.isEnabled == false;
-          case 'invited':
-            return userStatus == 'invited';
-          default:
-            return false;
-        }
-      });
     }).toList();
     if (event.sortOrder == "Asc") {
       currentSortOrder = "Asc";
@@ -374,11 +351,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else {
       currentSortOrder = "";
     }
-
     emit(UsersLoadedState(users: filteredUsers));
   }
 
-
   void _resetAllFilters(Emitter<UserTableState> emit) {
     selectedRoles.clear();
     selectedJobTitles.clear();

lib/pages/roles_and_permission/users_page/users_table/view/creation_date_filter.dart

@@ -12,7 +12,7 @@ Future<void> showDateFilterMenu({
       Overlay.of(context).context.findRenderObject() as RenderBox;
   final RelativeRect position = RelativeRect.fromRect(
     Rect.fromLTRB(
-      overlay.size.width / 3,
+      overlay.size.width / 2,
       240,
       0,
       overlay.size.height,
@@ -40,6 +40,7 @@ Future<void> showDateFilterMenu({
           ),
           title: Text(
             "Sort from newest to oldest",
+            // style: context.textTheme.bodyMedium,
             style: TextStyle(
                 color: isSelected == "NewestToOldest"
                     ? Colors.black
@@ -64,5 +65,9 @@ Future<void> showDateFilterMenu({
         ),
       ),
     ],
-  ).then((value) {});
+  ).then((value) {
+    // setState(() {
+    //   _isDropdownOpen = false;
+    // });
+  });
 }

lib/pages/roles_and_permission/users_page/users_table/view/de_activate_filter.dart

@@ -40,6 +40,7 @@ Future<void> showDeActivateFilterMenu({
           ),
           title: Text(
             "Sort A to Z",
+            // style: context.textTheme.bodyMedium,
             style: TextStyle(
                 color: isSelected == "NewestToOldest"
                     ? Colors.black
@@ -64,5 +65,9 @@ Future<void> showDeActivateFilterMenu({
         ),
       ),
     ],
-  ).then((value) {});
+  ).then((value) {
+    // setState(() {
+    //   _isDropdownOpen = false;
+    // });
+  });
 }

lib/pages/roles_and_permission/users_page/users_table/view/name_filter.dart

@@ -12,7 +12,7 @@ Future<void> showNameMenu({
       Overlay.of(context).context.findRenderObject() as RenderBox;
   final RelativeRect position = RelativeRect.fromRect(
     Rect.fromLTRB(
-      overlay.size.width / 35,
+      overlay.size.width / 25,
       240,
       0,
       overlay.size.height,
@@ -40,6 +40,7 @@ Future<void> showNameMenu({
           ),
           title: Text(
             "Sort A to Z",
+            // style: context.textTheme.bodyMedium,
             style: TextStyle(
                 color: isSelected == "Asc" ? Colors.black : Colors.blueGrey),
           ),
@@ -60,5 +61,9 @@ Future<void> showNameMenu({
         ),
       ),
     ],
-  ).then((value) {});
+  ).then((value) {
+    // setState(() {
+    //   _isDropdownOpen = false;
+    // });
+  });
 }

lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart

@@ -1,264 +1,260 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/style.dart';
 
-class _HeaderColumn extends StatelessWidget {
-  final String title;
-  final double width;
-  final bool showFilter;
-  final VoidCallback? onFilter;
-  final Function(double) onResize;
-
-  const _HeaderColumn({
-    required this.title,
-    required this.width,
-    required this.showFilter,
-    required this.onResize,
-    this.onFilter,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return MouseRegion(
-      cursor: SystemMouseCursors.resizeColumn,
-      child: GestureDetector(
-        onHorizontalDragUpdate: (details) => onResize(details.delta.dx),
-        child: Container(
-          width: width,
-          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-          decoration: const BoxDecoration(
-            border: Border(right: BorderSide(color: ColorsManager.boxDivider)),
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Expanded(
-                child: Text(
-                  title,
-                  maxLines: 2,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    fontWeight: FontWeight.w400,
-                    fontSize: 13,
-                    color: ColorsManager.grayColor,
-                  ),
-                ),
-              ),
-              if (showFilter)
-                IconButton(
-                  icon: SvgPicture.asset(Assets.filterTableIcon),
-                  onPressed: onFilter,
-                  padding: EdgeInsets.zero,
-                  constraints: const BoxConstraints(),
-                ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _TableRow extends StatelessWidget {
-  final List<Widget> cells;
-  final List<double> columnWidths;
-  final bool isLast;
-
-  const _TableRow({
-    required this.cells,
-    required this.columnWidths,
-    required this.isLast,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Row(
-          children: [
-            for (int i = 0; i < cells.length; i++)
-              Container(
-                width: columnWidths[i],
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-                // decoration: BoxDecoration(
-                //   border: Border(
-                //     right: BorderSide(color: ColorsManager.boxDivider),
-                //   ),
-                // ),
-                child: cells[i],
-              ),
-          ],
-        ),
-        if (!isLast)
-          Divider(
-            height: 1,
-            thickness: 1,
-            color: ColorsManager.boxDivider,
-          ),
-      ],
-    );
-  }
-}
-//===========================================================================
-
 class DynamicTableScreen extends StatefulWidget {
   final List<String> titles;
   final List<List<Widget>> rows;
   final void Function(int columnIndex)? onFilter;
 
-  const DynamicTableScreen({
+  DynamicTableScreen(
-    required this.titles,
+      {required this.titles, required this.rows, required this.onFilter});
-    required this.rows,
-    required this.onFilter,
-    Key? key,
-  }) : super(key: key);
 
   @override
   _DynamicTableScreenState createState() => _DynamicTableScreenState();
 }
 
-class _DynamicTableScreenState extends State<DynamicTableScreen> {
+class _DynamicTableScreenState extends State<DynamicTableScreen>
+    with WidgetsBindingObserver {
   late List<double> columnWidths;
-  final double _minColumnWidth = 100.0;
+  late double totalWidth;
-  final double _maxColumnWidth = 300.0;
-  final double _dividerWidth = 1.0;
-  double _lastAvailableWidth = 0;
 
   @override
   void initState() {
     super.initState();
-    columnWidths = List.filled(widget.titles.length, _minColumnWidth);
+    columnWidths = List<double>.filled(widget.titles.length, 150.0);
+    totalWidth = columnWidths.reduce((a, b) => a + b);
+    WidgetsBinding.instance.addObserver(this);
   }
 
-  void _handleColumnResize(int index, double delta) {
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeMetrics() {
+    super.didChangeMetrics();
+    final newScreenWidth = MediaQuery.of(context).size.width;
     setState(() {
-      double newWidth = columnWidths[index] + delta;
+      columnWidths = List<double>.generate(widget.titles.length, (index) {
-      newWidth = newWidth.clamp(_minColumnWidth, _maxColumnWidth);
+        if (index == 1) {
-      double actualDelta = newWidth - columnWidths[index];
+          return newScreenWidth *
-      if (actualDelta == 0) return;
+              0.12; // 20% of screen width for the second column
-
+        } else if (index == 9) {
-      int nextIndex = (index + 1) % columnWidths.length;
+          return newScreenWidth *
-      columnWidths[index] = newWidth;
+              0.1; // 25% of screen width for the tenth column
-      columnWidths[nextIndex] = (columnWidths[nextIndex] - actualDelta)
+        }
-          .clamp(_minColumnWidth, _maxColumnWidth);
+        return newScreenWidth *
+            0.09; // Default to 10% of screen width for other columns
+      });
     });
   }
 
-  Widget _buildHeader() {
-    return Container(
-      decoration: containerDecoration.copyWith(
-        color: ColorsManager.circleRolesBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(15),
-          topRight: Radius.circular(15),
-        ),
-      ),
-      child: Row(
-        children: [
-          for (int i = 0; i < widget.titles.length; i++)
-            _HeaderColumn(
-              title: widget.titles[i],
-              width: columnWidths[i],
-              showFilter: i != 1 && i != 9 && i != 8 && i != 5,
-              onFilter: () => widget.onFilter?.call(i),
-              onResize: (delta) => _handleColumnResize(i, delta),
-            ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildBody() {
-    if (widget.rows.isEmpty) {
-      return SizedBox(
-        height: 300,
-        child: Center(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              SvgPicture.asset(Assets.emptyTable),
-              const SizedBox(height: 15),
-              const Text(
-                'No Users',
-                style: TextStyle(
-                  color: ColorsManager.lightGrayColor,
-                  fontSize: 16,
-                  fontWeight: FontWeight.w700,
-                ),
-              ),
-            ],
-          ),
-        ),
-      );
-    }
-
-    return Container(
-      decoration: containerDecoration.copyWith(
-        color: ColorsManager.whiteColors,
-        borderRadius: const BorderRadius.only(
-          bottomLeft: Radius.circular(15),
-          bottomRight: Radius.circular(15),
-        ),
-      ),
-      child: Column(
-        children: [
-          for (int rowIndex = 0; rowIndex < widget.rows.length; rowIndex++)
-            _TableRow(
-              cells: widget.rows[rowIndex],
-              columnWidths: columnWidths,
-              isLast: rowIndex == widget.rows.length - 1,
-            ),
-        ],
-      ),
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(
+    final screenWidth = MediaQuery.of(context).size.width;
-      builder: (context, constraints) {
+    if (columnWidths.every((width) => width == screenWidth * 7)) {
-        final availableWidth = constraints.maxWidth;
+      columnWidths = List<double>.generate(widget.titles.length, (index) {
-        final totalDividersWidth = (widget.titles.length - 1) * _dividerWidth;
+        if (index == 1) {
-
+          return screenWidth * 0.11;
-        if (_lastAvailableWidth != availableWidth) {
+        } else if (index == 9) {
-          final equalWidth =
+          return screenWidth * 0.1;
-              (availableWidth - totalDividersWidth) / widget.titles.length;
-          final clampedWidth =
-              equalWidth.clamp(_minColumnWidth, _maxColumnWidth);
-
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            setState(() {
-              columnWidths = List.filled(widget.titles.length, clampedWidth);
-              _lastAvailableWidth = availableWidth;
-            });
-          });
         }
-
+        return screenWidth * 0.09;
-        final totalTableWidth =
+      });
-            columnWidths.fold(0.0, (sum, w) => sum + w) + totalDividersWidth;
+      setState(() {});
-        return SingleChildScrollView(
+    }
-          scrollDirection: Axis.horizontal,
+    return SingleChildScrollView(
-          child: Container(
+      clipBehavior: Clip.none,
-            width: totalTableWidth,
+      scrollDirection: Axis.horizontal,
-            decoration: containerDecoration.copyWith(
+      child: Container(
-              color: ColorsManager.whiteColors,
+        decoration: containerDecoration.copyWith(
-              borderRadius: const BorderRadius.all(Radius.circular(20)),
+            color: ColorsManager.whiteColors,
-            ),
+            borderRadius: const BorderRadius.all(Radius.circular(20))),
-            child: Column(
+        child: FittedBox(
-              crossAxisAlignment: CrossAxisAlignment.start,
+          child: Column(
-              children: [
+            children: [
-                _buildHeader(),
+              Container(
-                _buildBody(),
+                width: totalWidth,
-              ],
+                decoration: containerDecoration.copyWith(
-            ),
+                    color: ColorsManager.circleRolesBackground,
+                    borderRadius: const BorderRadius.only(
+                        topLeft: Radius.circular(15),
+                        topRight: Radius.circular(15))),
+                child: Row(
+                  children: List.generate(widget.titles.length, (index) {
+                    return Row(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      children: [
+                        FittedBox(
+                          child: Container(
+                            padding: const EdgeInsets.only(left: 5, right: 5),
+                            width: columnWidths[index],
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                SizedBox(
+                                  child: Text(
+                                    widget.titles[index],
+                                    maxLines: 2,
+                                    style: const TextStyle(
+                                      overflow: TextOverflow.ellipsis,
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 13,
+                                      color: ColorsManager.grayColor,
+                                    ),
+                                  ),
+                                ),
+                                if (index != 1 &&
+                                    index != 9 &&
+                                    index != 8 &&
+                                    index != 5)
+                                  FittedBox(
+                                    child: IconButton(
+                                      icon: SvgPicture.asset(
+                                        Assets.filterTableIcon,
+                                        fit: BoxFit.none,
+                                      ),
+                                      onPressed: () {
+                                        if (widget.onFilter != null) {
+                                          widget.onFilter!(index);
+                                        }
+                                      },
+                                    ),
+                                  )
+                              ],
+                            ),
+                          ),
+                        ),
+                        GestureDetector(
+                          onHorizontalDragUpdate: (details) {
+                            setState(() {
+                              columnWidths[index] =
+                                  (columnWidths[index] + details.delta.dx)
+                                      .clamp(150.0, 300.0);
+                              totalWidth = columnWidths.reduce((a, b) => a + b);
+                            });
+                          },
+                          child: MouseRegion(
+                            cursor: SystemMouseCursors.resizeColumn,
+                            child: Container(
+                              color: Colors.green,
+                              child: Container(
+                                color: ColorsManager.boxDivider,
+                                width: 1,
+                                height: 50,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    );
+                  }),
+                ),
+              ),
+              widget.rows.isEmpty
+                  ? SizedBox(
+                      height: MediaQuery.of(context).size.height / 2,
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Column(
+                            children: [
+                              SvgPicture.asset(Assets.emptyTable),
+                              const SizedBox(
+                                height: 15,
+                              ),
+                              const Text(
+                                'No Users',
+                                style: TextStyle(
+                                    color: ColorsManager.lightGrayColor,
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.w700),
+                              )
+                            ],
+                          ),
+                        ],
+                      ),
+                    )
+                  : Center(
+                      child: Container(
+                        width: totalWidth,
+                        decoration: containerDecoration.copyWith(
+                            color: ColorsManager.whiteColors,
+                            borderRadius: const BorderRadius.only(
+                                bottomLeft: Radius.circular(15),
+                                bottomRight: Radius.circular(15))),
+                        child: ListView.builder(
+                          physics: const NeverScrollableScrollPhysics(),
+                          shrinkWrap: true,
+                          itemCount: widget.rows.length,
+                          itemBuilder: (context, rowIndex) {
+                            if (columnWidths.every((width) => width == 120.0)) {
+                              columnWidths = List<double>.generate(
+                                  widget.titles.length, (index) {
+                                if (index == 1) {
+                                  return screenWidth * 0.11;
+                                } else if (index == 9) {
+                                  return screenWidth * 0.2;
+                                }
+                                return screenWidth * 0.11;
+                              });
+                              setState(() {});
+                            }
+                            final row = widget.rows[rowIndex];
+                            return Column(
+                              children: [
+                                Container(
+                                  child: Padding(
+                                    padding: const EdgeInsets.only(
+                                        left: 5, top: 10, right: 5, bottom: 10),
+                                    child: Row(
+                                      children:
+                                          List.generate(row.length, (index) {
+                                        return SizedBox(
+                                          width: columnWidths[index],
+                                          child: SizedBox(
+                                            child: Padding(
+                                              padding: const EdgeInsets.only(
+                                                  left: 15, right: 10),
+                                              child: row[index],
+                                            ),
+                                          ),
+                                        );
+                                      }),
+                                    ),
+                                  ),
+                                ),
+                                if (rowIndex < widget.rows.length - 1)
+                                  Row(
+                                    children: List.generate(
+                                        widget.titles.length, (index) {
+                                      return SizedBox(
+                                        width: columnWidths[index],
+                                        child: const Divider(
+                                          color: ColorsManager.boxDivider,
+                                          thickness: 1,
+                                          height: 1,
+                                        ),
+                                      );
+                                    }),
+                                  ),
+                              ],
+                            );
+                          },
+                        ),
+                      ),
+                    ),
+            ],
           ),
-        );
+        ),
-      },
+      ),
     );
   }
 }

lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart

@@ -108,6 +108,7 @@ class UsersPage extends StatelessWidget {
         final screenSize = MediaQuery.of(context).size;
         final _blocRole = BlocProvider.of<UserTableBloc>(context);
         if (state is UsersLoadingState) {
+          _blocRole.add(ChangePage(_blocRole.currentPage));
           return const Center(child: CircularProgressIndicator());
         } else if (state is UsersLoadedState) {
           return Padding(
@@ -214,7 +215,7 @@ class UsersPage extends StatelessWidget {
 
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
-                            overlay.size.width / 5.3,
+                            overlay.size.width / 4,
                             240,
                             overlay.size.width / 4,
                             0,
@@ -224,7 +225,6 @@ class UsersPage extends StatelessWidget {
                           checkboxStates: checkboxStates,
                           isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
-                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
@@ -265,7 +265,6 @@ class UsersPage extends StatelessWidget {
                           checkboxStates: checkboxStates,
                           isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
-                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
@@ -321,7 +320,6 @@ class UsersPage extends StatelessWidget {
                           checkboxStates: checkboxStates,
                           isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
-                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
@@ -345,7 +343,6 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.status)
                             item: _blocRole.selectedStatuses.contains(item),
                         };
-
                         final RenderBox overlay = Overlay.of(context)
                             .context
                             .findRenderObject() as RenderBox;
@@ -353,7 +350,7 @@ class UsersPage extends StatelessWidget {
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 0,
                             240,
-                            overlay.size.width / 5,
+                            overlay.size.width / 4,
                             0,
                           ),
                           list: _blocRole.status,
@@ -361,8 +358,8 @@ class UsersPage extends StatelessWidget {
                           checkboxStates: checkboxStates,
                           isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
-                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
+
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
                                 .map((entry) => entry.key)
@@ -413,7 +410,7 @@ class UsersPage extends StatelessWidget {
                       return [
                         Text('${user.firstName} ${user.lastName}'),
                         Text(user.email),
-                        Text(user.jobTitle),
+                        Text(user.jobTitle ?? '-'),
                         Text(user.roleType ?? ''),
                         Text(user.createdDate ?? ''),
                         Text(user.createdTime ?? ''),
@@ -430,6 +427,11 @@ class UsersPage extends StatelessWidget {
                           userId: user.uuid,
                           onTap: user.status != "invited"
                               ? () {
+                                  // final newStatus = user.status == 'active'
+                                  //     ? 'disabled'
+                                  //     : user.status == 'disabled'
+                                  //         ? 'invited'
+                                  //         : 'active';
                                   context.read<UserTableBloc>().add(
                                       ChangeUserStatus(
                                           userId: user.uuid,
@@ -441,6 +443,10 @@ class UsersPage extends StatelessWidget {
                         ),
                         Row(
                           children: [
+                            // actionButton(
+                            //   title: "Activity Log",
+                            //   onTap: () {},
+                            // ),
                             actionButton(
                               title: "Edit",
                               onTap: () {
@@ -481,7 +487,9 @@ class UsersPage extends StatelessWidget {
                                   },
                                 ).then((v) {
                                   if (v != null) {
-                                    _blocRole.add(const GetUsers());
+                                    if (v != null) {
+                                      _blocRole.add(const GetUsers());
+                                    }
                                   }
                                 });
                               },

lib/pages/routiens/bloc/effective_period/effect_period_bloc.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_event.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_event.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_state.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_state.dart';
 import 'package:syncrow_web/utils/constants/app_enum.dart';
 
 class EffectPeriodBloc extends Bloc<EffectPeriodEvent, EffectPeriodState> {

lib/pages/routiens/bloc/effective_period/effect_period_event.dart

@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
+import 'package:syncrow_web/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/utils/constants/app_enum.dart';
 
 abstract class EffectPeriodEvent extends Equatable {

lib/pages/routiens/bloc/functions_bloc/functions_bloc_bloc.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
 
 part 'functions_bloc_event.dart';
 part 'functions_bloc_state.dart';
@@ -26,7 +26,8 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
         functionCode: event.functionData.functionCode,
         operationName: event.functionData.operationName,
         value: event.functionData.value ?? existingData.value,
-        valueDescription: event.functionData.valueDescription ?? existingData.valueDescription,
+        valueDescription: event.functionData.valueDescription ??
+            existingData.valueDescription,
         condition: event.functionData.condition ?? existingData.condition,
       );
     } else {
@@ -58,8 +59,10 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
     );
   }
 
-  FutureOr<void> _onSelectFunction(SelectFunction event, Emitter<FunctionBlocState> emit) {
+  FutureOr<void> _onSelectFunction(
+      SelectFunction event, Emitter<FunctionBlocState> emit) {
     emit(state.copyWith(
-        selectedFunction: event.functionCode, selectedOperationName: event.operationName));
+        selectedFunction: event.functionCode,
+        selectedOperationName: event.operationName));
   }
 }

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

@@ -4,12 +4,12 @@ import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
+import 'package:syncrow_web/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart';
-import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_scene_model.dart';
+import 'package:syncrow_web/pages/routiens/models/create_scene_and_autoamtion/create_scene_model.dart';
-import 'package:syncrow_web/pages/routines/models/delay/delay_fucntions.dart';
+import 'package:syncrow_web/pages/routiens/models/delay/delay_fucntions.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/models/routine_details_model.dart';
+import 'package:syncrow_web/pages/routiens/models/routine_details_model.dart';
-import 'package:syncrow_web/pages/routines/models/routine_model.dart';
+import 'package:syncrow_web/pages/routiens/models/routine_model.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 import 'package:syncrow_web/services/routines_api.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -19,8 +19,8 @@ import 'package:uuid/uuid.dart';
 part 'routine_event.dart';
 part 'routine_state.dart';
 
-String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+const spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+const communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
 
 class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   RoutineBloc() : super(const RoutineState()) {
@@ -57,8 +57,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
-      add(LoadScenes(spaceId, communityId));
+      add(const LoadScenes(spaceId, communityId));
-      add(LoadAutomation(spaceId));
+      add(const LoadAutomation(spaceId));
     }
   }
 
@@ -156,25 +156,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(isLoading: true, errorMessage: null));
 
     try {
-      spaceId = event.spaceId;
+      final scenes = await SceneApi.getScenesByUnitId(event.unitId, event.communityId);
-      communityId = event.communityId;
-
-      List<ScenesModel> scenes = [];
-
-      if (communityId.isNotEmpty && spaceId.isNotEmpty) {
-        scenes = await SceneApi.getScenes(event.spaceId, event.communityId);
-      }
       emit(state.copyWith(
         scenes: scenes,
         isLoading: false,
       ));
     } catch (e) {
       emit(state.copyWith(
-          isLoading: false,
+        isLoading: false,
-          loadScenesErrorMessage: 'Failed to load scenes',
+        loadScenesErrorMessage: 'Failed to load scenes',
-          errorMessage: '',
+        errorMessage: '',
-          loadAutomationErrorMessage: '',
+        loadAutomationErrorMessage: '',
-          scenes: []));
+      ));
     }
   }
 
@@ -182,22 +175,27 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(isLoading: true, errorMessage: null));
 
     try {
-      spaceId = event.spaceId;
+      final automations = await SceneApi.getAutomationByUnitId(event.unitId);
-      List<ScenesModel> automations = [];
+      if (automations.isNotEmpty) {
-      if (spaceId.isNotEmpty) {
+        emit(state.copyWith(
-        automations = await SceneApi.getAutomation(event.spaceId);
+          automations: automations,
-      }
+          isLoading: false,
-      emit(state.copyWith(
+        ));
-        automations: automations,
+      } else {
-        isLoading: false,
+        emit(state.copyWith(
-      ));
-    } catch (e) {
-      emit(state.copyWith(
           isLoading: false,
           loadAutomationErrorMessage: 'Failed to load automations',
           errorMessage: '',
           loadScenesErrorMessage: '',
-          automations: []));
+        ));
+      }
+    } catch (e) {
+      emit(state.copyWith(
+        isLoading: false,
+        loadAutomationErrorMessage: 'Failed to load automations',
+        errorMessage: '',
+        loadScenesErrorMessage: '',
+      ));
     }
   }
 
@@ -292,8 +290,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final result = await SceneApi.createScene(createSceneModel);
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes(spaceId, communityId));
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation(spaceId));
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -421,8 +419,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final result = await SceneApi.createAutomation(createAutomationModel);
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation(spaceId));
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes(spaceId, communityId));
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -787,8 +785,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         SceneApi.deleteAutomation(unitUuid: spaceId, automationId: state.automationId ?? '');
       }
 
-      add(LoadScenes(spaceId, communityId));
+      add(const LoadScenes(spaceId, communityId));
-      add(LoadAutomation(spaceId));
+      add(const LoadAutomation(spaceId));
       add(ResetRoutineState());
       emit(state.copyWith(isLoading: false, createRoutineView: false));
     } catch (e) {
@@ -816,7 +814,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
-      final devices = await DevicesManagementApi().fetchDevices(communityId, spaceId);
+      final devices = await DevicesManagementApi().fetchDevices();
 
       emit(state.copyWith(isLoading: false, devices: devices));
     } catch (e) {
@@ -894,8 +892,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes(spaceId, communityId));
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation(spaceId));
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -1023,8 +1021,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation(spaceId));
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes(spaceId, communityId));
       } else {
         emit(state.copyWith(
           isLoading: false,

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

@@ -27,22 +27,22 @@ class AddToThenContainer extends RoutineEvent {
 }
 
 class LoadScenes extends RoutineEvent {
-  final String spaceId;
+  final String unitId;
   final String communityId;
 
-  const LoadScenes(this.spaceId, this.communityId);
+  const LoadScenes(this.unitId, this.communityId);
 
   @override
-  List<Object> get props => [spaceId, communityId];
+  List<Object> get props => [unitId, communityId];
 }
 
 class LoadAutomation extends RoutineEvent {
-  final String spaceId;
+  final String unitId;
 
-  const LoadAutomation(this.spaceId);
+  const LoadAutomation(this.unitId);
 
   @override
-  List<Object> get props => [spaceId];
+  List<Object> get props => [unitId];
 }
 
 class AddFunctionToRoutine extends RoutineEvent {

lib/pages/routiens/bloc/setting_bloc/setting_bloc.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/setting_bloc/setting_event.dart';
+import 'package:syncrow_web/pages/routiens/bloc/setting_bloc/setting_event.dart';
-import 'package:syncrow_web/pages/routines/bloc/setting_bloc/setting_state.dart';
+import 'package:syncrow_web/pages/routiens/bloc/setting_bloc/setting_state.dart';
-import 'package:syncrow_web/pages/routines/models/icon_model.dart';
+import 'package:syncrow_web/pages/routiens/models/icon_model.dart';
 import 'package:syncrow_web/services/routines_api.dart';
 
 class SettingBloc extends Bloc<SettingEvent, SettingState> {

lib/pages/routiens/bloc/setting_bloc/setting_state.dart

@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/routines/models/icon_model.dart';
+import 'package:syncrow_web/pages/routiens/models/icon_model.dart';
 
 abstract class SettingState extends Equatable {
   const SettingState();

lib/pages/routiens/helper/dialog_helper/device_dialog_helper.dart

@@ -0,0 +1,85 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/ac_dialog.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/one_gang_switch_dialog.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/three_gang_switch_dialog.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/two_gang_switch_dialog.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
+
+class DeviceDialogHelper {
+  static Future<Map<String, dynamic>?> showDeviceDialog(
+    BuildContext context,
+    Map<String, dynamic> data, {
+    required bool removeComparetors,
+  }) async {
+    final functions = data['functions'] as List<DeviceFunction>;
+
+    try {
+      final result = await _getDialogForDeviceType(
+        context,
+        data['productType'],
+        data,
+        functions,
+        removeComparetors: removeComparetors,
+      );
+
+      if (result != null) {
+        return result;
+      }
+    } catch (e) {
+      debugPrint('Error: $e');
+    }
+
+    return null;
+  }
+
+  static Future<Map<String, dynamic>?> _getDialogForDeviceType(
+      BuildContext context,
+      String productType,
+      Map<String, dynamic> data,
+      List<DeviceFunction> functions,
+      {required bool removeComparetors}) async {
+    final routineBloc = context.read<RoutineBloc>();
+    final deviceSelectedFunctions =
+        routineBloc.state.selectedFunctions[data['uniqueCustomId']] ?? [];
+
+    switch (productType) {
+      case 'AC':
+        return ACHelper.showACFunctionsDialog(
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
+
+      case '1G':
+        return OneGangSwitchHelper.showSwitchFunctionsDialog(
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
+      case '2G':
+        return TwoGangSwitchHelper.showSwitchFunctionsDialog(
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
+      case '3G':
+        return ThreeGangSwitchHelper.showSwitchFunctionsDialog(
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
+      default:
+        return null;
+    }
+  }
+}

lib/pages/routiens/helper/save_routine_helper.dart

@@ -3,9 +3,9 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_footer.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';

lib/pages/routiens/models/ac/ac_function.dart

@@ -1,6 +1,6 @@
 import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
-import 'package:syncrow_web/pages/routines/models/ac/ac_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/ac/ac_operational_value.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
 import 'package:syncrow_web/utils/constants/app_enum.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 

lib/pages/routiens/models/delay/delay_fucntions.dart

@@ -1,5 +1,5 @@
-import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/base_switch_function.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class DelayFunction extends BaseSwitchFunction {

lib/pages/routiens/models/gang_switches/base_switch_function.dart

@@ -1,5 +1,5 @@
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/switch_operational_value.dart';
 
 abstract class BaseSwitchFunction extends DeviceFunction<bool> {
   BaseSwitchFunction({

lib/pages/routiens/models/gang_switches/one_gang_switch/one_gang_switch.dart

@@ -1,5 +1,5 @@
-import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/base_switch_function.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class OneGangSwitchFunction extends BaseSwitchFunction {

lib/pages/routiens/models/gang_switches/three_gang_switch/three_gang_switch.dart

@@ -1,5 +1,5 @@
-import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/base_switch_function.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class ThreeGangSwitch1Function extends BaseSwitchFunction {
@@ -26,7 +26,8 @@ class ThreeGangSwitch1Function extends BaseSwitchFunction {
 }
 
 class ThreeGangCountdown1Function extends BaseSwitchFunction {
-  ThreeGangCountdown1Function({required super.deviceId, required super.deviceName})
+  ThreeGangCountdown1Function(
+      {required super.deviceId, required super.deviceName})
       : super(
           code: 'countdown_1',
           operationName: 'Light 1 Countdown',
@@ -70,7 +71,8 @@ class ThreeGangSwitch2Function extends BaseSwitchFunction {
 }
 
 class ThreeGangCountdown2Function extends BaseSwitchFunction {
-  ThreeGangCountdown2Function({required super.deviceId, required super.deviceName})
+  ThreeGangCountdown2Function(
+      {required super.deviceId, required super.deviceName})
       : super(
           code: 'countdown_2',
           operationName: 'Light 2 Countdown',
@@ -114,7 +116,8 @@ class ThreeGangSwitch3Function extends BaseSwitchFunction {
 }
 
 class ThreeGangCountdown3Function extends BaseSwitchFunction {
-  ThreeGangCountdown3Function({required super.deviceId, required super.deviceName})
+  ThreeGangCountdown3Function(
+      {required super.deviceId, required super.deviceName})
       : super(
           code: 'countdown_3',
           operationName: 'Light 3 Countdown',

lib/pages/routiens/models/gang_switches/two_gang_switch/two_gang_switch.dart

@@ -1,5 +1,5 @@
-import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/base_switch_function.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class TwoGangSwitch1Function extends BaseSwitchFunction {
@@ -49,7 +49,8 @@ class TwoGangSwitch2Function extends BaseSwitchFunction {
 }
 
 class TwoGangCountdown1Function extends BaseSwitchFunction {
-  TwoGangCountdown1Function({required super.deviceId, required super.deviceName})
+  TwoGangCountdown1Function(
+      {required super.deviceId, required super.deviceName})
       : super(
           code: 'countdown_1',
           operationName: 'Light 1 Countdown',
@@ -70,7 +71,8 @@ class TwoGangCountdown1Function extends BaseSwitchFunction {
 }
 
 class TwoGangCountdown2Function extends BaseSwitchFunction {
-  TwoGangCountdown2Function({required super.deviceId, required super.deviceName})
+  TwoGangCountdown2Function(
+      {required super.deviceId, required super.deviceName})
       : super(
           code: 'countdown_2',
           operationName: 'Light 2 Countdown',

lib/pages/routiens/models/routine_details_model.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
+import 'package:syncrow_web/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart';
-import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_scene_model.dart';
+import 'package:syncrow_web/pages/routiens/models/create_scene_and_autoamtion/create_scene_model.dart';
 
 class RoutineDetailsModel {
   final String spaceUuid;

lib/pages/routiens/view/create_new_routine_view.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/routines/widgets/conditions_routines_devices_view.dart';
+import 'package:syncrow_web/pages/routiens/widgets/conditions_routines_devices_view.dart';
-import 'package:syncrow_web/pages/routines/widgets/if_container.dart';
+import 'package:syncrow_web/pages/routiens/widgets/if_container.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_search_and_buttons.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_search_and_buttons.dart';
-import 'package:syncrow_web/pages/routines/widgets/then_container.dart';
+import 'package:syncrow_web/pages/routiens/widgets/then_container.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CreateNewRoutineView extends StatelessWidget {
@@ -68,7 +68,7 @@ class CreateNewRoutineView extends StatelessWidget {
                         width: double.infinity,
                         color: ColorsManager.dialogBlueTitle,
                       ),
-
+    
                       /// THEN Container
                       Expanded(
                         child: Card(

lib/pages/routiens/view/effective_period_view.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/effictive_period_dialog.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/effictive_period_dialog.dart';
-import 'package:syncrow_web/pages/routines/widgets/period_option.dart';
+import 'package:syncrow_web/pages/routiens/widgets/period_option.dart';
-import 'package:syncrow_web/pages/routines/widgets/repeat_days.dart';
+import 'package:syncrow_web/pages/routiens/widgets/repeat_days.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class EffectivePeriodView extends StatelessWidget {

lib/pages/routiens/view/routines_view.dart

@@ -0,0 +1,69 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_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';
+import 'package:syncrow_web/pages/routiens/widgets/main_routine_view/routine_view_card.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class RoutinesView extends StatefulWidget {
+  const RoutinesView({super.key});
+
+  @override
+  State<RoutinesView> createState() => _RoutinesViewState();
+}
+
+class _RoutinesViewState extends State<RoutinesView> {
+  @override
+  void initState() {
+    super.initState();
+    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<RoutineBloc, RoutineState>(
+      builder: (context, state) {
+        if (state.createRoutineView) {
+          return const CreateNewRoutineView();
+        }
+        return Padding(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              Text(
+                "Create New Routines",
+                style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                      color: ColorsManager.grayColor,
+                      fontWeight: FontWeight.bold,
+                    ),
+              ),
+              const SizedBox(
+                height: 10,
+              ),
+              RoutineViewCard(
+                onTap: () {
+                  context.read<RoutineBloc>().add(
+                        (ResetRoutineState()),
+                      );
+                  BlocProvider.of<RoutineBloc>(context).add(
+                    const CreateNewRoutineViewEvent(createRoutineView: true),
+                  );
+                },
+                icon: Icons.add,
+                textString: '',
+              ),
+              const SizedBox(
+                height: 15,
+              ),
+              const Expanded(child: FetchRoutineScenesAutomation()),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}

lib/pages/routiens/widgets/conditions_routines_devices_view.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dragable_card.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_devices.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_devices.dart';
-import 'package:syncrow_web/pages/routines/widgets/routines_title_widget.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routines_title_widget.dart';
-import 'package:syncrow_web/pages/routines/widgets/scenes_and_automations.dart';
+import 'package:syncrow_web/pages/routiens/widgets/scenes_and_automations.dart';
-import 'package:syncrow_web/pages/routines/widgets/search_bar_condition_title.dart';
+import 'package:syncrow_web/pages/routiens/widgets/search_bar_condition_title.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class ConditionsRoutinesDevicesView extends StatelessWidget {

lib/pages/routiens/widgets/delete_scene.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/custom_dialog.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class DeleteSceneWidget extends StatelessWidget {

lib/pages/routiens/widgets/dragable_card.dart

@@ -3,8 +3,8 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 

lib/pages/routiens/widgets/if_container.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/helper/dialog_helper/device_dialog_helper.dart';
+import 'package:syncrow_web/pages/routiens/helper/dialog_helper/device_dialog_helper.dart';
-import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dragable_card.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';
@@ -26,7 +26,9 @@ class IfContainer extends StatelessWidget {
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      const Text('IF', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+                      const Text('IF',
+                          style: TextStyle(
+                              fontSize: 18, fontWeight: FontWeight.bold)),
                       if (state.isAutomation && state.ifItems.isNotEmpty)
                         AutomationOperatorSelector(
                             selectedOperator: state.selectedAutomationOperator),
@@ -53,34 +55,44 @@ class IfContainer extends StatelessWidget {
                           (index) => GestureDetector(
                                 onTap: () async {
                                   if (!state.isTabToRun) {
-                                    final result = await DeviceDialogHelper.showDeviceDialog(
+                                    final result = await DeviceDialogHelper
-                                        context, state.ifItems[index],
+                                        .showDeviceDialog(
-                                        removeComparetors: false);
+                                            context, state.ifItems[index],
+                                            removeComparetors: false);
 
                                     if (result != null) {
-                                      context
+                                      context.read<RoutineBloc>().add(
-                                          .read<RoutineBloc>()
+                                          AddToIfContainer(
-                                          .add(AddToIfContainer(state.ifItems[index], false));
+                                              state.ifItems[index], false));
-                                    } else if (!['AC', '1G', '2G', '3G']
+                                    } else if (![
-                                        .contains(state.ifItems[index]['productType'])) {
+                                      'AC',
-                                      context
+                                      '1G',
-                                          .read<RoutineBloc>()
+                                      '2G',
-                                          .add(AddToIfContainer(state.ifItems[index], false));
+                                      '3G'
+                                    ].contains(
+                                        state.ifItems[index]['productType'])) {
+                                      context.read<RoutineBloc>().add(
+                                          AddToIfContainer(
+                                              state.ifItems[index], false));
                                     }
                                   }
                                 },
                                 child: DraggableCard(
-                                  imagePath: state.ifItems[index]['imagePath'] ?? '',
+                                  imagePath:
+                                      state.ifItems[index]['imagePath'] ?? '',
                                   title: state.ifItems[index]['title'] ?? '',
                                   deviceData: state.ifItems[index],
-                                  padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
+                                  padding: const EdgeInsets.symmetric(
+                                      horizontal: 4, vertical: 8),
                                   isFromThen: false,
                                   isFromIf: true,
                                   onRemove: () {
-                                    context.read<RoutineBloc>().add(RemoveDragCard(
+                                    context.read<RoutineBloc>().add(
-                                        index: index,
+                                        RemoveDragCard(
-                                        isFromThen: false,
+                                            index: index,
-                                        key: state.ifItems[index]['uniqueCustomId']));
+                                            isFromThen: false,
+                                            key: state.ifItems[index]
+                                                ['uniqueCustomId']));
                                   },
                                 ),
                               )),
@@ -101,15 +113,23 @@ class IfContainer extends StatelessWidget {
 
             if (!state.isTabToRun) {
               if (mutableData['deviceId'] == 'tab_to_run') {
-                context.read<RoutineBloc>().add(AddToIfContainer(mutableData, true));
+                context
+                    .read<RoutineBloc>()
+                    .add(AddToIfContainer(mutableData, true));
               } else {
-                final result = await DeviceDialogHelper.showDeviceDialog(context, mutableData,
+                final result = await DeviceDialogHelper.showDeviceDialog(
+                    context, mutableData,
                     removeComparetors: false);
 
                 if (result != null) {
-                  context.read<RoutineBloc>().add(AddToIfContainer(mutableData, false));
+                  context
-                } else if (!['AC', '1G', '2G', '3G'].contains(mutableData['productType'])) {
+                      .read<RoutineBloc>()
-                  context.read<RoutineBloc>().add(AddToIfContainer(mutableData, false));
+                      .add(AddToIfContainer(mutableData, false));
+                } else if (!['AC', '1G', '2G', '3G']
+                    .contains(mutableData['productType'])) {
+                  context
+                      .read<RoutineBloc>()
+                      .add(AddToIfContainer(mutableData, false));
                 }
               }
             }
@@ -155,7 +175,9 @@ class AutomationOperatorSelector extends StatelessWidget {
               ),
             ),
             onPressed: () {
-              context.read<RoutineBloc>().add(const ChangeAutomationOperator(operator: 'or'));
+              context
+                  .read<RoutineBloc>()
+                  .add(const ChangeAutomationOperator(operator: 'or'));
             },
           ),
           Container(
@@ -181,7 +203,9 @@ class AutomationOperatorSelector extends StatelessWidget {
               ),
             ),
             onPressed: () {
-              context.read<RoutineBloc>().add(const ChangeAutomationOperator(operator: 'and'));
+              context
+                  .read<RoutineBloc>()
+                  .add(const ChangeAutomationOperator(operator: 'and'));
             },
           ),
         ],

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

@@ -0,0 +1,143 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_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';
+import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
+
+class FetchRoutineScenesAutomation extends StatefulWidget {
+  const FetchRoutineScenesAutomation({super.key});
+
+  @override
+  State<FetchRoutineScenesAutomation> createState() => _FetchRoutineScenesState();
+}
+
+class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
+    with HelperResponsiveLayout {
+  @override
+  void initState() {
+    super.initState();
+    context.read<RoutineBloc>()
+      ..add(const LoadScenes(spaceId, communityId))
+      ..add(const LoadAutomation(spaceId));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<RoutineBloc, RoutineState>(
+      builder: (context, state) {
+        return state.isLoading
+            ? const Center(
+                child: CircularProgressIndicator(),
+              )
+            : SingleChildScrollView(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 16.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        "Scenes (Tab to Run)",
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                              color: ColorsManager.grayColor,
+                              fontWeight: FontWeight.bold,
+                            ),
+                      ),
+                      const SizedBox(height: 10),
+                      if (state.scenes.isEmpty)
+                        Text(
+                          "No scenes found",
+                          style: context.textTheme.bodyMedium?.copyWith(
+                            color: ColorsManager.grayColor,
+                          ),
+                        ),
+                      if (state.scenes.isNotEmpty)
+                        ConstrainedBox(
+                          constraints: BoxConstraints(
+                            maxHeight: isSmallScreenSize(context) ? 160 : 170,
+                          ),
+                          child: ListView.builder(
+                            scrollDirection: Axis.horizontal,
+                            itemCount: state.scenes.length,
+                            itemBuilder: (context, index) => Padding(
+                              padding: EdgeInsets.only(
+                                right: isSmallScreenSize(context) ? 4.0 : 8.0,
+                              ),
+                              child: RoutineViewCard(
+                                onTap: () {
+                                  BlocProvider.of<RoutineBloc>(context).add(
+                                    const CreateNewRoutineViewEvent(createRoutineView: true),
+                                  );
+                                  context.read<RoutineBloc>().add(
+                                        GetSceneDetails(
+                                          sceneId: state.scenes[index].id,
+                                          isTabToRun: true,
+                                          isUpdate: true,
+                                        ),
+                                      );
+                                },
+                                textString: state.scenes[index].name,
+                                icon: state.scenes[index].icon ?? Assets.logoHorizontal,
+                                isFromScenes: true,
+                                iconInBytes: state.scenes[index].iconInBytes,
+                              ),
+                            ),
+                          ),
+                        ),
+                      const SizedBox(height: 15),
+                      Text(
+                        "Automations",
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                              color: ColorsManager.grayColor,
+                              fontWeight: FontWeight.bold,
+                            ),
+                      ),
+                      const SizedBox(height: 10),
+                      if (state.automations.isEmpty)
+                        Text(
+                          "No automations found",
+                          style: context.textTheme.bodyMedium?.copyWith(
+                            color: ColorsManager.grayColor,
+                          ),
+                        ),
+                      if (state.automations.isNotEmpty)
+                        ConstrainedBox(
+                          constraints: BoxConstraints(
+                            maxHeight: isSmallScreenSize(context) ? 160 : 170,
+                          ),
+                          child: ListView.builder(
+                            scrollDirection: Axis.horizontal,
+                            itemCount: state.automations.length,
+                            itemBuilder: (context, index) => Padding(
+                              padding: EdgeInsets.only(
+                                right: isSmallScreenSize(context) ? 4.0 : 8.0,
+                              ),
+                              child: RoutineViewCard(
+                                onTap: () {
+                                  BlocProvider.of<RoutineBloc>(context).add(
+                                    const CreateNewRoutineViewEvent(createRoutineView: true),
+                                  );
+                                  context.read<RoutineBloc>().add(
+                                        GetAutomationDetails(
+                                            automationId: state.automations[index].id,
+                                            isAutomation: true,
+                                            isUpdate: true),
+                                      );
+                                },
+                                textString: state.automations[index].name,
+                                icon: state.automations[index].icon ?? Assets.automation,
+                              ),
+                            ),
+                          ),
+                        ),
+                    ],
+                  ),
+                ),
+              );
+      },
+    );
+  }
+}

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

@@ -70,13 +70,15 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
                     height: iconSize,
                     width: iconSize,
                     child: (isFromScenes ?? false)
-                        ? (iconInBytes != null && iconInBytes?.isNotEmpty == true)
+                        ? (iconInBytes != null &&
+                                iconInBytes?.isNotEmpty == true)
                             ? Image.memory(
                                 iconInBytes!,
                                 height: iconSize,
                                 width: iconSize,
                                 fit: BoxFit.contain,
-                                errorBuilder: (context, error, stackTrace) => Image.asset(
+                                errorBuilder: (context, error, stackTrace) =>
+                                    Image.asset(
                                   Assets.logo,
                                   height: iconSize,
                                   width: iconSize,

lib/pages/routiens/widgets/period_option.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_event.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_event.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_state.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_state.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/effictive_period_dialog.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/effictive_period_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/app_enum.dart';
 

lib/pages/routiens/widgets/repeat_days.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_event.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_event.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_state.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_state.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class RepeatDays extends StatelessWidget {

lib/pages/routiens/widgets/routine_devices.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dragable_card.dart';
 
 class RoutineDevices extends StatelessWidget {
   const RoutineDevices({super.key});
@@ -35,7 +35,9 @@ class RoutineDevices extends StatelessWidget {
           children: deviceList.asMap().entries.map((entry) {
             final device = entry.value;
             if (state.searchText != null && state.searchText!.isNotEmpty) {
-              return device.name!.toLowerCase().contains(state.searchText!.toLowerCase())
+              return device.name!
+                      .toLowerCase()
+                      .contains(state.searchText!.toLowerCase())
                   ? DraggableCard(
                       imagePath: device.getDefaultIcon(device.productType),
                       title: device.name ?? '',

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

@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
+import 'package:syncrow_web/pages/routiens/models/ac/ac_function.dart';
-import 'package:syncrow_web/pages/routines/models/ac/ac_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/ac/ac_operational_value.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_footer.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/functions_bloc/functions_bloc_bloc.dart';
 
 class ACHelper {
   static Future<Map<String, dynamic>?> showACFunctionsDialog(
@@ -27,15 +27,16 @@ class ACHelper {
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-          create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+          create: (_) => FunctionBloc()
+            ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
           child: AlertDialog(
             contentPadding: EdgeInsets.zero,
             content: BlocBuilder<FunctionBloc, FunctionBlocState>(
               builder: (context, state) {
                 final selectedFunction = state.selectedFunction;
                 final selectedOperationName = state.selectedOperationName;
-                final selectedFunctionData =
+                final selectedFunctionData = state.addedFunctions
-                    state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                    .firstWhere((f) => f.functionCode == selectedFunction,
                         orElse: () => DeviceFunctionData(
                               entityId: '',
                               functionCode: selectedFunction ?? '',
@@ -65,8 +66,10 @@ class ACHelper {
                               child: _buildFunctionsList(
                                 context: context,
                                 acFunctions: acFunctions,
-                                onFunctionSelected: (functionCode, operationName) =>
+                                onFunctionSelected:
-                                    context.read<FunctionBloc>().add(SelectFunction(
+                                    (functionCode, operationName) => context
+                                        .read<FunctionBloc>()
+                                        .add(SelectFunction(
                                           functionCode: functionCode,
                                           operationName: operationName,
                                         )),
@@ -181,7 +184,7 @@ class ACHelper {
     bool? removeComparators,
   }) {
     if (selectedFunction == 'temp_set' || selectedFunction == 'temp_current') {
-      final initialValue = selectedFunctionData?.value ?? 250;
+      final initialValue = selectedFunctionData?.value ?? 200;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -194,7 +197,8 @@ class ACHelper {
       );
     }
 
-    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        acFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -290,7 +294,8 @@ class ACHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -328,10 +333,10 @@ class ACHelper {
     String selectCode,
   ) {
     return Slider(
-      value: initialValue is int ? initialValue.toDouble() : 200.0,
+      value: initialValue is int ? initialValue.toDouble() : 160.0,
-      min: 200,
+      min: 160,
       max: 300,
-      divisions: 10,
+      divisions: 14,
       label: '${((initialValue ?? 160) / 10).toInt()}°C',
       onChanged: (value) {
         context.read<FunctionBloc>().add(
@@ -384,9 +389,13 @@ class ACHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -398,7 +407,8 @@ class ACHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_footer.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class AutomationDialog extends StatefulWidget {
@@ -31,8 +31,10 @@ class _AutomationDialogState extends State<AutomationDialog> {
   @override
   void initState() {
     super.initState();
-    List<DeviceFunctionData>? functions =
+    List<DeviceFunctionData>? functions = context
-        context.read<RoutineBloc>().state.selectedFunctions[widget.uniqueCustomId];
+        .read<RoutineBloc>()
+        .state
+        .selectedFunctions[widget.uniqueCustomId];
     for (DeviceFunctionData data in functions ?? []) {
       if (data.entityId == widget.automationId) {
         selectedAutomationActionExecutor = data.value;
@@ -65,7 +67,8 @@ class _AutomationDialogState extends State<AutomationDialog> {
                   }),
             ),
             ListTile(
-              leading: SvgPicture.asset(Assets.acPowerOff, width: 24, height: 24),
+              leading:
+                  SvgPicture.asset(Assets.acPowerOff, width: 24, height: 24),
               title: const Text('Disable'),
               trailing: Radio<String?>(
                 value: 'rule_disable',

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

@@ -1,10 +1,10 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_footer.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 
 class DelayHelper {
   static Future<Map<String, dynamic>?> showDelayPickerDialog(

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

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_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';
 

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

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_event.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_event.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/app_enum.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';

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

@@ -2,14 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/functions_bloc/functions_bloc_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/helper/duration_format_helper.dart';
+import 'package:syncrow_web/pages/routiens/helper/duration_format_helper.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/base_switch_function.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/switch_operational_value.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_footer.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -22,21 +22,23 @@ class OneGangSwitchHelper {
     String uniqueCustomId,
     bool removeComparetors,
   ) async {
-    List<BaseSwitchFunction> acFunctions = functions.whereType<BaseSwitchFunction>().toList();
+    List<BaseSwitchFunction> acFunctions =
+        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()
+              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData =
+                  final selectedFunctionData = state.addedFunctions
-                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                      .firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -83,9 +85,12 @@ class OneGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context.read<FunctionBloc>().add(SelectFunction(
+                                        context
+                                            .read<FunctionBloc>()
+                                            .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName: function.operationName,
+                                              operationName:
+                                                  function.operationName,
                                             ));
                                       },
                                     );
@@ -175,7 +180,8 @@ class OneGangSwitchHelper {
       );
     }
 
-    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        acFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -212,11 +218,11 @@ class OneGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(
+        _buildCountDownDisplay(context, initialValue, device, operationName,
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(
+        _buildCountDownSlider(context, initialValue, device, operationName,
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode),
       ],
     );
   }
@@ -257,7 +263,8 @@ class OneGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -305,7 +312,8 @@ class OneGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+      divisions: (((operationalValues.maxValue ?? 0) -
+                  (operationalValues.minValue ?? 0)) /
               (operationalValues.stepValue ?? 1))
           .round(),
       onChanged: (value) {
@@ -357,9 +365,13 @@ class OneGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -371,7 +383,8 @@ class OneGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -1,17 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_event.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_event.dart';
-import 'package:syncrow_web/pages/routines/bloc/effective_period/effect_period_state.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_state.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/setting_bloc/setting_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/setting_bloc/setting_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/setting_bloc/setting_event.dart';
+import 'package:syncrow_web/pages/routiens/bloc/setting_bloc/setting_event.dart';
-import 'package:syncrow_web/pages/routines/bloc/setting_bloc/setting_state.dart';
+import 'package:syncrow_web/pages/routiens/bloc/setting_bloc/setting_state.dart';
-import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
+import 'package:syncrow_web/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart';
-import 'package:syncrow_web/pages/routines/models/icon_model.dart';
+import 'package:syncrow_web/pages/routiens/models/icon_model.dart';
-import 'package:syncrow_web/pages/routines/view/effective_period_view.dart';
+import 'package:syncrow_web/pages/routiens/view/effective_period_view.dart';
-import 'package:syncrow_web/pages/routines/widgets/delete_scene.dart';
+import 'package:syncrow_web/pages/routiens/widgets/delete_scene.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:flutter/cupertino.dart';
 

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

@@ -2,14 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/functions_bloc/functions_bloc_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/helper/duration_format_helper.dart';
+import 'package:syncrow_web/pages/routiens/helper/duration_format_helper.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/base_switch_function.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/switch_operational_value.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_footer.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -22,21 +22,23 @@ class ThreeGangSwitchHelper {
     String uniqueCustomId,
     bool removeComparetors,
   ) async {
-    List<BaseSwitchFunction> switchFunctions = functions.whereType<BaseSwitchFunction>().toList();
+    List<BaseSwitchFunction> switchFunctions =
+        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()
+              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData =
+                  final selectedFunctionData = state.addedFunctions
-                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                      .firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -83,9 +85,12 @@ class ThreeGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context.read<FunctionBloc>().add(SelectFunction(
+                                        context
+                                            .read<FunctionBloc>()
+                                            .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName: function.operationName,
+                                              operationName:
+                                                  function.operationName,
                                             ));
                                       },
                                     );
@@ -177,7 +182,8 @@ class ThreeGangSwitchHelper {
       );
     }
 
-    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -214,11 +220,11 @@ class ThreeGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(
+        _buildCountDownDisplay(context, initialValue, device, operationName,
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(
+        _buildCountDownSlider(context, initialValue, device, operationName,
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode),
       ],
     );
   }
@@ -259,7 +265,8 @@ class ThreeGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -307,7 +314,8 @@ class ThreeGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+      divisions: (((operationalValues.maxValue ?? 0) -
+                  (operationalValues.minValue ?? 0)) /
               (operationalValues.stepValue ?? 1))
           .round(),
       onChanged: (value) {
@@ -359,9 +367,13 @@ class ThreeGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -373,7 +385,8 @@ class ThreeGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -2,14 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/functions_bloc/functions_bloc_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/helper/duration_format_helper.dart';
+import 'package:syncrow_web/pages/routiens/helper/duration_format_helper.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routiens/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/base_switch_function.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routiens/models/gang_switches/switch_operational_value.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_footer.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -22,21 +22,23 @@ class TwoGangSwitchHelper {
     String uniqueCustomId,
     bool removeComparetors,
   ) async {
-    List<BaseSwitchFunction> switchFunctions = functions.whereType<BaseSwitchFunction>().toList();
+    List<BaseSwitchFunction> switchFunctions =
+        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()
+              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData =
+                  final selectedFunctionData = state.addedFunctions
-                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                      .firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -83,9 +85,12 @@ class TwoGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context.read<FunctionBloc>().add(SelectFunction(
+                                        context
+                                            .read<FunctionBloc>()
+                                            .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName: function.operationName,
+                                              operationName:
+                                                  function.operationName,
                                             ));
                                       },
                                     );
@@ -161,7 +166,8 @@ class TwoGangSwitchHelper {
     required String operationName,
     required bool removeComparetors,
   }) {
-    if (selectedFunction == 'countdown_1' || selectedFunction == 'countdown_2') {
+    if (selectedFunction == 'countdown_1' ||
+        selectedFunction == 'countdown_2') {
       final initialValue = selectedFunctionData?.value ?? 200;
       return _buildTemperatureSelector(
         context: context,
@@ -175,7 +181,8 @@ class TwoGangSwitchHelper {
       );
     }
 
-    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -212,11 +219,11 @@ class TwoGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(
+        _buildCountDownDisplay(context, initialValue, device, operationName,
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(
+        _buildCountDownSlider(context, initialValue, device, operationName,
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode),
       ],
     );
   }
@@ -257,7 +264,8 @@ class TwoGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -305,7 +313,8 @@ class TwoGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+      divisions: (((operationalValues.maxValue ?? 0) -
+                  (operationalValues.minValue ?? 0)) /
               (operationalValues.stepValue ?? 1))
           .round(),
       onChanged: (value) {
@@ -357,9 +366,13 @@ class TwoGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -371,7 +384,8 @@ class TwoGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

lib/pages/routiens/widgets/routine_search_and_buttons.dart

@@ -1,10 +1,10 @@
 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/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/helper/save_routine_helper.dart';
+import 'package:syncrow_web/pages/routiens/helper/save_routine_helper.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/discard_dialog.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/discard_dialog.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/setting_dialog.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/setting_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';

lib/pages/routiens/widgets/scenes_and_automations.dart

@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dragable_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class ScenesAndAutomations extends StatefulWidget {
@@ -19,9 +18,8 @@ class _ScenesAndAutomationsState extends State<ScenesAndAutomations> {
   void initState() {
     super.initState();
     context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
+      ..add(const LoadScenes(spaceId, communityId))
-          context.read<SpaceTreeBloc>().selectedCommunityId))
+      ..add(const LoadAutomation(spaceId));
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
   }
 
   @override
@@ -36,7 +34,9 @@ class _ScenesAndAutomationsState extends State<ScenesAndAutomations> {
             children: scenes.asMap().entries.map((entry) {
               final scene = entry.value;
               if (state.searchText != null && state.searchText!.isNotEmpty) {
-                return scene.name.toLowerCase().contains(state.searchText!.toLowerCase())
+                return scene.name
+                        .toLowerCase()
+                        .contains(state.searchText!.toLowerCase())
                     ? DraggableCard(
                         imagePath: scene.icon ?? Assets.loginLogo,
                         title: scene.name,

lib/pages/routiens/widgets/search_bar_condition_title.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/text_field/custom_text_field.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/routines_title_widget.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routines_title_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 

lib/pages/routiens/widgets/then_container.dart

@@ -2,11 +2,11 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/automation_dialog.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/automation_dialog.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/delay_dialog.dart';
+import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/delay_dialog.dart';
-import 'package:syncrow_web/pages/routines/helper/dialog_helper/device_dialog_helper.dart';
+import 'package:syncrow_web/pages/routiens/helper/dialog_helper/device_dialog_helper.dart';
-import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
+import 'package:syncrow_web/pages/routiens/widgets/dragable_card.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:uuid/uuid.dart';
 

lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart

@@ -1,62 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ac_dialog.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
-
-class DeviceDialogHelper {
-  static Future<Map<String, dynamic>?> showDeviceDialog(
-    BuildContext context,
-    Map<String, dynamic> data, {
-    required bool removeComparetors,
-  }) async {
-    final functions = data['functions'] as List<DeviceFunction>;
-
-    try {
-      final result = await _getDialogForDeviceType(
-        context,
-        data['productType'],
-        data,
-        functions,
-        removeComparetors: removeComparetors,
-      );
-
-      if (result != null) {
-        return result;
-      }
-    } catch (e) {
-      debugPrint('Error: $e');
-    }
-
-    return null;
-  }
-
-  static Future<Map<String, dynamic>?> _getDialogForDeviceType(BuildContext context,
-      String productType, Map<String, dynamic> data, List<DeviceFunction> functions,
-      {required bool removeComparetors}) async {
-    final routineBloc = context.read<RoutineBloc>();
-    final deviceSelectedFunctions =
-        routineBloc.state.selectedFunctions[data['uniqueCustomId']] ?? [];
-
-    switch (productType) {
-      case 'AC':
-        return ACHelper.showACFunctionsDialog(context, functions, data['device'],
-            deviceSelectedFunctions, data['uniqueCustomId'], removeComparetors);
-
-      case '1G':
-        return OneGangSwitchHelper.showSwitchFunctionsDialog(context, functions, data['device'],
-            deviceSelectedFunctions, data['uniqueCustomId'], removeComparetors);
-      case '2G':
-        return TwoGangSwitchHelper.showSwitchFunctionsDialog(context, functions, data['device'],
-            deviceSelectedFunctions, data['uniqueCustomId'], removeComparetors);
-      case '3G':
-        return ThreeGangSwitchHelper.showSwitchFunctionsDialog(context, functions, data['device'],
-            deviceSelectedFunctions, data['uniqueCustomId'], removeComparetors);
-      default:
-        return null;
-    }
-  }
-}

lib/pages/routines/view/routines_view.dart

@@ -1,98 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
-import 'package:syncrow_web/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart';
-import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_view_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/snack_bar.dart';
-
-class RoutinesView extends StatefulWidget {
-  const RoutinesView({super.key});
-
-  @override
-  State<RoutinesView> createState() => _RoutinesViewState();
-}
-
-class _RoutinesViewState extends State<RoutinesView> {
-  @override
-  void initState() {
-    super.initState();
-    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<RoutineBloc, RoutineState>(
-      builder: (context, state) {
-        if (state.createRoutineView) {
-          return const CreateNewRoutineView();
-        }
-        return Row(
-          children: [
-            const Expanded(
-                child:
-                    // SideSpacesView(
-                    //   onSelectAction: (String communityId, String spaceId) {
-                    //     // context.read<RoutineBloc>()
-                    //     //   ..add(LoadScenes(spaceId, communityId))
-                    //     //   ..add(LoadAutomation(spaceId));
-                    //   },
-                    // )
-                    SpaceTreeView()),
-            Expanded(
-              flex: 3,
-              child: Padding(
-                padding: const EdgeInsets.all(16),
-                child: Row(
-                  children: [
-                    Column(
-                      mainAxisSize: MainAxisSize.min,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        Text(
-                          "Create New Routines",
-                          style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                color: ColorsManager.grayColor,
-                                fontWeight: FontWeight.bold,
-                              ),
-                        ),
-                        const SizedBox(
-                          height: 10,
-                        ),
-                        RoutineViewCard(
-                          onTap: () {
-                            if (context.read<SpaceTreeBloc>().selectedCommunityId.isNotEmpty &&
-                                context.read<SpaceTreeBloc>().selectedSpaceId.isNotEmpty) {
-                              context.read<RoutineBloc>().add(
-                                    (ResetRoutineState()),
-                                  );
-                              BlocProvider.of<RoutineBloc>(context).add(
-                                const CreateNewRoutineViewEvent(createRoutineView: true),
-                              );
-                            } else {
-                              CustomSnackBar.redSnackBar('Please select a space');
-                            }
-                          },
-                          icon: Icons.add,
-                          textString: '',
-                        ),
-                        const SizedBox(
-                          height: 15,
-                        ),
-                        const Expanded(child: FetchRoutineScenesAutomation()),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}

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

@@ -1,143 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_view_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
-
-class FetchRoutineScenesAutomation extends StatefulWidget {
-  const FetchRoutineScenesAutomation({super.key});
-
-  @override
-  State<FetchRoutineScenesAutomation> createState() => _FetchRoutineScenesState();
-}
-
-class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
-    with HelperResponsiveLayout {
-  @override
-  void initState() {
-    super.initState();
-    context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
-          context.read<SpaceTreeBloc>().selectedCommunityId))
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<RoutineBloc, RoutineState>(
-      builder: (context, state) {
-        return state.isLoading
-            ? const Center(
-                child: CircularProgressIndicator(),
-              )
-            : Padding(
-                padding: const EdgeInsets.symmetric(vertical: 16.0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text(
-                      "Scenes (Tab to Run)",
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                            color: ColorsManager.grayColor,
-                            fontWeight: FontWeight.bold,
-                          ),
-                    ),
-                    const SizedBox(height: 10),
-                    if (state.scenes.isEmpty)
-                      Text(
-                        "No scenes found",
-                        style: context.textTheme.bodyMedium?.copyWith(
-                          color: ColorsManager.grayColor,
-                        ),
-                      ),
-                    if (state.scenes.isNotEmpty)
-                      ConstrainedBox(
-                        constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 160 : 170,
-                            maxWidth: MediaQuery.sizeOf(context).width * 0.7),
-                        child: ListView.builder(
-                          scrollDirection: Axis.horizontal,
-                          itemCount: state.scenes.length,
-                          itemBuilder: (context, index) => Padding(
-                            padding: EdgeInsets.only(
-                              right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                            ),
-                            child: RoutineViewCard(
-                              onTap: () {
-                                BlocProvider.of<RoutineBloc>(context).add(
-                                  const CreateNewRoutineViewEvent(createRoutineView: true),
-                                );
-                                context.read<RoutineBloc>().add(
-                                      GetSceneDetails(
-                                        sceneId: state.scenes[index].id,
-                                        isTabToRun: true,
-                                        isUpdate: true,
-                                      ),
-                                    );
-                              },
-                              textString: state.scenes[index].name,
-                              icon: state.scenes[index].icon ?? Assets.logoHorizontal,
-                              isFromScenes: true,
-                              iconInBytes: state.scenes[index].iconInBytes,
-                            ),
-                          ),
-                        ),
-                      ),
-                    const SizedBox(height: 15),
-                    Text(
-                      "Automations",
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                            color: ColorsManager.grayColor,
-                            fontWeight: FontWeight.bold,
-                          ),
-                    ),
-                    const SizedBox(height: 10),
-                    if (state.automations.isEmpty)
-                      Text(
-                        "No automations found",
-                        style: context.textTheme.bodyMedium?.copyWith(
-                          color: ColorsManager.grayColor,
-                        ),
-                      ),
-                    if (state.automations.isNotEmpty)
-                      ConstrainedBox(
-                        constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 160 : 170,
-                            maxWidth: MediaQuery.sizeOf(context).width * 0.7),
-                        child: ListView.builder(
-                          scrollDirection: Axis.horizontal,
-                          itemCount: state.automations.length,
-                          itemBuilder: (context, index) => Padding(
-                            padding: EdgeInsets.only(
-                              right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                            ),
-                            child: RoutineViewCard(
-                              onTap: () {
-                                BlocProvider.of<RoutineBloc>(context).add(
-                                  const CreateNewRoutineViewEvent(createRoutineView: true),
-                                );
-                                context.read<RoutineBloc>().add(
-                                      GetAutomationDetails(
-                                          automationId: state.automations[index].id,
-                                          isAutomation: true,
-                                          isUpdate: true),
-                                    );
-                              },
-                              textString: state.automations[index].name,
-                              icon: state.automations[index].icon ?? Assets.automation,
-                            ),
-                          ),
-                        ),
-                      ),
-                  ],
-                ),
-              );
-      },
-    );
-  }
-}

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -1,283 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/services/space_mana_api.dart';
-
-class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
-  String selectedCommunityId = '';
-  String selectedSpaceId = '';
-
-  SpaceTreeBloc() : super(const SpaceTreeState()) {
-    on<InitialEvent>(_fetchSpaces);
-    on<OnCommunityExpanded>(_onCommunityExpanded);
-    on<OnSpaceExpanded>(_onSpaceExpanded);
-    on<OnCommunitySelected>(_onCommunitySelected);
-    on<OnSpaceSelected>(_onSpaceSelected);
-    on<SearchQueryEvent>(_onSearch);
-  }
-
-  _fetchSpaces(InitialEvent event, Emitter<SpaceTreeState> emit) async {
-    emit(SpaceTreeLoadingState());
-    try {
-      List<CommunityModel> communities = await CommunitySpaceManagementApi().fetchCommunities();
-
-      List<CommunityModel> updatedCommunities = await Future.wait(
-        communities.map((community) async {
-          List<SpaceModel> spaces =
-              await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid);
-
-          return CommunityModel(
-            uuid: community.uuid,
-            createdAt: community.createdAt,
-            updatedAt: community.updatedAt,
-            name: community.name,
-            description: community.description,
-            spaces: spaces,
-            region: community.region,
-          );
-        }).toList(),
-      );
-
-      emit(state.copyWith(
-          communitiesList: updatedCommunities, expandedCommunity: [], expandedSpaces: []));
-    } catch (e) {
-      emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
-    }
-  }
-
-  _onCommunityExpanded(OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
-    try {
-      List<String> updatedExpandedCommunityList = List.from(state.expandedCommunities);
-
-      if (updatedExpandedCommunityList.contains(event.communityId)) {
-        updatedExpandedCommunityList.remove(event.communityId);
-      } else {
-        updatedExpandedCommunityList.add(event.communityId);
-      }
-
-      emit(state.copyWith(
-        expandedCommunity: updatedExpandedCommunityList,
-      ));
-    } catch (e) {
-      emit(const SpaceTreeErrorState('Something went wrong'));
-    }
-  }
-
-  _onSpaceExpanded(OnSpaceExpanded event, Emitter<SpaceTreeState> emit) async {
-    try {
-      List<String> updatedExpandedSpacesList = List.from(state.expandedSpaces);
-
-      if (updatedExpandedSpacesList.contains(event.spaceId)) {
-        updatedExpandedSpacesList.remove(event.spaceId);
-      } else {
-        updatedExpandedSpacesList.add(event.spaceId);
-      }
-
-      emit(state.copyWith(expandedSpaces: updatedExpandedSpacesList));
-    } catch (e) {
-      emit(const SpaceTreeErrorState('Something went wrong'));
-    }
-  }
-
-  _onCommunitySelected(OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
-    try {
-      List<String> updatedSelectedCommunities =
-          List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
-      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
-
-      List<String> childrenIds = _getAllChildIds(event.children);
-
-      if (!updatedSelectedCommunities.contains(event.communityId)) {
-        // Select the community and all its children
-        updatedSelectedCommunities.add(event.communityId);
-        updatedSelectedSpaces.addAll(childrenIds);
-      } else {
-        // Unselect the community and all its children
-        updatedSelectedCommunities.remove(event.communityId);
-        updatedSelectedSpaces.removeWhere(childrenIds.contains);
-        updatedSoldChecks.removeWhere(childrenIds.contains);
-      }
-
-      emit(state.copyWith(
-          selectedCommunities: updatedSelectedCommunities,
-          selectedSpaces: updatedSelectedSpaces,
-          soldCheck: updatedSoldChecks));
-    } catch (e) {
-      emit(const SpaceTreeErrorState('Something went wrong'));
-    }
-  }
-
-  _onSpaceSelected(OnSpaceSelected event, Emitter<SpaceTreeState> emit) async {
-    try {
-      List<String> updatedSelectedCommunities =
-          List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
-      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
-
-      List<String> childrenIds = _getAllChildIds(event.children);
-      bool isChildSelected = false;
-
-      for (String id in childrenIds) {
-        if (updatedSelectedSpaces.contains(id)) {
-          isChildSelected = true;
-        }
-      }
-
-      if (!updatedSelectedSpaces.contains(event.spaceId) &&
-          !updatedSoldChecks.contains(event.spaceId)) {
-        // First click: Select the space and all its children
-        updatedSelectedSpaces.add(event.spaceId);
-        updatedSelectedCommunities.add(event.communityId);
-        if (childrenIds.isNotEmpty) {
-          updatedSelectedSpaces.addAll(childrenIds);
-        }
-
-        List<String> spaces = _getThePathToChild(event.communityId, event.spaceId);
-        for (String space in spaces) {
-          if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
-            updatedSoldChecks.add(space);
-          }
-        }
-      } else if (!updatedSoldChecks.contains(event.spaceId) &&
-          childrenIds.isNotEmpty &&
-          isChildSelected) {
-        // Second click: Unselect space but keep children
-        updatedSelectedSpaces.remove(event.spaceId);
-        updatedSoldChecks.add(event.spaceId);
-      } else {
-        // Third click: Unselect space and all its children
-        updatedSelectedSpaces.remove(event.spaceId);
-        if (childrenIds.isNotEmpty) {
-          updatedSelectedSpaces.removeWhere(childrenIds.contains);
-          updatedSoldChecks.removeWhere(childrenIds.contains);
-        }
-        updatedSoldChecks.remove(event.spaceId);
-
-        List<String> parents = _getThePathToChild(event.communityId, event.spaceId);
-        if (!_parentSelected(parents, updatedSelectedSpaces)) {
-          updatedSoldChecks.removeWhere(parents.contains);
-        }
-        if (!_anySpacesSelectedInCommunity(
-            event.communityId, updatedSelectedSpaces, updatedSoldChecks)) {
-          updatedSelectedCommunities.remove(event.communityId);
-        }
-      }
-
-      emit(state.copyWith(
-          selectedCommunities: updatedSelectedCommunities,
-          selectedSpaces: updatedSelectedSpaces,
-          soldCheck: updatedSoldChecks));
-      emit(state.copyWith(selectedSpaces: updatedSelectedSpaces));
-    } catch (e) {
-      emit(const SpaceTreeErrorState('Something went wrong'));
-    }
-  }
-
-  _parentSelected(List<String> parents, List<String> selectedSpaces) {
-    for (String space in parents) {
-      if (selectedSpaces.contains(space)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  _onSearch(SearchQueryEvent event, Emitter<SpaceTreeState> emit) async {
-    try {
-      List<CommunityModel> communities = List.from(state.communityList);
-      List<CommunityModel> filteredCommunity = [];
-
-      // Filter communities and expand only those that match the query
-      filteredCommunity = communities.where((community) {
-        final containsQueryInCommunity =
-            community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
-        final containsQueryInSpaces =
-            community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
-
-        return containsQueryInCommunity || containsQueryInSpaces;
-      }).toList();
-
-      emit(state.copyWith(
-          filteredCommunity: filteredCommunity, isSearching: event.searchQuery.isNotEmpty));
-    } catch (e) {
-      emit(const SpaceTreeErrorState('Something went wrong'));
-    }
-  }
-
-  // Helper function to determine if any space or its children match the search query
-  bool _containsQuery(SpaceModel space, String query) {
-    final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren =
-        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
-
-    return matchesSpace || matchesChildren;
-  }
-
-  List<String> _getAllChildIds(List<SpaceModel> spaces) {
-    List<String> ids = [];
-    for (var child in spaces) {
-      ids.add(child.uuid!);
-      ids.addAll(_getAllChildIds(child.children));
-    }
-    return ids;
-  }
-
-  bool _anySpacesSelectedInCommunity(
-      String communityId, List<String> selectedSpaces, List<String> partialCheckedList) {
-    bool result = false;
-    for (var community in state.communityList) {
-      if (community.uuid == communityId) {
-        List<String> ids = _getAllChildIds(community.spaces);
-        for (var id in ids) {
-          result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
-          if (result) {
-            return result;
-          }
-        }
-      }
-    }
-    return result;
-  }
-
-  List<String> _getThePathToChild(String communityId, String selectedSpaceId) {
-    List<String> ids = [];
-    for (var community in state.communityList) {
-      if (community.uuid == communityId) {
-        for (var space in community.spaces) {
-          List<String> list = [];
-          list.add(space.uuid!);
-          ids = _getAllParentsIds(space, selectedSpaceId, List.from(list));
-          if (ids.isNotEmpty) {
-            return ids;
-          }
-        }
-      }
-    }
-    return ids;
-  }
-
-  List<String> _getAllParentsIds(SpaceModel child, String spaceId, List<String> listIds) {
-    List<String> ids = listIds;
-
-    ids.add(child.uuid ?? '');
-
-    if (child.uuid == spaceId) {
-      return ids;
-    }
-
-    if (child.children.isNotEmpty) {
-      for (var space in child.children) {
-        var result = _getAllParentsIds(space, spaceId, List.from(ids));
-        if (result.isNotEmpty) {
-          return result;
-        }
-      }
-    }
-
-    ids.removeLast();
-    return [];
-  }
-}

lib/pages/space_tree/bloc/space_tree_event.dart

@@ -1,69 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-
-class SpaceTreeEvent extends Equatable {
-  const SpaceTreeEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-class InitialEvent extends SpaceTreeEvent {}
-
-class SearchForSpace extends SpaceTreeEvent {
-  final String searchQuery;
-
-  const SearchForSpace(this.searchQuery);
-
-  @override
-  List<Object> get props => [searchQuery];
-}
-
-class OnCommunityExpanded extends SpaceTreeEvent {
-  final String communityId;
-
-  const OnCommunityExpanded(this.communityId);
-
-  @override
-  List<Object> get props => [communityId];
-}
-
-class OnCommunitySelected extends SpaceTreeEvent {
-  final String communityId;
-  final List<SpaceModel> children;
-
-  const OnCommunitySelected(this.communityId, this.children);
-
-  @override
-  List<Object> get props => [communityId, children];
-}
-
-class OnSpaceExpanded extends SpaceTreeEvent {
-  final String communityId;
-  final String spaceId;
-
-  const OnSpaceExpanded(this.communityId, this.spaceId);
-
-  @override
-  List<Object> get props => [communityId, spaceId];
-}
-
-class OnSpaceSelected extends SpaceTreeEvent {
-  final String communityId;
-  final String spaceId;
-  final List<SpaceModel> children;
-
-  const OnSpaceSelected(this.communityId, this.spaceId, this.children);
-
-  @override
-  List<Object> get props => [communityId, spaceId, children];
-}
-
-class SearchQueryEvent extends SpaceTreeEvent {
-  final String searchQuery;
-
-  const SearchQueryEvent(this.searchQuery);
-
-  @override
-  List<Object> get props => [searchQuery];
-}

lib/pages/space_tree/bloc/space_tree_state.dart

@@ -1,65 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-
-class SpaceTreeState extends Equatable {
-  final List<CommunityModel> communityList;
-  final List<CommunityModel> filteredCommunity;
-  final List<String> expandedCommunities;
-  final List<String> expandedSpaces;
-  final List<String> selectedCommunities;
-  final List<String> selectedSpaces;
-  final List<String> soldCheck;
-  final bool isSearching;
-
-  const SpaceTreeState(
-      {this.communityList = const [],
-      this.filteredCommunity = const [],
-      this.expandedCommunities = const [],
-      this.expandedSpaces = const [],
-      this.selectedCommunities = const [],
-      this.selectedSpaces = const [],
-      this.soldCheck = const [],
-      this.isSearching = false});
-
-  SpaceTreeState copyWith(
-      {List<CommunityModel>? communitiesList,
-      List<CommunityModel>? filteredCommunity,
-      List<String>? expandedSpaces,
-      List<String>? expandedCommunity,
-      List<String>? selectedCommunities,
-      List<String>? selectedSpaces,
-      List<String>? soldCheck,
-      bool? isSearching}) {
-    return SpaceTreeState(
-        communityList: communitiesList ?? this.communityList,
-        filteredCommunity: filteredCommunity ?? this.filteredCommunity,
-        expandedSpaces: expandedSpaces ?? this.expandedSpaces,
-        expandedCommunities: expandedCommunity ?? this.expandedCommunities,
-        selectedCommunities: selectedCommunities ?? this.selectedCommunities,
-        selectedSpaces: selectedSpaces ?? this.selectedSpaces,
-        soldCheck: soldCheck ?? this.soldCheck,
-        isSearching: isSearching ?? this.isSearching);
-  }
-
-  @override
-  List<Object?> get props => [
-        communityList,
-        filteredCommunity,
-        expandedSpaces,
-        expandedCommunities,
-        selectedCommunities,
-        selectedSpaces,
-        soldCheck,
-        isSearching
-      ];
-}
-
-class SpaceTreeLoadingState extends SpaceTreeState {}
-
-class SpaceTreeErrorState extends SpaceTreeState {
-  final String message;
-  const SpaceTreeErrorState(this.message);
-
-  @override
-  List<Object?> get props => [message];
-}

lib/pages/space_tree/view/custom_expansion.dart

@@ -1,99 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class CustomExpansionTileSpaceTree extends StatelessWidget {
-  final String? spaceId;
-  final String title;
-  final List<Widget>? children;
-  final bool isSelected;
-  final bool isSoldCheck;
-  final bool isExpanded;
-  final Function? onExpansionChanged;
-  final Function? onItemSelected;
-
-  const CustomExpansionTileSpaceTree(
-      {super.key,
-      this.spaceId,
-      required this.title,
-      this.children,
-      this.isExpanded = false,
-      this.onExpansionChanged,
-      this.onItemSelected,
-      required this.isSelected,
-      this.isSoldCheck = false});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Row(
-          children: [
-            Checkbox(
-              value: isSoldCheck ? null : isSelected,
-              onChanged: (bool? value) {
-                if (onItemSelected != null) {
-                  onItemSelected!();
-                }
-              },
-              tristate: true,
-              side: WidgetStateBorderSide.resolveWith((states) {
-                return const BorderSide(color: ColorsManager.grayBorder);
-              }),
-              fillColor: WidgetStateProperty.resolveWith((states) {
-                if (states.contains(WidgetState.selected)) {
-                  return ColorsManager.blue1;
-                } else {
-                  return ColorsManager.checkBoxFillColor;
-                }
-              }),
-              checkColor: ColorsManager.whiteColors,
-            ),
-            if (children != null && children!.isNotEmpty)
-              InkWell(
-                onTap: () {
-                  if (onExpansionChanged != null) {
-                    onExpansionChanged!();
-                  }
-                },
-                child: Icon(
-                  isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
-                  color: ColorsManager.lightGrayColor,
-                  size: 16.0,
-                ),
-              ),
-            Expanded(
-              child: GestureDetector(
-                onTap: () {
-                  if (onItemSelected != null) {
-                    onItemSelected!();
-                  }
-                },
-                child: Text(
-                  _capitalizeFirstLetter(title),
-                  style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                        color: isSelected
-                            ? ColorsManager.blackColor // Change color to black when selected
-                            : ColorsManager.lightGrayColor, // Gray when not selected
-                        fontWeight: FontWeight.w400,
-                      ),
-                ),
-              ),
-            ),
-          ],
-        ),
-        if (isExpanded && children != null && children!.isNotEmpty)
-          Padding(
-            padding: const EdgeInsets.only(left: 48.0),
-            child: Column(
-              children: children ?? [],
-            ),
-          ),
-      ],
-    );
-  }
-
-  String _capitalizeFirstLetter(String text) {
-    if (text.isEmpty) return text;
-    return text[0].toUpperCase() + text.substring(1);
-  }
-}

lib/pages/space_tree/view/space_tree_view.dart

@@ -1,120 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/common/widgets/search_bar.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
-import 'package:syncrow_web/pages/space_tree/view/custom_expansion.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/style.dart';
-
-class SpaceTreeView extends StatelessWidget {
-  const SpaceTreeView({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      List<CommunityModel> list = state.isSearching ? state.filteredCommunity : state.communityList;
-      return Container(
-        height: MediaQuery.sizeOf(context).height,
-        decoration: subSectionContainerDecoration,
-        // padding: const EdgeInsets.all(16.0),
-        child: state is SpaceTreeLoadingState
-            ? const Center(child: CircularProgressIndicator())
-            : Column(
-                children: [
-                  CustomSearchBar(
-                    onSearchChanged: (query) {
-                      context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
-                    },
-                  ),
-                  const SizedBox(height: 16),
-                  Expanded(
-                    child: Padding(
-                      padding: const EdgeInsets.all(8.0),
-                      child: list.isEmpty
-                          ? Center(
-                              child: Text(
-                                'No results found',
-                                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                      color: ColorsManager.lightGrayColor, // Gray when not selected
-                                      fontWeight: FontWeight.w400,
-                                    ),
-                              ),
-                            )
-                          : ListView(
-                              shrinkWrap: true,
-                              children: list
-                                  .map(
-                                    (community) => CustomExpansionTileSpaceTree(
-                                      title: community.name,
-                                      isSelected:
-                                          state.selectedCommunities.contains(community.uuid),
-                                      isSoldCheck:
-                                          state.selectedCommunities.contains(community.uuid),
-                                      onExpansionChanged: () {
-                                        context
-                                            .read<SpaceTreeBloc>()
-                                            .add(OnCommunityExpanded(community.uuid));
-                                      },
-                                      isExpanded:
-                                          state.expandedCommunities.contains(community.uuid),
-                                      onItemSelected: () {
-                                        context.read<SpaceTreeBloc>().add(
-                                            OnCommunitySelected(community.uuid, community.spaces));
-                                      },
-                                      children: community.spaces.map((space) {
-                                        return CustomExpansionTileSpaceTree(
-                                          title: space.name,
-                                          isExpanded: state.expandedSpaces.contains(space.uuid),
-                                          onItemSelected: () {
-                                            context.read<SpaceTreeBloc>().add(OnSpaceSelected(
-                                                community.uuid, space.uuid ?? '', space.children));
-                                          },
-                                          onExpansionChanged: () {
-                                            context.read<SpaceTreeBloc>().add(
-                                                OnSpaceExpanded(community.uuid, space.uuid ?? ''));
-                                          },
-                                          isSelected: state.selectedSpaces.contains(space.uuid) ||
-                                              state.soldCheck.contains(space.uuid),
-                                          isSoldCheck: state.soldCheck.contains(space.uuid),
-                                          children: _buildNestedSpaces(
-                                              context, state, space, community.uuid),
-                                        );
-                                      }).toList(),
-                                    ),
-                                  )
-                                  .toList(),
-                            ),
-                    ),
-                  ),
-                ],
-              ),
-      );
-    });
-  }
-
-  List<Widget> _buildNestedSpaces(
-      BuildContext context, SpaceTreeState state, SpaceModel space, String communityId) {
-    return space.children.map((child) {
-      return CustomExpansionTileSpaceTree(
-        isSelected:
-            state.selectedSpaces.contains(child.uuid) || state.soldCheck.contains(child.uuid),
-        isSoldCheck: state.soldCheck.contains(child.uuid),
-        title: child.name,
-        isExpanded: state.expandedSpaces.contains(child.uuid),
-        onItemSelected: () {
-          context
-              .read<SpaceTreeBloc>()
-              .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
-        },
-        onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(communityId, child.uuid ?? ''));
-        },
-        children: _buildNestedSpaces(context, state, child, communityId),
-      );
-    }).toList();
-  }
-}

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

@@ -179,6 +179,7 @@ class SpaceManagementBloc
       final updatedCommunities =
           await Future.wait(communities.map((community) async {
         final spaces = await _fetchSpacesForCommunity(community.uuid);
+
         return CommunityModel(
           uuid: community.uuid,
           createdAt: community.createdAt,
@@ -313,6 +314,7 @@ class SpaceManagementBloc
     SelectSpaceEvent event,
     Emitter<SpaceManagementState> emit,
   ) {
+    
     _handleCommunitySpaceStateUpdate(
       emit: emit,
       selectedCommunity: event.selectedCommunity,

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

@@ -95,6 +95,9 @@ class SpaceModel {
       icon: json['icon'] ?? Assets.location,
       position: Offset(json['x'] ?? 0, json['y'] ?? 0),
       isHovered: false,
+      spaceModel: json['spaceModel'] != null
+          ? SpaceTemplateModel.fromJson(json['spaceModel'])
+          : null,
       tags: (json['tags'] as List<dynamic>?)
               ?.where((item) => item is Map<String, dynamic>) // Validate type
               .map((item) => Tag.fromJson(item as Map<String, dynamic>))

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

@@ -22,6 +22,7 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_li
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/duplicate_process_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_card_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_container_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/helper/space_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
@@ -195,7 +196,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                                     screenSize,
                                     position:
                                         spaces[index].position + newPosition,
-                                    
                                     parentIndex: index,
                                     direction: direction,
                                   );
@@ -351,11 +351,14 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             spaceModels: widget.spaceModels,
             name: widget.selectedSpace!.name,
             icon: widget.selectedSpace!.icon,
+            parentSpace: SpaceHelper.findSpaceByInternalId(
+                widget.selectedSpace?.parent?.internalId, spaces),
             editSpace: widget.selectedSpace,
+            currentSpaceModel: widget.selectedSpace?.spaceModel,
             tags: widget.selectedSpace?.tags,
             subspaces: widget.selectedSpace?.subspaces,
             isEdit: true,
-          allTags: _getAllTagValues(spaces),
+            allTags: _getAllTagValues(spaces),
             onCreateSpace: (String name,
                 String icon,
                 List<SelectedProduct> selectedProducts,
@@ -374,6 +377,15 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                   widget.selectedSpace!.status =
                       SpaceStatus.modified; // Mark as modified
                 }
+
+                for (var space in spaces) {
+                  if (space.internalId == widget.selectedSpace?.internalId) {
+                    space.status = SpaceStatus.modified;
+                    space.subspaces = subspaces;
+                    space.tags = tags;
+                    space.name = name;
+                  }
+                }
               });
             },
             key: Key(widget.selectedSpace!.name),
@@ -452,7 +464,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     }).toList();
 
     if (spacesToSave.isEmpty) {
-      debugPrint("No new or modified spaces to save.");
       return;
     }
 
@@ -643,12 +654,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
     final Map<String, int> nameCounters = {};
 
-    String _generateCopyName(String originalName) {
-      final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
-      nameCounters[baseName] = (nameCounters[baseName] ?? 0) + 1;
-      return "$baseName(${nameCounters[baseName]})";
-    }
-
     SpaceModel duplicateRecursive(SpaceModel original, Offset parentPosition,
         SpaceModel? duplicatedParent) {
       Offset newPosition = parentPosition + Offset(horizontalGap, 0);
@@ -659,7 +664,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         newPosition += Offset(horizontalGap, 0);
       }
 
-      final duplicatedName = _generateCopyName(original.name);
+      final duplicatedName =
+          SpaceHelper.generateUniqueSpaceName(original.name, spaces);
 
       final duplicated = SpaceModel(
         name: duplicatedName,
@@ -748,7 +754,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     }
   }
 
-    List<String> _getAllTagValues(List<SpaceModel> spaces) {
+  List<String> _getAllTagValues(List<SpaceModel> spaces) {
     final List<String> allTags = [];
     for (final space in spaces) {
       if (space.tags != null) {

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

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/common/widgets/custom_expansion_tile.dart';
+import 'package:syncrow_web/common/custom_expansion_tile.dart';
 
 class CommunityTile extends StatelessWidget {
   final String title;
@@ -24,7 +24,7 @@ class CommunityTile extends StatelessWidget {
     return CustomExpansionTile(
       title: title,
       initiallyExpanded: isExpanded,
-      isSelected: isSelected,
+      isSelected: isSelected, 
       onExpansionChanged: (bool expanded) {
         onExpansionChanged(title, expanded);
       },